|
|
f891fb1478
|
update yudao-module-infra/src/main/resources/codegen/vue3/views/index.vue.vm.
Signed-off-by: 顾北清 <1653777235@qq.com>
|
2025-07-02 09:10:02 +00:00 |
|
|
|
fced270619
|
update yudao-module-infra/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm.
Signed-off-by: 顾北清 <1653777235@qq.com>
|
2025-07-02 09:08:35 +00:00 |
|
|
|
c611f1ad15
|
refactor.trade: 优化 Kd100ExpressQueryRespDTO 中时间字段的处理
- 新增 timeStr 字段用于存储原始时间字符串
- 添加 parseTime 方法将时间字符串解析为 LocalDateTime 对象- 保留原有的 @JsonFormat 注解以确保序列化格式不变
|
2025-07-01 19:17:15 +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 |
|
|
|
cac82a13a7
|
fix: 修复拼团还没成团，虚拟成团是否，这个时候核销也能核销成功
|
2025-06-18 17:23:59 +08:00 |
|
|
|
9fc4a4061f
|
fix: 创建拼团活动时校验商品是否参与了其它活动
|
2025-06-18 15:40:51 +08:00 |
|
|
|
a5ad8bb708
|
fix: 修复上传MP4文件之后通过下载连接下载MP4文件源文件能通过windows自带播放器播放下载下来的播放不了
|
2025-06-18 12:45:22 +08:00 |
|
|
|
7cee12c412
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-06-17 20:07:30 +08:00 |
|
|
|
af2a0c22cb
|
bugfix：maven-surefire-plugin 暂时无法通过 bom 的依赖读取（兼容老版本 IDEA 2024 及以前版本）
|
2025-06-17 20:07:00 +08:00 |
|
|
|
ae93b07fed
|
bugfix：maven-surefire-plugin 暂时无法通过 bom 的依赖读取（兼容老版本 IDEA 2024 及以前版本）
|
2025-06-17 20:01:48 +08:00 |
|
|
|
c46e5975dc
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
|
2025-06-17 19:55:25 +08:00 |
|
|
|
f781b29f3d
|
bugfix：maven-surefire-plugin 暂时无法通过 bom 的依赖读取（兼容老版本 IDEA 2024 及以前版本）
|
2025-06-17 19:53:24 +08:00 |
|
|
|
e7119dd235
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# pom.xml
|
2025-06-17 19:52:57 +08:00 |
|
|
|
141bd22df6
|
bugfix：maven-surefire-plugin 暂时无法通过 bom 的依赖读取（兼容老版本 IDEA 2024 及以前版本）
|
2025-06-17 19:48:26 +08:00 |
|
|
|
47f450fcf9
|
bugfix：lombok 依赖版本，暂时无法通过 bom 读取
|
2025-06-17 19:41:47 +08:00 |
|
|
|
d5bda87435
|
reactor：统一导出的 url 都是 export-excel
|
2025-06-16 08:36:38 +08:00 |
|
|
|
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 |
|
|
|
0fbffdc1d3
|
reactor：统一导出的 url 都是 export-excel
|
2025-06-16 08:30:00 +08:00 |
|
|
|
1d5c077062
|
feat: 使用 fastExcel 替换 easyExcel (https://github.com/fast-excel/fastexcel)
|
2025-06-15 18:55:42 +08:00 |
|
|
|
f38485ffd5
|
Merge branch 'refs/heads/master-jdk17' into master-jdk17-excel
# Conflicts:
# yudao-framework/yudao-spring-boot-starter-excel/src/main/java/cn/iocoder/yudao/framework/excel/core/handler/SelectSheetWriteHandler.java
|
2025-06-15 18:54:13 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
62e83eaef5
|
Excel导出时，下拉选择列错位问题修改 #853
|
2025-06-15 15:22:19 +08:00 |
|
|
|
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 |
|
|
|
f7245e484f
|
fix：【INFRA 基础设施】DataSourceConfigRespVO 的 id 类型不正确
|
2025-06-15 15:17:26 +08:00 |
|
|
|
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 |
|
|
|
ce69fd8ab2
|
feat: system 模块新增批量删除接口
|
2025-06-15 13:57:08 +08:00 |
|
|
|
777d64f065
|
feat: infra 模块新增批量删除接口
|
2025-06-15 13:55:24 +08:00 |
|
|
|
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 |
|
|
|
611ad0d2aa
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
|
2025-06-15 10:48:14 +08:00 |
|
|
|
4b8048ff59
|
!1352 fix(bpm): 修复存在未拼接基础信息时直接返回的问题
|
2025-06-15 10:47:58 +08:00 |
|
|
|
b784380172
|
Merge remote-tracking branch 'origin/master'
|
2025-06-15 10:30:07 +08:00 |
|
|
|
47bf096b63
|
review：【System 系统管理】批量删除接口
|
2025-06-15 10:30:00 +08:00 |
|
|
|
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 |
|
|
|
4aa9efc0dc
|
!1358 fix(mall)：拼团记录创建时，需要设置拼团商品的图片
|
2025-06-15 10:14:32 +08:00 |
|
|
|
f5f7061e00
|
!1358 fix(mall)：拼团记录创建时，需要设置拼团商品的图片
Merge pull request !1358 from SuchJack/master-jdk17-dev1
|
2025-06-15 02:12:18 +00:00 |
|
|
|
a8a3720ecd
|
!1359 fix(mall)：用户余额充值（虚拟物品）订单上传发货信息到微信小程序订单
|
2025-06-15 10:10:51 +08:00 |
|
|
|
d8436659db
|
!1359 fix(mall)：用户余额充值（虚拟物品）订单上传发货信息到微信小程序订单
Merge pull request !1359 from SuchJack/master-jdk17-dev2
|
2025-06-15 02:07:23 +00:00 |
|
|
|
02872e0826
|
!1360 修复CRM模块，添加日志记录时，bizNo少了一个括号，会造成异常的问题
|
2025-06-15 10:06:54 +08:00 |
|
|
|
53e5f0aaab
|
!1360 修复CRM模块，添加日志记录时，bizNo少了一个括号，会造成异常的问题
Merge pull request !1360 from ZG4vin/master
|
2025-06-15 02:06:25 +00:00 |
|
|
|
d7dbb4817b
|
review：【System 系统管理】批量删除接口
|
2025-06-15 10:04:04 +08:00 |
|
