Commit Graph

7897 Commits

Author SHA1 Message Date
e5716bdfc2 Merge branch 'master-jdk17' into feature-project 2024-11-22 11:14:11 +08:00
芋道源码
b48842091c
!1129 解决编辑租户套餐时菜单权限因缓存导致无法生效的问题
Merge pull request !1129 from 杨宇庆/N/A
2024-11-19 01:09:01 +00:00
杨宇庆
f782e3a9af
解决编辑租户套餐时菜单权限因缓存导致无法生效的问题
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-11-18 08:06:52 +00:00
be6ac815b9 Merge branch 'master-jdk17' into feature-project 2024-11-18 08:56:19 +08:00
YunaiV
0bbc682ba4 【代码优化】infra:s3 minio sdk 替换为 aws sdk 2024-11-09 18:33:52 +08:00
YunaiV
e1ffb2e911 Merge branch 'master-jdk17-updateS3ToAws' of https://gitee.com/radio-devil/ruoyi-vue-pro into master-jdk17 2024-11-09 15:39:42 +08:00
芋道源码
717549691a
!1119 【修复】错误日志表中user_id字段类型不匹配
Merge pull request !1119 from 杨宇庆/N/A
2024-11-09 07:32:32 +00:00
芋道源码
b93199bd0a
!1124 【修复】修复会员取消售后接口中未校验用户ID的漏洞
Merge pull request !1124 from 杨宇庆/N/A
2024-11-09 07:29:00 +00:00
YunaiV
14dc2e3849 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2024-11-09 15:11:28 +08:00
芋道源码
9f4e94deb1
Merge pull request #694 from shanaiardor/fix/tenantjob-aspect-voidretuenfail
修复由于多租户定时任务方法返回 void 导致的 xxlJob 任务执行失败的问题
2024-11-09 15:10:58 +08:00
杨宇庆
c776371d48
【修复】修复会员取消退款接口中未校验用户ID的漏洞
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-11-06 15:21:25 +00:00
wct
72d2d81d6a 修复由于多租户定时任务方法返回 void 导致的执行 xxlJob 执行失败的问题 2024-11-06 17:32:35 +08:00
杨宇庆
00c2205442
【修复】错误日志表中user_id字段类型不匹配
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-11-04 17:21:38 +00:00
segerts
ad00fbc566 S3 minio sdk 替换为 aws sdk 2024-11-03 19:28:23 +08:00
YunaiV
d97ba8d4d8 【缺陷修复】商城:活动的库存校验,从 > 改成 >= 2024-11-01 21:22:23 +08:00
94c6b6767a Merge branch 'master-jdk17' into feature-project 2024-10-28 10:40:50 +08:00
YunaiV
8d4cc35cde 【缺陷修复】商城:优惠劵在不限制时,无法发送的问题 2024-10-27 20:33:49 +08:00
YunaiV
b1ad2f8176 【缺陷修复】商城:拼团取消已支付的订单时,缺少 ip 和状态检查不正确 2024-10-27 20:00:00 +08:00
YunaiV
ac50b4b11c 148 fix:商城系统->营销中心->优惠活动->限时折扣,折扣百分比按正常折扣(比如说90%)填写时,后端报错“折扣百分比需要大于等于 1,小于等于 99” 2024-10-27 17:36:45 +08:00
YunaiV
c6f67a5a02 !1112【代码优化】支付:微信支付退款时,日志记录发起微信支付异常信息 2024-10-27 15:16:35 +08:00
芋道源码
1753f2d1e4
!1112 【优化】日志记录发起微信支付异常信息
Merge pull request !1112 from 杨宇庆/N/A
2024-10-27 07:15:08 +00:00
YunaiV
e6770399e6 Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17 2024-10-27 15:14:24 +08:00
YunaiV
cf1b41741e !1108【代码优化】排序:字段驼峰改为下划线 2024-10-27 15:14:18 +08:00
芋道源码
e7f779225e
!1107 【修复】修复当不存在优惠价格时,商城却显示优惠价格
Merge pull request !1107 from 杨宇庆/N/A
2024-10-27 07:09:02 +00:00
芋道源码
5bf6361ebd
!1106 【Bug修复】修复滑动脱敏处理器禁用脱敏的判断
Merge pull request !1106 from Asa/master-jdk17
2024-10-27 07:07:02 +00:00
芋道源码
8aaa96c887
Merge pull request #680 from sfiloveyou/master-jdk17
postgresql数据库建表sql文件添加相关AI功能的菜单
2024-10-27 15:04:23 +08:00
shifeng
14e3ca8ef0 postgresql数据库建表sql文件添加相关AI功能的菜单 2024-10-25 10:26:35 +08:00
杨宇庆
c3e1374b1e
【优化】日志记录发起微信支付异常信息
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-10-23 09:02:41 +00:00
杨宇庆
922aa0678d
【修复】修复当不存在优惠价格时,商城却显示优惠价格
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-10-16 16:32:50 +00:00
张杰
88f1af6d2e fix: 修复滑动脱敏处理器禁用脱敏的判断 2024-10-16 20:26:11 +08:00
e63772401c Merge branch 'master-jdk17' into feature-project 2024-10-14 11:01:38 +08:00
YunaiV
7fbdf24bca 1103 【轻量级 PR】:【优化】补全退款订单字段 2024-10-13 17:10:45 +08:00
YunaiV
9ad95223d1 【依赖降级】weixin-java from 4.6.5B to 4.6.0,避免 privateCertPath 报错 2024-10-13 17:00:14 +08:00
YunaiV
6e7db6ebd0 !144 【代码修复】商城订单的支付回调接口添加@PermitAll和部分DO缺少@KeySequence问题 2024-10-12 20:38:22 +08:00
YunaiV
7e3f92c3a3 【优化】忽略多租户的表,兼容表名带有包裹符号的情况 2024-10-12 19:55:13 +08:00
YunaiV
6f7fe84c41 【修复】AI 模块:Midjourney notify 时,缺少租户的忽略 2024-10-12 19:47:18 +08:00
d59c2f4aef [feat] 添加sql脚本 2024-10-09 14:47:56 +08:00
6eec60e9dd [fix] 修改标签 2024-10-09 14:42:26 +08:00
550f4cbdae Merge branch 'master-jdk17' into feature-project
# Conflicts:
#	README.md
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/object/BeanUtils.java
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/banner/core/BannerApplicationRunner.java
#	yudao-server/src/main/resources/application-dev.yaml
#	yudao-server/src/main/resources/application-local.yaml
2024-10-08 09:24:42 +08:00
YunaiV
8da00083d8 V2.3.0 版本发布~ 2024-10-07 16:03:05 +08:00
YunaiV
47fa66a412 V2.3.0 版本发布~ 2024-10-07 15:57:12 +08:00
YunaiV
f9ce9703bf 【功能修复】工作流:CandidateGroupStrategyTest 单测临时禁用 2024-10-07 15:54:30 +08:00
YunaiV
e6496af9ae Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2024-10-04 19:41:03 +08:00
YunaiV
2c4d8298cf 【代码评审】商城:纯积分兑换时,直接设置为待发货 2024-10-04 19:17:16 +08:00
YunaiV
e604cba3bf 【代码评审】商城:积分商城的下单流程 2024-10-04 18:40:33 +08:00
芋道源码
ce367d99a9
!1097 【功能完善】商城: 积分商城
Merge pull request !1097 from puhui999/develop
2024-10-04 10:27:20 +00:00
YunaiV
5f75fcb0fb 【代码优化】工作流:删除用不到的方法 2024-10-04 17:17:01 +08:00
芋道源码
76e1d0e6f7
!978 BPM 仿钉钉/飞书模式的草稿 PR
Merge pull request !978 from 芋道源码/feature/bpm
2024-10-04 09:11:39 +00:00
YunaiV
f299bf8a36 【代码优化】工作流:删除用不到的方法 2024-10-04 17:11:25 +08:00
YunaiV
f1872b70ee 【功能修复】工作流:新的 bpm 详情,bpmn 设计器也返回 node 信息 2024-10-04 17:05:51 +08:00