|
|
2769f774a0
|
(〃'▽'〃) v2025.10 发布：新增工作流的工单打印、优化物联网的场景联动、完善 vben5 的 antd、vben 版本的功能
v2025.10(jdk8/11)
|
2025-10-12 15:28:19 +08:00 |
|
|
|
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 |
|
|
|
2c41d5622c
|
(〃'▽'〃) v2025.10 发布：新增工作流的工单打印、优化物联网的场景联动、完善 vben5 的 antd、vben 版本的功能
v2025.10(jdk17/21)
|
2025-10-12 15:27:14 +08:00 |
|
|
|
daf828e2db
|
【同步】jdk21 和 jdk8 的代码
|
2025-10-12 14:52:44 +08:00 |
|
|
|
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 |
|
|
|
4fed75935f
|
review：【bpm 工作流】驳回的优化
|
2025-10-12 11:02:03 +08:00 |
|
|
|
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 |
|
|
|
65b8114799
|
perf: [BPM 工作流] 驳回预测 review 修改
|
2025-10-10 23:07:40 +08:00 |
|
|
|
2cb726449e
|
perf: [BPM 工作流] 驳回预测 review 修改
|
2025-10-10 23:06:07 +08:00 |
|
|
|
120736e393
|
fix: [BPM 工作流] 驳回预测 review 修改
|
2025-10-10 10:48:54 +08:00 |
|
|
|
32758bc4c1
|
feat：【infra 基础设施】统一 InputNumber 的 controlsPosition 写法
|
2025-10-07 11:11:38 +08:00 |
|
|
|
a860aac468
|
feat：【antd】【ele】统一 await formApi.setValues(formData.value); 的写法
|
2025-10-03 09:07:11 +08:00 |
|
|
|
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 |
|
|
|
283c1009a4
|
【同步】jdk21 和 jdk8 的代码
|
2025-10-02 19:06:00 +08:00 |
|
|
|
f6232cf433
|
fix：【iot 物联网】增强 jdk8 的兼容性
|
2025-10-02 19:03:20 +08:00 |
|
|
|
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 |
|
|
|
b167b419f4
|
fix：【iot 物联网】增强 jdk8 的兼容性
|
2025-10-02 18:51:19 +08:00 |
|
|
|
1a2639e432
|
Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
|
2025-10-02 17:53:26 +08:00 |
|
|
|
8a7ae8d726
|
feat：【bpm 工作流】发起流程时，基于发起人作为条件的预测
|
2025-10-02 16:06:03 +08:00 |
|
|
|
c0330ae6c5
|
fix: 【mall 商城】分销提现的错误码重叠问题（不影响提示内容）
|
2025-10-02 10:27:57 +08:00 |
|
|
|
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 |
|
|
|
b07bc3d787
|
fix：【bpm 工作流】已办任务的审批状态过滤不正确
|
2025-10-02 09:36:01 +08:00 |
|
|
|
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 |
|
|
|
32f3433577
|
Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2025-10-01 15:52:49 +08:00 |
|
|
|
24c90401d1
|
Merge branch 'feature/bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
|
2025-10-01 15:52:35 +08:00 |
|
|
|
3f83569edc
|
feat: 【IoT 物联网】新增简单类型处理器配置和处理器，优化 JSON 解析问题（移除，已经解决）
|
2025-10-01 15:51:52 +08:00 |
|
|
|
11dd2308b3
|
feat：【infra】优化 codegen 的 vben 模版
|
2025-10-01 15:39:36 +08:00 |
|
|
|
5e46e0c4f8
|
review：【bpm 工作流】驳回场景下的预测
|
2025-10-01 15:35:06 +08:00 |
|
|
|
1dc5fd2c24
|
Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
|
2025-10-01 09:52:21 +08:00 |
|
|
|
a4e230828f
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into develop
# Conflicts:
# yudao-module-infra/src/main/resources/codegen/vue3_vben5_antd/schema/api/api.ts.vm
|
2025-10-01 09:50:48 +08:00 |
|
|
|
9335b7a052
|
fix: gbk codec
|
2025-09-29 16:49:57 +08:00 |
|
|
|
e302dfd5b7
|
chore: update showcase
|
2025-09-29 16:25:08 +08:00 |
|
|
|
748842599f
|
fix: args
|
2025-09-29 16:20:18 +08:00 |
|
|
|
b5c2a185b8
|
feat: 允许通过参数转换自定义数据库脚本文件
|
2025-09-28 17:34:12 +08:00 |
|
|
|
ec26883187
|
chore: 删除备注中残留的运行时间日志
|
2025-09-28 17:34:11 +08:00 |
|
|
|
c2f9bad3ad
|
Merge remote-tracking branch 'origin/develop' into develop
|
2025-09-27 20:59:06 +08:00 |
|
|
|
8be3a3f87e
|
perf: [BPM 工作流] 优化回退操作，流程预测不准确的问题
|
2025-09-27 20:56:10 +08:00 |
|
|
|
98f9e44b24
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
|
2025-09-27 14:17:33 +08:00 |
|
|
|
772326e7e2
|
feat：【crm 系统】线索查询时，增加 times 范围查询
|
2025-09-27 14:14:41 +08:00 |
|
|
|
c92fa0685c
|
!1438 修复用户领取不限发放数量的优惠券时的校验错误
Merge pull request !1438 from johnh/master
|
2025-09-27 02:36:22 +00:00 |
|
|
|
aaa3f55339
|
!1438 修复用户领取不限发放数量的优惠券时的校验错误
|
2025-09-27 10:31:52 +08:00 |
|
|
|
c73f529dd7
|
修复用户领取不限发放数量的优惠券时的校验错误
|
2025-09-26 22:10:08 +08:00 |
|
|
|
341e72c0b1
|
feat: 【IoT 物联网】新增简单类型处理器配置和处理器，优化 JSON 解析问题
|
2025-09-22 23:10:26 +08:00 |
|
|
|
79df9fe8e2
|
fix：【system 系统管理】justauth 三方登录允许禁用
|
2025-09-21 10:40:51 +08:00 |
|
|
|
a9fdc6b42d
|
fix：【framework 框架】确保在 Bean 创建前映射应用请求前缀
|
2025-09-20 21:49:56 +08:00 |
|
|
|
b8ad3d6829
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
|
2025-09-20 21:33:57 +08:00 |
|
|
|
5d456f1336
|
feat：【infra 基础设施】ftp、sftp 库升级与兼容
|
2025-09-20 21:33:27 +08:00 |
|
|
|
455a012644
|
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
# yudao-dependencies/pom.xml
# 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/framework/file/core/client/ftp/FtpFileClientConfig.java
# yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/sftp/SftpFileClientConfig.java
|
2025-09-20 21:32:03 +08:00 |
|
|
|
568216084e
|
feat：【infra 基础设施】ftp、sftp 库升级与兼容
|
2025-09-20 21:30:53 +08:00 |
|
