-
# Conflicts: # yudao-dependencies/pom.xml # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/CrmCustomerController.java # yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseOrderController.java
-
Merge pull request !931 from dhb52/develop
-
Merge pull request !930 from 芋道源码/feature/easy-trans
-
Merge pull request !901 from E1/master-jdk21
-
Merge pull request !916 from scholarli/develop
-
# Conflicts: # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsCustomerController.java # yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsCustomerServiceImpl.java
-
Merge pull request !909 from dhb52/develop
-
Merge pull request !926 from dhb52/N/A
-
# Conflicts: # sql/mysql/ruoyi-vue-pro.sql
-
Signed-off-by: dhb52 <dhb52@126.com>