| 
						
					 | 
					
						
						
							
						
						700f95a334
					 | 
					
						
						
							
							合同实体修改
						
						
						
						
						
						
					 | 
					
						2025-08-22 22:46:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						aa2685c2ec
					 | 
					
						
						
							
							招采管理模块审批修改
						
						
						
						
						
						
					 | 
					
						2025-08-22 22:45:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						baf0794cce
					 | 
					
						
						
							
							同步
						
						
						
						
						
						
					 | 
					
						2025-08-22 22:40:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8e3d37718c
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2025-08-22 21:16:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						969a70f62c
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2025-08-22 21:10:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dc02c5dfae
					 | 
					
						
						
							
							修改物资逻辑
						
						
						
						
						
						
					 | 
					
						2025-08-22 19:56:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f06d46469e
					 | 
					
						
						
							
							招采管理模块修改
						
						
						
						
						
						
					 | 
					
						2025-08-22 19:46:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						476c19019e
					 | 
					
						
						
							
							修改物资逻辑
						
						
						
						
						
						
					 | 
					
						2025-08-22 18:46:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8d460b418e
					 | 
					
						
						
							
							大屏
						
						
						
						
						
						
					 | 
					
						2025-08-22 16:49:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e8e04cae63
					 | 
					
						
						
							
							大屏
						
						
						
						
						
						
					 | 
					
						2025-08-22 15:58:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						05c1a37704
					 | 
					
						
						
							
							大屏
						
						
						
						
						
						
					 | 
					
						2025-08-22 10:24:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cf5d71d528
					 | 
					
						
						
							
							添加材料使用部位,大屏
						
						
						
						
						
						
					 | 
					
						2025-08-22 09:11:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						86945b9122
					 | 
					
						
						
							
							招采管理模块修改
						
						
						
						
						
						
					 | 
					
						2025-08-21 21:41:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dad8a12e11
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/formalities/service/impl/BusFormalitiesAreConsolidatedServiceImpl.java 
						
						
					 | 
					
						2025-08-21 19:53:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f7870182ba
					 | 
					
						
						
							
							08-21-修复合规性手续搜索
						
						
						
						
						
						
					 | 
					
						2025-08-21 19:52:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2ed6d88cc7
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2025-08-21 19:08:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ba58be3857
					 | 
					
						
						
							
							08-21-查询提资人对应专业(重复)-/getProfession/{id}
						
						
						
						
						
						
					 | 
					
						2025-08-21 18:52:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e05b53f474
					 | 
					
						
						
							
							08-21-GPS获取下级PC列表
						
						
						
						
						
						
					 | 
					
						2025-08-21 17:35:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						31d7055e3e
					 | 
					
						
						
							
							工程量清单
						
						
						
						
						
						
					 | 
					
						2025-08-21 17:24:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8352da03ee
					 | 
					
						
						
							
							招采管理模块
						
						
						
						
						
						
					 | 
					
						2025-08-21 17:01:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e9b7d03fc1
					 | 
					
						
						
							
							修改物资采购联系单PDF
						
						
						
						
						
						
					 | 
					
						2025-08-21 16:17:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2b99eb8d76
					 | 
					
						
						
							
							合同
						
						
						
						
						
						
					 | 
					
						2025-08-21 15:46:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f87780ba93
					 | 
					
						
						
							
							08-21-GPS登录
						
						
						
						
						
						
					 | 
					
						2025-08-21 15:45:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c50ee5e739
					 | 
					
						
						
							
							派单3.0
						
						
						
						
						
						
					 | 
					
						2025-08-21 15:43:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ddf7c4c096
					 | 
					
						
						
							
							招标管理模块
						
						
						
						
						
						
					 | 
					
						2025-08-21 15:01:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						14432bc61e
					 | 
					
						
						
							
							08-21-优化
						
						
						
						
						
						
					 | 
					
						2025-08-21 14:48:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						26a82c8f1f
					 | 
					
						
						
							
							添加大屏模块
						
						
						
						
						
						
					 | 
					
						2025-08-21 14:33:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c5a67f0253
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2025-08-21 10:44:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0180a2f5b5
					 | 
					
						
						
							
							08-21
						
						
						
						
						
						
					 | 
					
						2025-08-21 10:33:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f031c7ba4c
					 | 
					
						
						
							
							投标管理模块
						
						
						
						
						
						
					 | 
					
						2025-08-21 00:55:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						27dd36749b
					 | 
					
						
						
							
							派单2.0
						
						
						
						
						
						
					 | 
					
						2025-08-21 00:51:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						236c1ce888
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2025-08-21 00:49:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						914c37260e
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2025-08-21 00:48:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4660a18dbd
					 | 
					
						
						
							
							08-20-供应商入库增加字段,完成招标计划
						
						
						
						
						
						
					 | 
					
						2025-08-21 00:47:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b295b09fe9
					 | 
					
						
						
							
							08-20-供应商入库增加字段,完成招标计划
						
						
						
						
						
						
					 | 
					
						2025-08-20 20:39:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7e885a5eb1
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into lcj
						
						
						
						
						
						
					 | 
					
						2025-08-20 19:46:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9ca04150f4
					 | 
					
						
						
							
							派单
						
						
						
						
						
						
					 | 
					
						2025-08-20 19:46:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						162120ec31
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2025-08-20 19:23:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						382d4b034b
					 | 
					
						
						
							
							08-20-招标计划,招标多文件处理
						
						
						
						
						
						
					 | 
					
						2025-08-20 18:50:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						63d21f8ec7
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2025-08-20 18:41:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						560cfc6658
					 | 
					
						
						
							
							投标管理模块
						
						
						
						
						
						
					 | 
					
						2025-08-20 17:31:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2a327719e2
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2025-08-20 17:02:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8ae7de2908
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2025-08-20 16:45:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						30d17b3051
					 | 
					
						
						
							
							08-20-供应商入库监听器,供应商入库新增字段
						
						
						
						
						
						
					 | 
					
						2025-08-20 15:15:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4622875948
					 | 
					
						
						
							
							合同
						
						
						
						
						
						
					 | 
					
						2025-08-20 15:10:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a7e2a9e43f
					 | 
					
						
						
							
							合约规划-限价管理模块
						
						
						
						
						
						
					 | 
					
						2025-08-20 11:48:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						faff8b81a9
					 | 
					
						
						
							
							二维码
						
						
						
						
						
						
					 | 
					
						2025-08-20 11:45:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bd382a71bb
					 | 
					
						
						
							
							08-20-修改删除供应商时,更新文件
						
						
						
						
						
						
					 | 
					
						2025-08-20 10:56:17 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5596631979
					 | 
					
						
						
							
							设计优化
						
						
						
						
						
						
					 | 
					
						2025-08-20 09:05:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce09d8ba9c
					 | 
					
						
						
							
							[add] 获取项目物资设备清单总数据
						
						
						
						
						
						
					 | 
					
						2025-08-19 22:29:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |