Commit Graph

10350 Commits

Author SHA1 Message Date
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
guanghui
43372dc511 selectJoinPage 方法,支持带有排序参数的分页查询
更新了 BaseMapperX 接口的文档说明,使其更加清晰。新增了一个 `selectJoinPage` 方法,支持带有排序参数的分页查询,并兼容不分页的情况。
2025-11-07 11:00:58 +08:00
DevDengChao
243ec76df9 fix: 重置 currentRow 时没有对模板类型进行判断 2025-11-06 14:37:00 +08:00
Leslie
5c17595593 Merge branch 'YunaiV:master-jdk17' into master-jdk17 2025-10-26 13:16:58 +08:00
manumiter
31f6d03d67 fix(user):修复用户角色过滤逻辑,确保当用户不包含当前选中角色时返回空结果而非全部用户 2025-10-23 09:33:22 +08:00
sungw
6310624c42 fix: 修复API响应加密时添加加密 header 标识不生效的问题 2025-10-21 11:06:48 +08:00
Leslie
bb7eaa214c fixed(pay): 兼容微信支付公钥模式并解决报错问题 2025-10-14 01:45:18 +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
Leslie
521a24b382 Merge branch 'YunaiV:master-jdk17' into master-jdk17 2025-10-06 10:40:35 +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
YunaiV
5e46e0c4f8 review:【bpm 工作流】驳回场景下的预测 2025-10-01 15:35:06 +08:00
YunaiV
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
YunaiV
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
DevDengChao
9335b7a052 fix: gbk codec 2025-09-29 16:49:57 +08:00
DevDengChao
e302dfd5b7 chore: update showcase 2025-09-29 16:25:08 +08:00
DevDengChao
748842599f fix: args 2025-09-29 16:20:18 +08:00
DevDengChao
b5c2a185b8 feat: 允许通过参数转换自定义数据库脚本文件 2025-09-28 17:34:12 +08:00
DevDengChao
ec26883187 chore: 删除备注中残留的运行时间日志 2025-09-28 17:34:11 +08:00
A
2208396ee4 fixup! 支持 GROK 2025-09-27 23:39:47 +08:00
jason
c2f9bad3ad Merge remote-tracking branch 'origin/develop' into develop 2025-09-27 20:59:06 +08:00