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
..
java/cn/iocoder/yudao/module/system	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2026-06-19 18:59:53 -07:00
resources	Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud	2025-12-07 18:20:52 +08:00