YunaiV b44eab7f93 Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro ...

# Conflicts:
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessTransferReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactTransferReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractTransferReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerTransferReqVO.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/permission/CrmPermissionController.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/permission/CrmPermissionServiceImpl.java
#	yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/receivable/CrmReceivablePlanServiceImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/cart/vo/AppCartAddReqVO.java

2024-04-12 19:18:30 +08:00

..

yudao-module-erp-api

✨ ERP：初始化 receipt 收款单的逻辑 30%

2024-02-15 19:28:54 +08:00

yudao-module-erp-biz

Merge branch 'master-jdk21' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

2024-04-12 19:18:30 +08:00

pom.xml

✨ ERP：初始化模块，立个 2024 年的 flag

2024-01-27 17:25:07 +08:00