-
Merge pull request !839 from 云开/feature/BPM_CC_develop
-
数据库缺少trade:order:query 和 trade:order:update权限，会导致订单的发货和更多按钮无法显示。 Signed-off-by: jay浅蓝 <565215951@qq.com>
-
# Conflicts: # yudao-module-crm/yudao-module-crm-biz/src/test/java/cn/iocoder/yudao/module/crm/service/contract/ContractServiceImplTest.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/DictDataController.java
-
…o into feature/mall_product # Conflicts: # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
