-
Merge pull request !1209 from jinmh/master-jdk17
-
Signed-off-by: dhb52 <dhb52@126.com>
-
Merge pull request !1119 from 杨宇庆/N/A
-
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
-
# 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
-
此PR同我之前提交的#1029号PR，解决【system_menu】菜单的 AI 音乐的组件名称命名错误问题。 https://gitee.com/zhijiantianya/ruoyi-vue-pro/pulls/1029 Signed-off-by: Cyrix66 <120878696@qq.com>
