YunaiV
|
4d5e501a41
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/utils/FileTypeUtils.java
# yudao-module-mp/src/main/java/cn/iocoder/yudao/module/mp/service/handler/user/SubscribeHandler.java
|
2025-07-11 21:54:11 +08:00 |
|
YunaiV
|
876659b01d
|
chore：spring security from 5.8.14 to 5.8.16
|
2025-07-10 09:08:32 +08:00 |
|
YunaiV
|
569ff42e6f
|
feat：【SYSTEM 系统管理】优化支持 SimpleAsyncTaskExecutor 异步线程池
|
2025-07-09 23:24:17 +08:00 |
|
YunaiV
|
bda357508a
|
feat：【SYSTEM 系统管理】SecurityFrameworkUtils 的 setLoginUser 方法，移除对 request 强依赖，可用于 Job 记录操作日志；
|
2025-07-09 22:37:48 +08:00 |
|
YunaiV
|
7fc522938d
|
fix：【SYSTEM 系统管理】社交绑定，使用 code 授权码的参数错误
|
2025-07-09 19:27:07 +08:00 |
|
YunaiV
|
563985dcfc
|
feat：【MP 公众号】兼容无 API 权限的个人公众号场景
|
2025-07-09 19:17:50 +08:00 |
|
YunaiV
|
d8e1610495
|
feat: enhance MyBatis utility for sorting and update SQL aliases in TradeOrderStatisticsMapper
|
2025-07-08 09:39:44 +08:00 |
|
YunaiV
|
eca9307344
|
fix：【MALL 商城】修复退款通知中 merchantRefundId 字符串转换 Long 类型的问题
|
2025-07-06 16:38:14 +08:00 |
|
YunaiV
|
a690184524
|
feat：【ERP 系统】清理多余的 ErpStatisticsServiceTest 类
|
2025-07-06 16:19:45 +08:00 |
|
YunaiV
|
2ee1e15101
|
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
|
2025-07-06 16:08:37 +08:00 |
|
芋道源码
|
e6fecd8efe
|
Merge pull request #869 from YunaiV/fix-erp-statistics-tenant-issue
fix: ERP统计查询在多租户关闭时的NullPointerException问题
|
2025-07-06 16:08:21 +08:00 |
|
芋道源码
|
94e280eb34
|
!1371 fix: 修复上传MP4文件之后通过下载连接下载MP4文件源文件能通过windows自带播放器播放下载下来的播放不了
Merge pull request !1371 from puhui999/master-jdk17
|
2025-06-22 06:48:35 +00:00 |
|
芋道源码
|
ec5281f2e5
|
!1373 fix: 创建拼团活动时校验商品是否参与了其它活动
Merge pull request !1373 from puhui999/master-jdk17-2
|
2025-06-22 06:46:30 +00:00 |
|
芋道源码
|
6ac8fa28a7
|
!1374 fix: 修复拼团还没成团，虚拟成团是否，这个时候核销也能核销成功
Merge pull request !1374 from puhui999/master-jdk17-3
|
2025-06-22 06:44:49 +00:00 |
|
puhui999
|
cac82a13a7
|
fix: 修复拼团还没成团，虚拟成团是否，这个时候核销也能核销成功
|
2025-06-18 17:23:59 +08:00 |
|
puhui999
|
9fc4a4061f
|
fix: 创建拼团活动时校验商品是否参与了其它活动
|
2025-06-18 15:40:51 +08:00 |
|
puhui999
|
a5ad8bb708
|
fix: 修复上传MP4文件之后通过下载连接下载MP4文件源文件能通过windows自带播放器播放下载下来的播放不了
|
2025-06-18 12:45:22 +08:00 |
|
YunaiV
|
7cee12c412
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-06-17 20:07:30 +08:00 |
|
YunaiV
|
af2a0c22cb
|
bugfix：maven-surefire-plugin 暂时无法通过 bom 的依赖读取（兼容老版本 IDEA 2024 及以前版本）
|
2025-06-17 20:07:00 +08:00 |
|
YunaiV
|
ae93b07fed
|
bugfix：maven-surefire-plugin 暂时无法通过 bom 的依赖读取（兼容老版本 IDEA 2024 及以前版本）
|
2025-06-17 20:01:48 +08:00 |
|
YunaiV
|
c46e5975dc
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-06-17 19:55:25 +08:00 |
|
YunaiV
|
f781b29f3d
|
bugfix：maven-surefire-plugin 暂时无法通过 bom 的依赖读取（兼容老版本 IDEA 2024 及以前版本）
|
2025-06-17 19:53:24 +08:00 |
|
YunaiV
|
e7119dd235
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
|
2025-06-17 19:52:57 +08:00 |
|
YunaiV
|
141bd22df6
|
bugfix：maven-surefire-plugin 暂时无法通过 bom 的依赖读取（兼容老版本 IDEA 2024 及以前版本）
|
2025-06-17 19:48:26 +08:00 |
|
YunaiV
|
47f450fcf9
|
bugfix：lombok 依赖版本，暂时无法通过 bom 读取
|
2025-06-17 19:41:47 +08:00 |
|
YunaiV
|
d5bda87435
|
reactor：统一导出的 url 都是 export-excel
|
2025-06-16 08:36:38 +08:00 |
|
YunaiV
|
a000048196
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileConfigController.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/file/FileController.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/MenuController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dept/PostServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/dict/DictTypeServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleService.java
|
2025-06-16 08:35:21 +08:00 |
|
YunaiV
|
0fbffdc1d3
|
reactor：统一导出的 url 都是 export-excel
|
2025-06-16 08:30:00 +08:00 |
|
YunaiV
|
03d3ebdf05
|
review：【INFRA 基础设施】批量删除接口
|
2025-06-15 18:43:50 +08:00 |
|
芋道源码
|
bcd6ed4c4c
|
!1366 feat: system、infra 模块新增批量删除接口
Merge pull request !1366 from puhui999/master-jdk17
|
2025-06-15 10:31:33 +00:00 |
|
YunaiV
|
f253c133fc
|
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
|
2025-06-15 15:25:03 +08:00 |
|
芋道源码
|
850323303b
|
Merge pull request #850 from java-acc/fix/839-jdk17-received-time
fix(微信小程序确认收货提醒接口): 修复 #839 - received_time 时间戳单位错误（应为秒）
|
2025-06-15 15:24:55 +08:00 |
|
YunaiV
|
62e83eaef5
|
Excel导出时，下拉选择列错位问题修改 #853
|
2025-06-15 15:22:19 +08:00 |
|
YunaiV
|
4dca326081
|
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
|
2025-06-15 15:19:10 +08:00 |
|
芋道源码
|
f897ae9225
|
Merge pull request #853 from hushaoge/master-jdk17
Excel导出时，下拉选择列错位问题修改
|
2025-06-15 15:18:59 +08:00 |
|
YunaiV
|
f7245e484f
|
fix：【INFRA 基础设施】DataSourceConfigRespVO 的 id 类型不正确
|
2025-06-15 15:17:26 +08:00 |
|
YunaiV
|
39fcac4d5f
|
!1357 fix:修复"商品统计聚合函数的别名与排序字段不符"导致的SQL异常
|
2025-06-15 15:05:27 +08:00 |
|
芋道源码
|
69b896a688
|
!1357 fix:修复"商品统计聚合函数的别名与排序字段不符"导致的SQL异常
Merge pull request !1357 from SuchJack/master-jdk17-dev
|
2025-06-15 06:55:54 +00:00 |
|
puhui999
|
ce69fd8ab2
|
feat: system 模块新增批量删除接口
|
2025-06-15 13:57:08 +08:00 |
|
puhui999
|
777d64f065
|
feat: infra 模块新增批量删除接口
|
2025-06-15 13:55:24 +08:00 |
|
puhui999
|
39d1954ec9
|
feat: system 模块新增批量删除接口
|
2025-06-15 12:25:24 +08:00 |
|
芋道源码
|
2273d72f52
|
!1352 fix(bpm): 修复存在未拼接基础信息时直接返回的问题
Merge pull request !1352 from hclnb/master
|
2025-06-15 02:48:36 +00:00 |
|
芋道源码
|
a7a30e6a28
|
!1352 fix(bpm): 修复存在未拼接基础信息时直接返回的问题
Merge pull request !1352 from hclnb/master
|
2025-06-15 02:48:30 +00:00 |
|
YunaiV
|
611ad0d2aa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2025-06-15 10:48:14 +08:00 |
|
YunaiV
|
4b8048ff59
|
!1352 fix(bpm): 修复存在未拼接基础信息时直接返回的问题
|
2025-06-15 10:47:58 +08:00 |
|
YunaiV
|
b784380172
|
Merge remote-tracking branch 'origin/master'
|
2025-06-15 10:30:07 +08:00 |
|
YunaiV
|
47bf096b63
|
review：【System 系统管理】批量删除接口
|
2025-06-15 10:30:00 +08:00 |
|
YunaiV
|
7d867909d7
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
# sql/oracle/ruoyi-vue-pro.sql
# sql/sqlserver/ruoyi-vue-pro.sql
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailAccountController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/MailTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/NoticeController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2ClientController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/oauth2/OAuth2TokenController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsTemplateController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/socail/SocialClientController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/tenant/TenantPackageController.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailAccountServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notice/NoticeServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2ClientServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsChannelService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsTemplateServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantPackageServiceImpl.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantService.java
# yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java
|
2025-06-15 10:21:55 +08:00 |
|
芋道源码
|
ed3b6703ba
|
!1354 feat: sql 转换工具增加 UNIQUE KEY 支持
Merge pull request !1354 from dhb52/master-jdk17
|
2025-06-15 02:19:28 +00:00 |
|
YunaiV
|
4aa9efc0dc
|
!1358 fix(mall)：拼团记录创建时，需要设置拼团商品的图片
|
2025-06-15 10:14:32 +08:00 |
|