-
Merge pull request !1150 from RLgitee7311/master-jdk17
-
Merge pull request !1152 from 小新/master-jdk17
-
(cherry picked from commit fe404ec233162b87cf1d3be5ea03e5c5f8ff3664)
-
修复:确保每次更新时,adjustPrice 和 payPrice 都是累加的
-
Merge pull request !1147 from 山野羡民/N/A
-
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
-
…AuditStatusEnum.java. Merge pull request !1145 from 山野羡民/N/A
-
Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
-
Merge pull request !1134 from 芋道源码/develop
-
Merge pull request !1133 from 芋道源码/feature/bpm
-
# 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
-
# Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
-
Merge pull request !1129 from 杨宇庆/N/A
-
Merge pull request !1130 from puhui999/develop2
-
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
-
Merge pull request !1126 from puhui999/develop
-
…-vue-pro into master-jdk17
-
Merge pull request !1113 from 杨宇庆/N/A
-
Merge pull request !1119 from 杨宇庆/N/A
-
Merge pull request !1124 from 杨宇庆/N/A