| 
						
					 | 
					
						
						
							
						
						4801287c01
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-lb
						
						
						
						
						
						
					 | 
					
						2024-03-21 13:35:43 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57071bc24a
					 | 
					
						
						
							
							bugfix zentao
						
						
						
						
						
						
					 | 
					
						2024-03-21 10:45:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						40ff565b92
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-zjl' (#256) from projects/mesxc-zjl into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #256 
						
						
					 | 
					
						2024-03-21 08:33:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						300a33dca4
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-zjl
						
						
						
						
						
						
					 | 
					
						2024-03-21 08:28:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6f937e1976
					 | 
					
						
						
							
							改bug
						
						
						
						
						
						
					 | 
					
						2024-03-21 08:27:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b315564489
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-zhp' (#255) from projects/mesxc-zhp into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #255 
						
						
					 | 
					
						2024-03-20 15:56:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						aa582495de
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
						
						
						
						
						
						
					 | 
					
						2024-03-20 15:55:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						6adbdac0a4
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-03-20 15:54:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						135d9f0a60
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-dy' (#254) from projects/mesxc-dy into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #254 
						
						
					 | 
					
						2024-03-20 09:00:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						e211e585af
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-dy
						
						
						
						
						
						
					 | 
					
						2024-03-20 08:48:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						630e7a95b3
					 | 
					
						
						
							
							bug 2
						
						
						
						
						
						
					 | 
					
						2024-03-20 08:48:02 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						395a6e2967
					 | 
					
						
						
							
							Merge pull request '能源bug' (#253) from projects/mesxc-zjl into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #253 
						
						
					 | 
					
						2024-03-19 14:09:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8fcf6516a3
					 | 
					
						
						
							
							能源bug
						
						
						
						
						
						
					 | 
					
						2024-03-19 14:08:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c339e5c2de
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-zhp' (#252) from projects/mesxc-zhp into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #252 
						
						
					 | 
					
						2024-03-18 16:11:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						75309dd9ea
					 | 
					
						
						
							
							修改依赖
						
						
						
						
						
						
					 | 
					
						2024-03-18 16:03:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						a0a9107863
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
						
						
						
						
						
						
					 | 
					
						2024-03-18 16:01:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						94886eedde
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-03-18 16:00:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cb3406fac3
					 | 
					
						
						
							
							Merge pull request '订单详情修改字段' (#251) from projects/mesxc-zjl into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #251 
						
						
					 | 
					
						2024-03-18 08:28:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0c5245ef9b
					 | 
					
						
						
							
							订单详情修改字段
						
						
						
						
						
						
					 | 
					
						2024-03-18 08:27:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1ea2fe2738
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-lb' (#250) from projects/mesxc-lb into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #250 
						
						
					 | 
					
						2024-03-16 19:19:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						549d66f753
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-lb
						
						
						
						
						
						
					 | 
					
						2024-03-15 17:04:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ca129f5434
					 | 
					
						
						
							
							update core-worker的全列表获取地址
						
						
						
						
						
						
					 | 
					
						2024-03-15 17:03:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b5049b22fa
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-zhp' (#249) from projects/mesxc-zhp into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #249 
						
						
					 | 
					
						2024-03-15 13:46:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						a4994ca5ae
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
						
						
						
						
						
						
					 | 
					
						2024-03-15 13:44:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						448467ed61
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-03-15 13:43:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5af67b93fb
					 | 
					
						
						
							
							Merge pull request '厂务订单里改个工单接口' (#248) from projects/mesxc-zjl into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #248 
						
						
					 | 
					
						2024-03-15 13:34:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						73928a0ed0
					 | 
					
						
						
							
							厂务订单里改个工单接口
						
						
						
						
						
						
					 | 
					
						2024-03-15 13:33:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3d33912eff
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-dy' (#247) from projects/mesxc-dy into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #247 
						
						
					 | 
					
						2024-03-15 08:29:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						db2cbb64c9
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-dy
						
						
						
						
						
						
					 | 
					
						2024-03-14 20:20:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						67948c10cb
					 | 
					
						
						
							
							bug --
						
						
						
						
						
						
					 | 
					
						2024-03-14 20:19:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						60864e7110
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-lb' (#246) from projects/mesxc-lb into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #246 
						
						
					 | 
					
						2024-03-14 18:02:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e3133cef1f
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-lb
						
						
						
						
						
						
					 | 
					
						2024-03-14 17:08:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						efdf1f5b54
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-zhp' (#244) from projects/mesxc-zhp into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #244 
						
						
					 | 
					
						2024-03-14 14:57:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						eba9d2ba60
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
						
						
						
						
						
						
					 | 
					
						2024-03-14 14:54:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						6b96f84150
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-03-14 14:54:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7de46a583f
					 | 
					
						
						
							
							Merge pull request '班组bug' (#243) from projects/mesxc-zjl into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #243 
						
						
					 | 
					
						2024-03-14 14:48:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						526bb8c534
					 | 
					
						
						
							
							班组bug
						
						
						
						
						
						
					 | 
					
						2024-03-14 14:47:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b4cd85ba0
					 | 
					
						
						
							
							1
						
						
						
						
						
						
					 | 
					
						2024-03-14 14:36:52 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						57660ee5fd
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-lb' (#242) from projects/mesxc-lb into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #242 
						
						
					 | 
					
						2024-03-14 09:03:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						764030a8da
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-lb
						
						
						
						
						
						
					 | 
					
						2024-03-14 09:01:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2d7fc02e0b
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-zhp' (#241) from projects/mesxc-zhp into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #241 
						
						
					 | 
					
						2024-03-14 08:45:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d2e38be1e1
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-lb
						
						
						
						
						
						
					 | 
					
						2024-03-13 18:16:15 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						26d2e2b7e5
					 | 
					
						
						
							
							ui drawer ui change
						
						
						
						
						
						
					 | 
					
						2024-03-13 18:14:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						25f3c5d13b
					 | 
					
						
						
							
							update 项目群更新
						
						
						
						
						
						
					 | 
					
						2024-03-13 17:04:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						0256306c0e
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
						
						
						
						
						
						
					 | 
					
						2024-03-13 15:30:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						224625e10f
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-03-13 15:30:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e55198974d
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-zhp' (#240) from projects/mesxc-zhp into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #240 
						
						
					 | 
					
						2024-03-13 14:57:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						680f852057
					 | 
					
						
						
							
							Merge branch 'projects/mesxc-test' into projects/mesxc-zhp
						
						
						
						
						
						
					 | 
					
						2024-03-13 14:55:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						6025c8fbf7
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-03-13 14:54:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a4f5e75d3d
					 | 
					
						
						
							
							Merge pull request 'projects/mesxc-dy' (#239) from projects/mesxc-dy into projects/mesxc-test
						
						
						
						
						
						
						
						Reviewed-on: #239 
						
						
					 | 
					
						2024-03-13 09:17:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |