zacos
|
0ef2d31d34
|
Pre Merge pull request !1365 from zacos/master
|
2025-06-13 03:36:02 +00:00 |
xingyu4j
|
5caf990920
|
fix: selectBatchIds 已过期
|
2025-05-26 14:06:02 +08:00 |
YunaiV
|
e00bfd02a1
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/operatelog/CrmOperateLogController.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/CrmStatisticsPerformanceController.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/statistics/vo/performance/CrmStatisticsPerformanceReqVO.java
# yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/service/statistics/CrmStatisticsPerformanceServiceImpl.java
# yudao-module-mall/yudao-module-promotion/pom.xml
# yudao-module-mall/yudao-module-trade/pom.xml
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/social/SocialUserApi.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/vo/AuthRegisterReqVO.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
|
2025-05-17 14:14:23 +08:00 |
|
YunaiV
|
dfffc93584
|
reactor：移除 mall-trade 的 api 包
|
2025-05-17 11:31:10 +08:00 |
|
YunaiV
|
31b8ee425f
|
reactor：移除 promotion-statistics 的 api 包
|
2025-05-17 10:56:17 +08:00 |