YunaiV 38f2341d34 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud ... # Conflicts: # yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskRejectReqVO.java # yudao-module-bpm/yudao-module-bpm-server/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java # yudao-module-im/yudao-module-im-server/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImpl.java # yudao-module-mall/yudao-module-trade-server/src/main/java/cn/iocoder/yudao/module/trade/controller/app/aftersale/AppAfterSaleController.java # yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/barcode/MesWmBarcodeServiceImpl.java # yudao-module-mes/yudao-module-mes-server/src/main/java/cn/iocoder/yudao/module/mes/service/wm/sn/MesWmSnServiceImpl.java		2026-06-19 18:59:53 -07:00
..
yudao-module-product-api	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2025-05-02 21:11:08 +08:00
yudao-module-product-server	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2026-06-14 00:37:05 +08:00
yudao-module-promotion-api	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2025-02-09 11:44:50 +08:00
yudao-module-promotion-server	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2026-06-19 18:59:53 -07:00
yudao-module-statistics-api	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2025-01-25 10:14:47 +08:00
yudao-module-statistics-server	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2026-06-14 00:37:05 +08:00
yudao-module-trade-api	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2026-01-29 22:25:16 +08:00
yudao-module-trade-server	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2026-06-19 18:59:53 -07:00
pom.xml	reactor：trade 的 -biz 模块，重构成 -server 模块，意义更明确	2025-05-17 11:29:41 +08:00