| 
						
					 | 
					
						
						
							
						
						d63e315876
					 | 
					
						
						
							
							【代码优化】Bpm:调整 IntArrayValuable 到 ArrayValuable
						
						
						
						
						
						
					 | 
					
						2025-01-24 22:55:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bb798681f7
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/bpm
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModeConditionTypeEnum.java
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmSimpleModelNodeTypeEnum.java
#	yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/definition/BpmUserTaskRejectHandlerTypeEnum.java 
						
						
					 | 
					
						2025-01-24 22:48:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aab61f7963
					 | 
					
						
						
							
							【代码评审】Bpm:更多设置-摘要设置
						
						
						
						
						
						
					 | 
					
						2025-01-24 21:03:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0911d42e49
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnum.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumCollectionValidator.java
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/validation/InEnumValidator.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/BrokerageUserController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java 
						
						
					 | 
					
						2025-01-24 20:56:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0e07da807a
					 | 
					
						
						
							
							Merge branch 'master-jdk17' of https://github.com/YunaiV/ruoyi-vue-pro into master-jdk17
						
						
						
						
						
						
					 | 
					
						2025-01-24 20:17:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						295fad7d97
					 | 
					
						
						
							
							Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17
						
						
						
						
						
						
					 | 
					
						2025-01-24 20:17:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a78e536906
					 | 
					
						
						
							
							Merge pull request #745 from mcwindy/desensitization_fix
						
						
						
						
						
						
						
						【代码优化】 简化滑动脱敏处理器实现 
						
						
					 | 
					
						2025-01-24 20:15:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a33fb12799
					 | 
					
						
						
							
							!1212 【代码优化】InEnum 不必须指定 int 类型,通过泛型指定
						
						
						
						
						
						
						
						Merge pull request !1212 from puhui999/develop 
						
						
					 | 
					
						2025-01-24 12:12:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d9351d066
					 | 
					
						
						
							
							【代码评审】Bpm:更多设置-摘要设置
						
						
						
						
						
						
					 | 
					
						2025-01-24 19:59:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d11684c2ae
					 | 
					
						
						
							
							!1210 feat: BPM-更多设置-摘要设置
						
						
						
						
						
						
						
						Merge pull request !1210 from Lesan/feature/bpm-摘要设置 
						
						
					 | 
					
						2025-01-24 11:39:15 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d83b7cd5b9
					 | 
					
						
						
							
							【代码优化】InEnum 不必须指定 int 类型,通过泛型指定
						
						
						
						
						
						
					 | 
					
						2025-01-24 17:31:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						03d4f60e80
					 | 
					
						
						
							
							[fix]:code  review
						
						
						
						
						
						
					 | 
					
						2025-01-24 15:56:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						39e68af120
					 | 
					
						
						
							
							fix: 取消摘要数组倒序
						
						
						
						
						
						
					 | 
					
						2025-01-24 13:22:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b5ba500b60
					 | 
					
						
						
							
							feat: BPM-更多设置-摘要设置
						
						
						
						
						
						
					 | 
					
						2025-01-24 13:11:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8f4543a270
					 | 
					
						
						
							
							fix: 通过new HashMap替换clone
						
						
						
						
						
						
					 | 
					
						2025-01-24 10:30:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bcfa08f8ef
					 | 
					
						
						
							
							fix: 类更名CustomTitleSetting->TitleSetting
						
						
						
						
						
						
					 | 
					
						2025-01-24 10:28:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						408f88da54
					 | 
					
						
						
							
							【代码优化】 简化滑动脱敏处理器实现
						
						
						
						
						
						
					 | 
					
						2025-01-24 02:05:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bd7f9761d8
					 | 
					
						
						
							
							https://gitee.com/zhijiantianya/yudao-cloud/pulls/165/files
						
						
						
						
						
						
					 | 
					
						2025-01-23 20:16:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						846d0605d8
					 | 
					
						
						
							
							【代码评审】IoT:清理流程的实例们
						
						
						
						
						
						
					 | 
					
						2025-01-23 20:08:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						281d3d1d53
					 | 
					
						
						
							
							!1194 BPM:流程清理(添加任务和抄送)
						
						
						
						
						
						
						
						Merge pull request !1194 from Lesan/feature/bpm-流程清理 
						
						
					 | 
					
						2025-01-23 12:06:17 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dcf55c3533
					 | 
					
						
						
							
							!1196 修复角色更新时,记录的操作日志将更新前的数据记录为空的问题
						
						
						
						
						
						
						
						* 修复角色更新时,记录的操作日志将更新前的数据记录为空的问题 
						
						
					 | 
					
						2025-01-23 12:05:09 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0ff1244e5
					 | 
					
						
						
							
							【代码评审】Bpm:更多设置-自定义标题
						
						
						
						
						
						
					 | 
					
						2025-01-23 19:19:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4f962bd1f7
					 | 
					
						
						
							
							[fix]:code  review
						
						
						
						
						
						
					 | 
					
						2025-01-23 16:54:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e99eb5c813
					 | 
					
						
						
							
							!1206 feat: BPM-更多设置-标题设置
						
						
						
						
						
						
						
						Merge pull request !1206 from Lesan/feature/bpm-标题设置 
						
						
					 | 
					
						2025-01-23 04:58:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2ceca1a20d
					 | 
					
						
						
							
							!1207 【缺陷修复】商城
						
						
						
						
						
						
						
						Merge pull request !1207 from puhui999/develop 
						
						
					 | 
					
						2025-01-23 04:41:00 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e89e3c946d
					 | 
					
						
						
							
							【缺陷修复】商城:虚拟成团后所有成员添加虚拟成团标记
						
						
						
						
						
						
					 | 
					
						2025-01-23 12:08:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						de297e3a78
					 | 
					
						
						
							
							feat: BPM-更多设置-标题设置
						
						
						
						
						
						
					 | 
					
						2025-01-23 12:06:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						30a24601cd
					 | 
					
						
						
							
							【缺陷修复】商城:修复积分不够还能兑换商品的 bug
						
						
						
						
						
						
					 | 
					
						2025-01-23 11:55:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d3352308d4
					 | 
					
						
						
							
							【代码优化】积分商城
						
						
						
						
						
						
					 | 
					
						2025-01-23 10:49:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						61e3275231
					 | 
					
						
						
							
							【代码评审】Bpm:触发器的实现
						
						
						
						
						
						
					 | 
					
						2025-01-23 08:13:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						808f23ec49
					 | 
					
						
						
							
							!1204 BPM:更多设置-自动去重
						
						
						
						
						
						
						
						Merge pull request !1204 from Lesan/feature/bpm-自动去重 
						
						
					 | 
					
						2025-01-22 23:59:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8a8dc67d72
					 | 
					
						
						
							
							【功能新增】新增Simple 设计器触发器节点
						
						
						
						
						
						
					 | 
					
						2025-01-22 22:18:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2b27085ec2
					 | 
					
						
						
							
							feat:simulator2
						
						
						
						
						
						
					 | 
					
						2025-01-22 22:08:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						13ced8a114
					 | 
					
						
						
							
							Merge branch 'feature/iot' of https://gitee.com/alwayssuper/ruoyi-vue-pro into feature/iot
						
						
						
						
						
						
						
						 Conflicts:
	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/ExampleService.java 
						
						
					 | 
					
						2025-01-22 20:30:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0707792755
					 | 
					
						
						
							
							[fix]:code  review
						
						
						
						
						
						
					 | 
					
						2025-01-22 16:59:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e548d4454e
					 | 
					
						
						
							
							fix: 优化代码逻辑
						
						
						
						
						
						
					 | 
					
						2025-01-22 10:08:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6317a4f361
					 | 
					
						
						
							
							fix: 自动通过枚举变更
						
						
						
						
						
						
					 | 
					
						2025-01-22 09:52:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e7999749fb
					 | 
					
						
						
							
							Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into origin/feature/iot
						
						
						
						
						
						
						
						# Conflicts:
