tangweijie/xlcp-backend
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases Wiki Activity
9,775 Commits 4 Branches 0 Tags
Commit Graph

9775 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
d886f8196a fix: 【member】清理 socialUser 对象以确保 updateTime 正确更新 2025-11-22 10:10:28 +08:00
YunaiV
90a4f56544 fix: 【framework】添加 originalConfig 字段以保存原始文件配置，修复配置变更判断逻辑 2025-11-22 09:18:17 +08:00
YunaiV
e87f4bc6cb fix: 增加 try 处理以兼容 Windows 场景的 Excel 文件读取 2025-11-22 09:08:03 +08:00
YunaiV
aa72a94428 fix：【crm】移除 CrmReceivablePlanRespVO 中的 ExcelProperty 注解，修复导出报错 2025-11-22 08:53:44 +08:00
YunaiV
319b34addb fix：【mall】BrokerageRecordDO 的 id 改成 Long 2025-11-21 22:23:20 +08:00
YunaiV
e7b0d4e86b fix：【iot】修复 scene_rule_ids 错误成 scene_rule_id 2025-11-21 22:14:32 +08:00
YunaiV
d592080f3f fix：【bpm工作流】BpmProcessInstanceCopyServiceImpl抄送时参数顺序错误的问题#273 2025-11-21 20:32:37 +08:00
YunaiV
06b0f7e08a fix：【IoT】IotSceneRuleMessageHandler 默认关闭的问题 2025-11-21 20:31:19 +08:00
YunaiV
696c91dfec fix：【AI】检索 documents 无数据时调用召回会报错 2025-11-21 20:27:27 +08:00
YunaiV
65e1d34e85 1454 <code>selectJoinPage</code> 方法，支持带有排序参数的分页查询 2025-11-21 20:18:17 +08:00
芋道源码
c8ce4cae3f
!1454 <code>selectJoinPage</code> 方法，支持带有排序参数的分页查询 
Merge pull request !1454 from 光辉/master-jdk17-sortable-join
 2025-11-21 12:16:59 +00:00
YunaiV
073ad8798c 1446 fix: 修复API响应加密时添加加密 header 标识不生效的问题 2025-11-21 20:11:24 +08:00
芋道源码
1e76214362
!1446 fix: 修复API响应加密时添加加密 header 标识不生效的问题 
Merge pull request !1446 from sunguowei/master-jdk17
 2025-11-21 12:09:53 +00:00
芋道源码
c7a7376b26
!1448 fix(user):修复用户角色过滤逻辑，确保当用户不包含当前选中角色时返回空结果而非全部用户 
Merge pull request !1448 from Manumiter/master-jdk17
 2025-11-21 12:07:02 +00:00
YunaiV
ec2bca7331 !1441 【轻量级 PR】：fix: 【mall】找不到所在区域的运费收费模板和运费免费模板时（即：未配置所在区域的运费模板），不把模板对象put进result中。 2025-11-21 20:04:20 +08:00
芋道源码
ba8f8b3650
Merge pull request #1023 from DevDengChao/fix/postgres-init-script 
Fix postgresql init script
 2025-11-21 19:52:17 +08:00
DevDengChao
3630ce8986 fix: postgresql auto incremental id 2025-11-21 17:13:24 +08: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
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
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
2bc0df6819 【同步】最新精简版本！ 2025-10-12 15:33:30 +08:00
YunaiV
33de41b4da Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 
# Conflicts:
#	yudao-module-ai/pom.xml
#	yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/framework/security/config/SecurityConfiguration.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/model/BpmModelMetaInfoVO.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskPageReqVO.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmProcessInstanceConvert.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/definition/BpmProcessDefinitionInfoDO.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/dal/redis/BpmProcessIdRedisDAO.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmProcessInstanceStatusEnum.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/enums/task/BpmTaskStatusEnum.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/enums/BpmnVariableConstants.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/BpmnModelUtils.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/framework/flowable/core/util/SimpleModelUtils.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskService.java
#	yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmTaskServiceImpl.java
#	yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmCluePageReqVO.java
#	yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/dal/mysql/clue/CrmClueMapper.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/rule/config/IotAbstractDataSinkConfig.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/redis/RedisKeyConstants.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/enums/rule/IotSceneRuleTriggerTypeEnum.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/IotAlertRecoverSceneRuleAction.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/action/IotAlertTriggerSceneRuleAction.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/IotSceneRuleMatcher.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherHelper.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/IotSceneRuleMatcherManager.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotCurrentTimeConditionMatcher.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcher.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcher.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotSceneRuleConditionMatcher.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceEventPostTriggerMatcher.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDevicePropertyPostTriggerMatcher.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcher.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcher.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotSceneRuleTriggerMatcher.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotTimerTriggerMatcher.java
#	yudao-module-iot/yudao-module-iot-biz/src/main/resources/mapper/device/IotDevicePropertyMapper.xml
#	yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotCurrentTimeConditionMatcherTest.java
#	yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDevicePropertyConditionMatcherTest.java
#	yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/condition/IotDeviceStateConditionMatcherTest.java
#	yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceEventPostTriggerMatcherTest.java
#	yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDevicePropertyPostTriggerMatcherTest.java
#	yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceServiceInvokeTriggerMatcherTest.java
#	yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotDeviceStateUpdateTriggerMatcherTest.java
#	yudao-module-iot/yudao-module-iot-biz/src/test/java/cn/iocoder/yudao/module/iot/service/rule/scene/matcher/trigger/IotTimerTriggerMatcherTest.java
#	yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/enums/IotDeviceMessageMethodEnum.java
#	yudao-module-iot/yudao-module-iot-core/src/main/java/cn/iocoder/yudao/module/iot/core/util/IotDeviceMessageUtils.java
#	yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/manager/IotMqttConnectionManager.java
#	yudao-module-iot/yudao-module-iot-gateway/src/main/java/cn/iocoder/yudao/module/iot/gateway/protocol/mqtt/router/IotMqttUpstreamHandler.java
#	yudao-module-iot/yudao-module-iot-gateway/src/main/resources/application.yaml
#	yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/vo/RewardActivityRespVO.java
#	yudao-module-mall/yudao-module-promotion/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
#	yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/AbstractWxPayClient.java
#	yudao-module-pay/src/main/java/cn/iocoder/yudao/module/pay/framework/pay/core/client/impl/weixin/WxPayClientConfig.java
#	yudao-module-pay/src/test/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceTest.java
 2025-10-12 15:32:54 +08:00
YunaiV
2c41d5622c (〃'▽'〃) v2025.10 发布：新增工作流的工单打印、优化物联网的场景联动、完善 vben5 的 antd、vben 版本的功能 2025-10-12 15:27:14 +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
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
f6232cf433 fix：【iot 物联网】增强 jdk8 的兼容性 2025-10-02 19:03:20 +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