github/ruoyi-vue-pro
1
0
Fork 0
mirror of https://github.com/YunaiV/ruoyi-vue-pro.git synced 2026-04-19 11:38:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,155 Commits 6 Branches 54 Tags
5d43f050497076b9b1b2552c053aedd5c39252d7
Commit Graph

10155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
5d43f05049 Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/json/databind/TimestampLocalDateTimeSerializer.java
 2025-11-21 20:05:16 +08:00
YunaiV
759f752db5 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryExpressTemplateConvert.java
 2025-11-21 20:05:00 +08:00
YunaiV
485a70de6d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
 2025-11-21 20:04:46 +08:00
YunaiV
ec2bca7331 !1441 【轻量级 PR】：fix: 【mall】找不到所在区域的运费收费模板和运费免费模板时（即：未配置所在区域的运费模板），不把模板对象put进result中。 2025-11-21 20:04:20 +08:00
芋道源码
4ebbe4dd35 !1441 fix: 【mall】找不到所在区域的运费收费模板和运费免费模板时（即：未配置所在区域的运费模板），不把模板对象put进result中。 
Merge pull request !1441 from 宝二爷/N/A
 2025-11-21 12:02:12 +00:00
YunaiV
24a88059fc fix：【framework】修复 easy-trans 因为数据权限，导致无法读取的问题 2025-11-21 16:56:52 +08:00
YunaiV
ed3edaf755 fix：【framework】修复 CorsFilter 因执行顺序影响到跨域配置不生效问题 2025-11-21 16:47:10 +08:00
YunaiV
5f993c6a9f Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 
# Conflicts:
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
 2025-11-21 16:41:37 +08:00
YunaiV
539746d1d8 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2025-11-21 16:34:57 +08:00
芋道源码
9061706cc2 Merge pull request #1009 from DevDengChao/fix/current-row 
fix: 重置 currentRow 时没有对模板类型进行判断
 2025-11-21 16:34:41 +08:00
YunaiV
792f4ed87b Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2025-11-21 15:59:04 +08:00
芋道源码
2989b8e509 Merge pull request #1013 from YunaiV/copilot/fix-issue-1012 
Fix WeChat Pay V3 public key incorrectly set as private certificate path
 2025-11-21 15:57:39 +08:00
YunaiV
019d5fb473 feat：【framework】增加对 LocalDateTime 类型格式化不生效问题 #1019 2025-11-21 15:52:41 +08:00
芋道源码
1efe2e74b7 Merge pull request #1019 from wunai-pl/patch-2 
增加对LocalDateTime类型格式化不生效问题
 2025-11-21 15:49:23 +08:00
wunai-pl
cc3ea86419 增加对LocalDateTime类型格式化不生效问题 
优化Field获取方式
 2025-11-20 11:48:47 +08:00
YunaiV
1a7a21826b feat：【infra】代码生成：vben5 + ele 模版中，DatePicker 增加 class: '!w-full' 保证宽度 2025-11-19 10:28:09 +08:00
copilot-swe-agent[bot]
4723b80785 Fix WeChat Pay V3 public key configuration bug 
Co-authored-by: YunaiV <2015545+YunaiV@users.noreply.github.com>
 2025-11-14 08:34:40 +00:00
copilot-swe-agent[bot]
07b03fab0d Initial plan 2025-11-14 08:30:57 +00:00
DevDengChao
243ec76df9 fix: 重置 currentRow 时没有对模板类型进行判断 2025-11-06 14:37:00 +08:00
jason
dace9cfed5 perf: [BPM 工作流] 驳回预测 review 修改 2025-10-12 16:28:49 +08:00
jason
27235016ad perf: [BPM 工作流] 驳回预测 review 修改 2025-10-12 16:20:37 +08:00
YunaiV
2769f774a0 (〃'▽'〃) v2025.10 发布：新增工作流的工单打印、优化物联网的场景联动、完善 vben5 的 antd、vben 版本的功能 v2025.10(jdk8/11) 2025-10-12 15:28:19 +08:00
YunaiV
6680c95f3d Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
 2025-10-12 15:27:37 +08:00
YunaiV
2c41d5622c (〃'▽'〃) v2025.10 发布：新增工作流的工单打印、优化物联网的场景联动、完善 vben5 的 antd、vben 版本的功能 v2025.10(jdk17/21) 2025-10-12 15:27:14 +08:00
YunaiV
daf828e2db 【同步】jdk21 和 jdk8 的代码 2025-10-12 14:52:44 +08:00
YunaiV
6aba222d9e Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceServiceInvokeSceneRuleAction.java
 2025-10-12 11:04:05 +08:00
YunaiV
4fed75935f review：【bpm 工作流】驳回的优化 2025-10-12 11:02:03 +08:00
YunaiV
a1cb21f3b1 Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 
# Conflicts:
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
 2025-10-12 10:58:36 +08:00
宝二爷
c0590e823d fix: 【mall】找不到所在区域的运费收费模板和运费免费模板时（即：未配置所在区域的运费模板），不把模板对象put进result中。 
Signed-off-by: 宝二爷 <zhangjianbao017@163.com>
 2025-10-11 16:28:30 +00:00
jason
65b8114799 perf: [BPM 工作流] 驳回预测 review 修改 2025-10-10 23:07:40 +08:00
jason
2cb726449e perf: [BPM 工作流] 驳回预测 review 修改 2025-10-10 23:06:07 +08:00
jason
120736e393 fix: [BPM 工作流] 驳回预测 review 修改 2025-10-10 10:48:54 +08:00
YunaiV
32758bc4c1 feat：【infra 基础设施】统一 InputNumber 的 controlsPosition 写法 2025-10-07 11:11:38 +08:00
YunaiV
a860aac468 feat：【antd】【ele】统一 await formApi.setValues(formData.value); 的写法 2025-10-03 09:07:11 +08:00
YunaiV
8156e44f31 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
 2025-10-02 19:06:12 +08:00
YunaiV
283c1009a4 【同步】jdk21 和 jdk8 的代码 2025-10-02 19:06:00 +08:00
YunaiV
f6232cf433 fix：【iot 物联网】增强 jdk8 的兼容性 2025-10-02 19:03:20 +08:00
YunaiV
c80ffe437f Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/config/YudaoWebAutoConfiguration.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/IotSceneRuleServiceImpl.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotDeviceControlSceneRuleAction.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java
#	yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/social/SocialClientServiceImpl.java
 2025-10-02 18:52:15 +08:00
YunaiV
b167b419f4 fix：【iot 物联网】增强 jdk8 的兼容性 2025-10-02 18:51:19 +08:00
YunaiV
1a2639e432 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2025-10-02 17:53:26 +08:00
YunaiV
8a7ae8d726 feat：【bpm 工作流】发起流程时，基于发起人作为条件的预测 2025-10-02 16:06:03 +08:00
YunaiV
c0330ae6c5 fix: 【mall 商城】分销提现的错误码重叠问题（不影响提示内容） 2025-10-02 10:27:57 +08:00
YunaiV
4bc88e2930 fix：【pay 支付】微信支付 publicKeyContent 调整为非必填，兼容 https://t.zsxq.com/ODR5V、https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues/ICUE53 2025-10-02 10:23:57 +08:00
YunaiV
b07bc3d787 fix：【bpm 工作流】已办任务的审批状态过滤不正确 2025-10-02 09:36:01 +08:00
YunaiV
2a97a49a00 fix：【mall 商城】CouponServiceImpl 报错的问题 2025-10-01 16:16:37 +08:00
芋道源码
4fa523e29c Merge pull request #983 from DevDengChao/feat/converter.py 
feat: 允许通过参数转换自定义数据库脚本文件
 2025-10-01 16:06:52 +08:00
YunaiV
32f3433577 Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2025-10-01 15:52:49 +08:00
YunaiV
24c90401d1 Merge branch 'feature/bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop 2025-10-01 15:52:35 +08:00
YunaiV
3f83569edc feat: 【IoT 物联网】新增简单类型处理器配置和处理器，优化 JSON 解析问题（移除，已经解决） 2025-10-01 15:51:52 +08:00
YunaiV
11dd2308b3 feat：【infra】优化 codegen 的 vben 模版 2025-10-01 15:39:36 +08:00