Commit Graph

9601 Commits

Author SHA1 Message Date
6139ada74c Merge remote-tracking branch 'origin/master'
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-07-28 08:23:08 +08:00
9a17ab6664 feat: 优惠券模块 2025-07-28 08:22:59 +08:00
sqlicong
03d3404354 Merge remote-tracking branch 'main/master'
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
# Conflicts:
#	yudao-module-kfc/src/main/java/cn/iocoder/yudao/module/kfc/service/alarmrecord/AlarmRecordServiceImpl.java
2025-07-25 18:21:37 +08:00
sqlicong
0d19d2ccee 报警管理模块 2025-07-25 18:20:54 +08:00
32f36db21b feat: 优惠券模块
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-07-25 11:50:51 +08:00
sqlicong
0d7d919a77 Merge remote-tracking branch 'main/master'
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-07-25 10:19:10 +08:00
sqlicong
de8448c756 示例 2025-07-25 10:19:01 +08:00
dd4145598c feat: 添加sql
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-07-24 19:35:25 +08:00
sqlicong
29ba6c7376 init
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-07-24 19:31:34 +08:00
YunaiV
8cef02613d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Java CI with Maven / build (17) (push) Has been cancelled
Java CI with Maven / build (8) (push) Has been cancelled
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
2025-07-23 22:23:10 +08:00
YunaiV
d128d78718 reactor:easy-trans 默认禁用,避免影响接口性能 2025-07-23 22:17:54 +08:00
YunaiV
044dc8b28f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-07-23 21:41:18 +08:00
YunaiV
d650a0b123 chore:mybatis from 3.5.10.1 to 3.5.12 2025-07-23 21:40:55 +08:00
YunaiV
8dc0233844 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2025-07-23 21:01:26 +08:00
YunaiV
0cd7bca209 chore:mybatis from 3.5.10.1 to 3.5.12 2025-07-23 20:59:26 +08:00
xingyu4j
4a111d2cb5 fix: 修正use-vxe-grid中的代理配置提交类型 2025-07-19 16:56:23 +08:00
YunaiV
7311dff4d6 (〃'▽'〃) v2.6.1 发布:Vben5 + antd 管理后台支持 BPM 工作流、CRM 客户管理 2025-07-19 16:17:51 +08:00
YunaiV
1978603bd9 (〃'▽'〃) v2.6.1 发布:Vben5 + antd 管理后台支持 BPM 工作流、CRM 客户管理 2025-07-19 15:31:13 +08:00
YunaiV
aef47bcf70 fix:【INFRA 基础设施】代码生成模版,clean 缺少了 ; 号 2025-07-16 00:11:27 +08:00
YunaiV
a10e7aedaa fix:【Pay 支付】去除 54 强制 id 转账校验 2025-07-16 00:02:57 +08:00
YunaiV
3f9c3661a8 【同步】jdk21 和 jdk8 的代码 2025-07-15 22:39:20 +08:00
YunaiV
adece67532 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/vo/file/FileUploadReqVO.java
#	yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/app/file/vo/AppFileUploadReqVO.java
2025-07-15 22:37:27 +08:00
YunaiV
ea5b12f21e fix:【AI 大模型】RedisVectorStore 支持 username、password 2025-07-14 22:44:50 +08:00
YunaiV
39ecf5ebe5 feat:【AI 大模型】文心一言存在 springai 接入问题,无法使用 https://github.com/spring-ai-community/qianfan/issues/6 2025-07-14 22:42:56 +08:00
YunaiV
750709d706 feat:【AI 大模型】deepseek、azure、baichuan、moonshot 适配 1.0.0 2025-07-14 21:40:00 +08:00
YunaiV
3d0eb77148 feat:【AI 大模型】引入 spring-ai-starter-model-deepseek 依赖 2025-07-14 20:56:00 +08:00
YunaiV
c789418a7b feat:【AI 大模型】依赖 spring ai 升级到 1.0.0 2025-07-14 20:34:42 +08:00
YunaiV
e50250449a fix:【AI 大模型】UserProfileQueryToolFunction 没有参数,会报错 2025-07-14 19:50:02 +08:00
YunaiV
c96f6bb360 fix:【CRM 客户管理】CRM 超管,无法强制转移数据的问题 2025-07-14 13:19:14 +08:00
YunaiV
af94536a06 fix:【CRM 客户管理】修改数据时,避免操作日志出现“删除负责人”的情况 2025-07-14 13:10:51 +08:00
YunaiV
a9c7b584cc fix:【MALL 商城管理】优惠劵扣减时,增加 WHERE 乐观锁 2025-07-13 17:06:40 +08:00
YunaiV
a54e743a88 feat:【SYSTEM 系统管理】手机验证码登录,增加限流 2025-07-13 16:15:18 +08:00
YunaiV
64516b2210 fix:【INFRA 基础设施】文件上传时,directory 支持任意路径的问题 2025-07-13 16:06:41 +08:00
YunaiV
e7c9e3dc23 fix:【INFRA 基础设施】更新 pgsql quartz sql 2025-07-13 11:16:14 +08:00
YunaiV
7a8c37d7ac feat:【REPORT 报表】jimureport from 2.0.0 to 2.1.0 2025-07-11 23:47:15 +08:00
YunaiV
432609b6fa Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-dependencies/pom.xml
2025-07-11 23:43:53 +08:00
YunaiV
520fb79e2a feat:【REPORT 报表】jimureport from 1.9.4 to 2.0.0 2025-07-11 23:42:52 +08:00
YunaiV
9b860d9ae5 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-07-11 22:06:11 +08:00
YunaiV
285da13989 fix:【SYSTEM 系统管理】修复 DefaultDBFieldHandler 在 Async 情况下,无法获取到 getLoginUserId 的问题 2025-07-11 22:04:13 +08:00
YunaiV
b1d439abf8 fix:【SYSTEM 系统管理】增加 lombok-mapstruct-binding 依赖,解决 IDEA 偶然出现 No property named “xxx" exists 的编译错误 2025-07-11 21:57:56 +08:00
YunaiV
b81b8e7aff Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2025-07-11 21:57:16 +08:00
YunaiV
7a5e28d08a fix:【SYSTEM 系统管理】增加 lombok-mapstruct-binding 依赖,解决 IDEA 偶然出现 No property named “xxx" exists 的编译错误 2025-07-11 21:57:09 +08:00
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