| 
						
					 | 
					
						
						
							
						
						2d89137809
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#106) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #106 
						
						
					 | 
					
						2024-07-25 14:19:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						f5f472854b
					 | 
					
						
						
							
							解决冲突
						
						
						
						
						
						
					 | 
					
						2024-07-25 14:17:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						737949d3ec
					 | 
					
						
						
							
							修改ui
						
						
						
						
						
						
					 | 
					
						2024-07-25 14:13:35 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e802674196
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/dy' (#105) from projects/mescc/dy into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #105 
						
						
					 | 
					
						2024-07-24 14:52:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						8da6dc6232
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/dy
						
						
						
						
						
						
					 | 
					
						2024-07-24 14:51:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						3e2661581e
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2024-07-24 14:51:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ec5e47a416
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/dy' (#104) from projects/mescc/dy into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #104 
						
						
					 | 
					
						2024-07-24 13:07:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						99d60a14bd
					 | 
					
						
						
							
							merge
						
						
						
						
						
						
					 | 
					
						2024-07-23 18:01:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						6409d2d348
					 | 
					
						
						
							
							bug
						
						
						
						
						
						
					 | 
					
						2024-07-23 17:59:11 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						71f548cb3b
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#103) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is pending 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #103 
						
						
					 | 
					
						2024-07-22 08:36:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						8ecf281f08
					 | 
					
						
						
							
							修改ui
						
						
						
						
						
						
					 | 
					
						2024-07-19 16:46:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						fa75a2b89f
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/zhp
						
						
						
						
						
						
					 | 
					
						2024-07-19 15:30:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						c469ca5ebe
					 | 
					
						
						
							
							修改ui
						
						
						
						
						
						
					 | 
					
						2024-07-19 15:30:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9b8c090f7e
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#102) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #102 
						
						
					 | 
					
						2024-07-19 13:25:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						cbae9ef922
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/zhp
						
						
						
						
						
						
					 | 
					
						2024-07-19 13:23:06 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						c7a6ad2e22
					 | 
					
						
						
							
							修改ui
						
						
						
						
						
						
					 | 
					
						2024-07-19 13:22:42 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e66ef52489
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#101) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #101 
						
						
					 | 
					
						2024-07-19 08:39:41 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						ebb7f597b9
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/zhp
						
						
						
						
						
						
					 | 
					
						2024-07-19 08:38:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						7d6a0e228f
					 | 
					
						
						
							
							修改ui
						
						
						
						
						
						
					 | 
					
						2024-07-19 08:37:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3bec7e3333
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#100) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #100 
						
						
					 | 
					
						2024-07-17 09:47:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						5444ff92f7
					 | 
					
						
						
							
							解决冲突
						
						
						
						
						
						
					 | 
					
						2024-07-17 08:56:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						0713cb1650
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-07-17 08:53:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9da2e20b24
					 | 
					
						
						
							
							Merge pull request '生产数据echarts图重写' (#99) from projects/mescc/dy into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #99 
						
						
					 | 
					
						2024-07-17 08:28:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								helloDy
							
						 
					 | 
					
						
						
							
						
						efa5a7c383
					 | 
					
						
						
							
							生产数据echarts图重写
						
						
						
						
						
						
					 | 
					
						2024-07-16 18:41:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6ba4c90767
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#98) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #98 
						
						
					 | 
					
						2024-07-12 09:32:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						b45818e2a4
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/zhp
						
						
						
						
						
						
					 | 
					
						2024-07-12 09:21:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						00a5a8ed34
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-07-12 09:20:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f51d786fd3
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#97) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #97 
						
						
					 | 
					
						2024-07-12 09:12:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						01464663fa
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/zhp
						
						
						
						
						
						
					 | 
					
						2024-07-12 09:10:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						db393bec12
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-07-12 09:09:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						59df1c16f6
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#96) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #96 
						
						
					 | 
					
						2024-07-12 09:02:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						2f2d3defd0
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/zhp
						
						
						
						
						
						
					 | 
					
						2024-07-12 09:00:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						0b847d2903
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-07-12 08:59:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5b0bb2ccdb
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#95) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #95 
						
						
					 | 
					
						2024-07-12 08:54:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						4d4feee160
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/zhp
						
						
						
						
						
						
					 | 
					
						2024-07-12 08:52:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						8d370118aa
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-07-12 08:51:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3a5c2eeb2a
					 | 
					
						
						
							
							Merge pull request '修改bug' (#94) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #94 
						
						
					 | 
					
						2024-07-12 08:35:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						72f146394b
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-07-12 08:33:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						53b10a9847
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#93) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #93 
						
						
					 | 
					
						2024-07-11 15:15:28 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						82a7a2b8cd
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-07-11 15:01:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						3e327277e9
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/zhp
						
						
						
						
						
						
					 | 
					
						2024-07-11 14:50:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						06ab8159c5
					 | 
					
						
						
							
							修改ui
						
						
						
						
						
						
					 | 
					
						2024-07-11 14:49:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cdf0525fca
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#92) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #92 
						
						
					 | 
					
						2024-07-11 14:36:34 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						0547133e35
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/zhp
						
						
						
						
						
						
					 | 
					
						2024-07-11 14:34:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						11387724de
					 | 
					
						
						
							
							修改ui
						
						
						
						
						
						
					 | 
					
						2024-07-11 14:34:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fe6fb41e29
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#91) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #91 
						
						
					 | 
					
						2024-07-11 08:28:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						074432851c
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/zhp
						
						
						
						
						
						
					 | 
					
						2024-07-10 15:46:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						8af5158a1b
					 | 
					
						
						
							
							修改bug
						
						
						
						
						
						
					 | 
					
						2024-07-10 15:46:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						46743fa4ef
					 | 
					
						
						
							
							Merge pull request 'projects/mescc/zhp' (#90) from projects/mescc/zhp into projects/mescc/develop
						
						
						
						
						
						
	
		
			
	
		
	
	
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing 
				
			 
		
		
	 
 
	 
						
						Reviewed-on: #90 
						
						
					 | 
					
						2024-07-10 15:26:27 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								‘937886381’
							
						 
					 | 
					
						
						
							
						
						91c352ff79
					 | 
					
						
						
							
							Merge branch 'projects/mescc/develop' into projects/mescc/zhp
						
						
						
						
						
						
					 | 
					
						2024-07-10 15:17:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |