-
# Conflicts: # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/definition/BpmModelConvert.java # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmParallelMultiInstanceBehavior.java # yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/behavior/BpmSequentialMultiInstanceBehavior.java
-
Merge pull request !1082 from 杨宇庆/N/A
-
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
-
Merge pull request !1078 from 卢越/master-jdk17
-
Merge pull request !1077 from 卢越/master-jdk17
-
Merge pull request !1071 from heyho/master-jdk17
-
Merge pull request !1073 from 卢越/master-jdk17