#	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/ExampleService.java 
						
						
					 | 
					
						2025-01-22 08:32:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3c3a12acc1
					 | 
					
						
						
							
							Merge branch 'feature/iot' of https://gitee.com/alwayssuper/ruoyi-vue-pro into feature/iot
						
						
						
						
						
						
						
						 Conflicts:
	yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/plugin/ExampleService.java 
						
						
					 | 
					
						2025-01-21 20:48:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5b75a4fb8a
					 | 
					
						
						
							
							Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
						
						
						
						
						
						
					 | 
					
						2025-01-21 20:46:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						916024b891
					 | 
					
						
						
							
							【功能新增】IoT:验证通过独立、内嵌模式的调用
						
						
						
						
						
						
					 | 
					
						2025-01-21 19:38:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a152f6d98f
					 | 
					
						
						
							
							【功能完善】IoT: 删除旧版 HTTP 插件,新增 HTTP 和 MQTT 插件,重构插件管理逻辑,优化代码结构,支持 EMQX 插件,更新相关配置文件。
						
						
						
						
						
						
					 | 
					
						2025-01-21 18:18:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ca1d9e6896
					 | 
					
						
						
							
							【代码评审】Bpm:更多设置-自动去重(审批)
						
						
						
						
						
						
					 | 
					
						2025-01-21 09:37:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c55f77f001
					 | 
					
						
						
							
							!1202 BPM-更多设置-自动去重
						
						
						
						
						
						
						
						Merge pull request !1202 from Lesan/feature/bpm-自动去重 
						
						
					 | 
					
						2025-01-21 01:21:08 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3ec5b19a77
					 | 
					
						
						
							
							!1200 BPM:更多设置-流程编码
						
						
						
						
						
						
						
						Merge pull request !1200 from Lesan/feature/bpm-流程编码 
						
						
					 | 
					
						2025-01-21 01:18:45 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0642c5ebe4
					 | 
					
						
						
							
							fix: 通过理由更改
						
						
						
						
						
						
					 | 
					
						2025-01-21 08:39:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d8bc3a46e5
					 | 
					
						
						
							
							feat: BPM-更多设置-自动去重
						
						
						
						
						
						
					 | 
					
						2025-01-21 08:24:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0cb148a33d
					 | 
					
						
						
							
							Merge branch 'feature/iot' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/iot
						
						
						
						
						
						
					 | 
					
						2025-01-20 20:31:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d608c4b984
					 | 
					
						
						
							
							【功能实现】IoT:增加 HttpPlugin 独立启动的 demo
						
						
						
						
						
						
					 | 
					
						2025-01-20 20:02:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3647fd3686
					 | 
					
						
						
							
							【代码优化】IoT:移除 ServiceRegistry,使用 SpringUtils 替代
						
						
						
						
						
						
					 | 
					
						2025-01-20 19:28:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |