szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,482 Commits 13 Branches 41 Tags 244 MiB
Commit Graph

8482 Commits

Author SHA1 Message Date
YunaiV aab61f7963 【代码评审】Bpm：更多设置-摘要设置 2025-01-24 21:03:55 +08:00
YunaiV 0911d42e49 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumCollectionValidator.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
 2025-01-24 20:56:26 +08:00
YunaiV 0e07da807a Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2025-01-24 20:17:46 +08:00
YunaiV 295fad7d97 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-01-24 20:17:17 +08:00
芋道源码 a78e536906
Merge pull request #745 from mcwindy/desensitization_fix 
【代码优化】 简化滑动脱敏处理器实现
 2025-01-24 20:15:42 +08:00
芋道源码 a33fb12799
!1212 【代码优化】InEnum 不必须指定 int 类型，通过泛型指定 
Merge pull request !1212 from puhui999/develop
 2025-01-24 12:12:08 +00:00
puhui999 d83b7cd5b9 【代码优化】InEnum 不必须指定 int 类型，通过泛型指定 2025-01-24 17:31:41 +08:00
mcwindy 408f88da54
【代码优化】 简化滑动脱敏处理器实现 2025-01-24 02:05:46 +08:00
YunaiV bd7f9761d8 https://gitee.com/zhijiantianya/yudao-cloud/pulls/165/files 2025-01-23 20:16:19 +08:00
Dincat dcf55c3533 !1196 修复角色更新时，记录的操作日志将更新前的数据记录为空的问题 
* 修复角色更新时，记录的操作日志将更新前的数据记录为空的问题
 2025-01-23 12:05:09 +00:00
芋道源码 2ceca1a20d
!1207 【缺陷修复】商城 
Merge pull request !1207 from puhui999/develop
 2025-01-23 04:41:00 +00:00
puhui999 e89e3c946d 【缺陷修复】商城：虚拟成团后所有成员添加虚拟成团标记 2025-01-23 12:08:05 +08:00
puhui999 30a24601cd 【缺陷修复】商城：修复积分不够还能兑换商品的 bug 2025-01-23 11:55:30 +08:00
puhui999 d3352308d4 【代码优化】积分商城 2025-01-23 10:49:08 +08:00
YunaiV 2725376b91 【缺陷修复】商城：分销用户累计已提现查询使用 WITHDRAW_SUCCESS 体现成功状态查询 2025-01-17 20:04:09 +08:00
芋道源码 5c2af8e32d
!1188 商城缺陷修复 
Merge pull request !1188 from puhui999/develop
 2025-01-17 12:02:39 +00:00
puhui999 2451942cf2 【代码优化】商城：分销用户绑定移除 try catch，错误消息由前端进行特殊处理 2025-01-10 16:24:36 +08:00
puhui999 b1c115d221 【代码优化】商城：分销用户累计已提现查询 2025-01-10 15:50:15 +08:00
puhui999 adff185716 【缺陷修复】商城：分销用户累计已提现查询使用 WITHDRAW_SUCCESS 体现成功状态查询 2025-01-07 17:00:01 +08:00
puhui999 1d597403c9 【缺陷修复】商城：绑定分享人失败记录 log error 日志, 前端不提示错误信息 2025-01-07 11:05:38 +08:00
芋道源码 44bba85a34
!1182 【缺陷修复】编辑用户时候提示用户账号由 数字、字母 组成 
Merge pull request !1182 from 壁虎在家/master-jdk17
 2025-01-05 10:42:57 +00:00
壁虎 92a4831644 正则表达式补上次数规则 2025-01-05 18:30:44 +08:00
芋道源码 0e9827e5a0
!1181 【缺陷修复】退款回收优惠券错误 
Merge pull request !1181 from 壁虎在家/master-jdk17
 2025-01-05 08:38:09 +00:00
壁虎 39ac9053fd 【缺陷修复】退款回收优惠券错误 2025-01-05 16:19:40 +08:00
YunaiV 92d6b8ad88 【功能修复】AI：spring-ai-tika-document-reader 引入了 cloud 依赖，导致启动报错 2025-01-04 16:00:42 +08:00
YunaiV f8fc3101c6 【代码优化】支持通过短信重置后台密码 2025-01-04 11:41:31 +08:00
杨宇庆 8d22ed8bea !1156 feat: 支持短信重置后台密码 
* feat: 支持短信重置后台密码
* 重构管理后台验证码的验证流程
 2025-01-04 03:39:33 +00:00
YunaiV 182511b65b !162 移除用户账号正则检验中长度限制 2025-01-04 08:39:39 +08:00
YunaiV b1459824a6 V2.4.0 发布~ 2024-12-31 09:42:55 +08:00
YunaiV c367c71a23 【依赖】velocity from 2.4.1 to 2.4 避免包冲突 2024-12-31 09:31:23 +08:00
YunaiV 5fd3b9ddda 【同步】jdk21 和 jdk8 的代码 2024-12-31 09:26:05 +08:00
YunaiV 61ae0b17eb Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-12-31 09:23:41 +08:00
YunaiV 3871a1f83f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
 2024-12-31 09:22:59 +08:00
YunaiV 46c825cb6f V2.4.0 发布~ 2024-12-31 09:22:04 +08:00
芋道源码 710dce3955
!1173 fix(yudao-dependencies): 排除redisson3.41.0对应redisson-spring-data依赖 
Merge pull request !1173 from xiaomifan/master
 2024-12-31 01:14:34 +00:00
fanliuyang 7443bdcea3 fix(yudao-dependencies): 排除redisson3.41.0对应redisson-spring-data依赖 
依赖错误，解决 Tuple NoClassDefFoundError 报错
 2024-12-30 09:53:49 +08:00
YunaiV 82b03d7f7d 【功能新增】工作流：API 创建流程时，设置 userId（解决 Job 下，无法设置 userId 的问题） 2024-12-28 20:44:08 +08:00
YunaiV cdb31679da 【功能修复】商城：限时折扣在 activityIds、skuIds 为空时，报 SQL 不正确的问题 2024-12-28 19:30:57 +08:00
YunaiV d49c11fbec 【拼写修正】KafkaWebSocketMessageConsumer 的 kafkaWebSocketMessageSender 拼错 2024-12-28 19:17:55 +08:00
YunaiV 266e892a9e 【升级】lombok from 1.18.34 to 1.18.36 2024-12-28 17:59:38 +08:00
YunaiV a1b93f7ae1 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
 2024-12-28 17:58:36 +08:00
YunaiV df5f481e38 【升级】lombok from 1.18.34 to 1.18.36 2024-12-28 17:58:20 +08:00
YunaiV b75264daca Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-12-28 17:52:42 +08:00
YunaiV cbb208dc47 【升级】spring boot admin from 3.3.3 to 3.4.1 2024-12-28 17:52:25 +08:00
YunaiV c072e87f28 【升级】jedis-mock from 1.1.4 to 1.1.8 2024-12-28 17:43:49 +08:00
YunaiV 57b33e0d86 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
 2024-12-28 17:42:31 +08:00
YunaiV 6b1572f13f 【升级】jedis-mock from 1.1.4 to 1.1.8 2024-12-28 17:42:03 +08:00
YunaiV f202613987 【升级】mybatis-plus from 3.5.8 to 3.5.9 2024-12-28 17:29:03 +08:00
YunaiV 839bddf83f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
 2024-12-28 17:23:24 +08:00
YunaiV 5831534ed3 【升级】mybatis-plus from 3.5.8 to 3.5.9 2024-12-28 17:22:52 +08:00