BJ_ZTEITS-Developers / parking-cloud-yudao

# Conflicts:
#	sql/mysql/bpm_update.sql
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmProcessInstanceCopyDO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptLeaderStrategyTest.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/test/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/candidate/strategy/dept/BpmTaskCandidateDeptMemberStrategyTest.java

Merge pull request !1129 from 杨宇庆/N/A

Signed-off-by: 杨宇庆 <hiyyq@qq.com>

…-vue-pro into master-jdk17

Merge pull request !1119 from 杨宇庆/N/A

Merge pull request !1124 from 杨宇庆/N/A

修复由于多租户定时任务方法返回 void 导致的 xxlJob 任务执行失败的问题

Signed-off-by: 杨宇庆 <hiyyq@qq.com>

Signed-off-by: 杨宇庆 <hiyyq@qq.com>

# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java