-
Merge pull request !964 from dhb52/feature/db
-
# Conflicts: # sql/mysql/ruoyi-vue-pro.sql
-
Merge pull request !839 from 云开/feature/BPM_CC_develop
-
Merge pull request !842 from jay浅蓝/N/A
-
数据库缺少trade:order:query 和 trade:order:update权限，会导致订单的发货和更多按钮无法显示。 Signed-off-by: jay浅蓝 <565215951@qq.com>
-
# Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/article/AppArticleController.java