| 
						
					 | 
					
						
						
							
						
						8651f2f649
					 | 
					
						
						
							
							fix: 添加nodeIds参数,只校验预测轨迹下的节点审批人
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-17 16:03:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1023afda40
					 | 
					
						
						
							
							fix: 修复流程分支节点预测问题
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-17 10:28:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3d20ce1a9b
					 | 
					
						
						
							
							fix: 修复流程分支节点预测问题
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-17 09:52:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1f2222cf83
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/feature/bpm' into feature/bpm
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-16 08:47:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9a4bb60a78
					 | 
					
						
						
							
							【功能优化】 修改表单触发器增加条件设置
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-16 08:47:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						21a9d37f97
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-15 10:03:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c10dcf392
					 | 
					
						
						
							
							【功能修复】MALL:管理后台,无法查询到订单的情况
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-15 10:02:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a4e090383b
					 | 
					
						
						
							
							【功能新增】BPM:已完成的列表,强制移除自动完成的“发起人”节点
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-15 09:40:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						75bca650da
					 | 
					
						
						
							
							【代码评审】IoT:增加相关待定项
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-15 08:29:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						045a224c22
					 | 
					
						
						
							
							fix: 修复停用状态下的流程删除报错问题
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-14 15:51:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3ab7ad484a
					 | 
					
						
						
							
							【功能完善】IoT: 增强插件启动和停止逻辑,添加异常处理,更新错误码,优化配置文件
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-14 09:34:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						00eea85a69
					 | 
					
						
						
							
							chore: 添加必要注释
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-14 08:31:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ef29682230
					 | 
					
						
						
							
							feat: 添加节点类型以区分不同节点
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-14 08:22:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						94499c0e5f
					 | 
					
						
						
							
							fix: 移除流程图标非空校验
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-13 19:49:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c27b02beb6
					 | 
					
						
						
							
							【代码评审】IoT:增加相关待定项
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-12 18:19:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e5aede6265
					 | 
					
						
						
							
							feat: 办理人节点高亮处理
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-12 14:10:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f88f8596c
					 | 
					
						
						
							
							V2.4.1 发布~
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-09 12:34:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						542beaf47b
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master-jdk17' into master-jdk17
						
						
						
						
						
						
							
 v2.4.1(jdk8/11)
 v2.4.1(jdk17/21)
						
					 | 
					
						2025-02-09 12:33:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2d18f593ae
					 | 
					
						
						
							
							V2.4.1 发布~
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-09 12:33:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						17d0d5bb0a
					 | 
					
						
						
							
							Merge branch 'master' of https://github.com/YunaiV/ruoyi-vue-pro
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-09 11:41:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f7c56ad4eb
					 | 
					
						
						
							
							【同步】jdk21 和 jdk8 的代码
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-09 11:40:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf7ff1ca8a
					 | 
					
						
						
							
							【功能修复】CRM:CrmBusinessController 部分权限标识不正确的问题
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-09 08:11:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d75d71d7d0
					 | 
					
						
						
							
							1218 如果没查到用户也有可能是空结果集,不一定是null
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-09 07:26:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						949fa22509
					 | 
					
						
						
							
							添加项目前缀,日志无法插入 #731
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-09 07:15:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						19b5582a78
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-09 07:14:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9569c3fbed
					 | 
					
						
						
							
							【代码评审】BPM:触发器 - 表单修改
						
						
						
						
						
						
							
						
					 | 
					
						2025-02-09 06:55:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |