Commit Graph

9132 Commits

Author SHA1 Message Date
YunaiV 56ea9d2381 【代码优化】BPM:修复停用状态下的流程删除报错问题 2025-02-15 09:21:44 +08:00
芋道源码 64ea9906ef
!1235 fix: 修复停用状态下的流程删除报错问题
Merge pull request !1235 from SamllNorth_Lee/fix/bpm
2025-02-15 01:18:50 +00:00
YunaiV e9a3773b72 【代码评审】BPM:办理人的逻辑 2025-02-15 08:48:51 +08:00
芋道源码 04fc7404e1
!1234 BPM-办理人
Merge pull request !1234 from Lesan/feature/bpm-办理人
2025-02-15 00:37:30 +00:00
YunaiV 75bca650da 【代码评审】IoT:增加相关待定项 2025-02-15 08:29:50 +08:00
lizhixian 045a224c22 fix: 修复停用状态下的流程删除报错问题 2025-02-14 15:51:57 +08:00
安浩浩 3ab7ad484a 【功能完善】IoT: 增强插件启动和停止逻辑,添加异常处理,更新错误码,优化配置文件 2025-02-14 09:34:25 +08:00
Lesan 00eea85a69 chore: 添加必要注释 2025-02-14 08:31:15 +08:00
Lesan ef29682230 feat: 添加节点类型以区分不同节点 2025-02-14 08:22:04 +08:00
YunaiV 8826f92d9d 【代码评审】BPM:移除流程图标非空校验,还是需要 URL 格式的校验 2025-02-13 19:59:01 +08:00
芋道源码 e79494a429
!1233 fix: 移除流程图标非空校验
Merge pull request !1233 from SamllNorth_Lee/fix/bpm
2025-02-13 11:58:15 +00:00
smallNorthLee 94499c0e5f fix: 移除流程图标非空校验 2025-02-13 19:49:49 +08:00
Lesan 7cf55c5300 fix: 添加节点类型以区分不同节点 2025-02-13 09:33:12 +08:00
芋道源码 ec71cd94e8
!1226 替换javax为jakarta
Merge pull request !1226 from 冰是睡着的水/N/A
2025-02-12 10:53:57 +00:00
YunaiV f289432890 【代码评审】BPM:办理人的逻辑 2025-02-12 18:46:40 +08:00
芋道源码 25c277fbf0
!1228 BPM设计器-办理人节点
Merge pull request !1228 from Lesan/feature/bpm-办理人
2025-02-12 10:21:58 +00:00
YunaiV c27b02beb6 【代码评审】IoT:增加相关待定项 2025-02-12 18:19:53 +08:00
Lesan e5aede6265 feat: 办理人节点高亮处理 2025-02-12 14:10:20 +08:00
Lesan 0085b42518 feat: 办理人节点 2025-02-12 13:53:15 +08:00
冰是睡着的水 2ab2e45465
替换javax为jakarta
Signed-off-by: 冰是睡着的水 <850083043@qq.com>
2025-02-11 06:15:30 +00:00
YunaiV 6f88f8596c V2.4.1 发布~ 2025-02-09 12:34:31 +08:00
YunaiV e17a282bd0 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	pom.xml
#	yudao-dependencies/pom.xml
2025-02-09 12:34:01 +08:00
YunaiV 542beaf47b Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17 2025-02-09 12:33:30 +08:00
YunaiV 2d18f593ae V2.4.1 发布~ 2025-02-09 12:33:24 +08:00
YunaiV 17d0d5bb0a Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro 2025-02-09 11:41:35 +08:00
YunaiV c97fafebbe Merge remote-tracking branch 'origin/master'
# Conflicts:
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderQueryServiceImpl.java
2025-02-09 11:41:05 +08:00
YunaiV f7c56ad4eb 【同步】jdk21 和 jdk8 的代码 2025-02-09 11:40:53 +08:00
YunaiV a44a45a2cb Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/trigger/BpmHttpRequestTrigger.java
2025-02-09 11:36:21 +08:00
YunaiV cf7ff1ca8a 【功能修复】CRM:CrmBusinessController 部分权限标识不正确的问题 2025-02-09 08:11:52 +08:00
YunaiV d75d71d7d0 1218 如果没查到用户也有可能是空结果集,不一定是null 2025-02-09 07:26:30 +08:00
YunaiV d116e5eec1 【代码评审】IoT:物模型的维护 2025-02-09 07:26:01 +08:00
芋道源码 88ec5269d9
!1223 【代码优化】IoT: 物模型
Merge pull request !1223 from puhui999/iot
2025-02-08 23:23:34 +00:00
YunaiV bb11fdd3fa Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/thinkmodelfunction/IotThinkModelFunctionController.http
2025-02-09 07:23:17 +08:00
芋道源码 4c9777c8d4
!1218 如果没查到用户也有可能是空结果集,不一定是null 。
Merge pull request !1218 from 爱上猫的小鱼儿/master
2025-02-08 23:21:23 +00:00
芋道源码 d7c01b7e50
Merge pull request #731 from xiefangzhenz/bugfix/filter-logic-fix
添加项目前缀,日志无法插入
2025-02-09 07:16:09 +08:00
YunaiV 949fa22509 添加项目前缀,日志无法插入 #731 2025-02-09 07:15:59 +08:00
YunaiV 19b5582a78 Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17 2025-02-09 07:14:42 +08:00
YunaiV 4e9583fae4 Merge branch 'feature/bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 2025-02-09 07:14:23 +08:00
芋道源码 b00d22a907
Merge pull request #747 from mcwindy/master-jdk17
fix typo: adminTenentId -> adminTenantId, appTenentId -> appTenantId
2025-02-09 07:13:44 +08:00
YunaiV 129e9868fb 【代码评审】BPM:ID 编码器 2025-02-09 07:04:06 +08:00
芋道源码 3cbe59ace3
!1217 fix: 无时间中缀不设置Redis过期时间
Merge pull request !1217 from Lesan/feature/bpm-new
2025-02-08 22:58:03 +00:00
YunaiV 9569c3fbed 【代码评审】BPM:触发器 - 表单修改 2025-02-09 06:55:56 +08:00
YunaiV bc9b3715b1 【功能新增】IoT:设备拓扑图的添加 2025-02-08 21:44:49 +08:00
YunaiV 4254c06c37 【功能新增】IoT:设备注册 sub register 逻辑 2025-02-08 20:56:16 +08:00
YunaiV 5f7bb8041f 【功能新增】IoT:设备注册 register 逻辑 2025-02-08 19:31:50 +08:00
puhui999 6abd67a38c 【代码优化】IoT: 物模型 2025-02-08 17:31:11 +08:00
YunaiV d718f80108 【代码评审】IoT:plugin 相关的实现 2025-02-08 07:39:48 +08:00
YunaiV 724512399a 【功能新增】IoT:动态脚本 js、groovy demo 2025-02-08 07:29:17 +08:00
jason f5050807e1 【功能优化】 优化更新流程表单数据触发器 2025-02-07 22:45:03 +08:00
YunaiV 4919439b96 【功能新增】IoT:OTA 升级的下行消息的实现 2025-02-07 21:18:57 +08:00