| 
						
					 | 
					
						
						
							
						
						e0bb149e44
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-04-22 16:00:20 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f81e56feab
					 | 
					
						
						
							
							BUG 29262
						
						
						
						
						
						
					 | 
					
						2022-04-22 16:00:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						4b994d76e9
					 | 
					
						
						
							
							修改三涧溪apps的引入
						
						
						
						
						
						
					 | 
					
						2022-04-22 07:54:53 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						426ce5f49a
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-04-22 15:45:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						460a2b0ab7
					 | 
					
						
						
							
							BUG 29252
						
						
						
						
						
						
					 | 
					
						2022-04-22 15:44:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						9c0685e4ff
					 | 
					
						
						
							
							29257
						
						
						
						
						
						
					 | 
					
						2022-04-22 15:44:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3abcf75a3f
					 | 
					
						
						
							
							BUG 29255
						
						
						
						
						
						
					 | 
					
						2022-04-22 15:29:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						01e1bc3d7a
					 | 
					
						
						
							
							BUG 29245
						
						
						
						
						
						
					 | 
					
						2022-04-22 15:28:08 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4d1df90887
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-04-22 15:24:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e687a6b572
					 | 
					
						
						
							
							BUG 29253
						
						
						
						
						
						
					 | 
					
						2022-04-22 15:23:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						53a185fec6
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2022-04-22 14:21:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						74adde5a40
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-04-22 14:13:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						03d990f8b5
					 | 
					
						
						
							
							优化
						
						
						
						
						
						
					 | 
					
						2022-04-22 14:13:07 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d52d2b352d
					 | 
					
						
						
							
							BUG 29254
						
						
						
						
						
						
					 | 
					
						2022-04-22 10:57:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						41bc5e8750
					 | 
					
						
						
							
							BUG 29253
						
						
						
						
						
						
					 | 
					
						2022-04-22 10:49:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f796fbc536
					 | 
					
						
						
							
							BUG 29249
						
						
						
						
						
						
					 | 
					
						2022-04-22 10:48:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c6a9856689
					 | 
					
						
						
							
							BUG 29247
						
						
						
						
						
						
					 | 
					
						2022-04-22 10:39:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6359ceecb3
					 | 
					
						
						
							
							BUG 29247
						
						
						
						
						
						
					 | 
					
						2022-04-22 10:38:14 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f2bcbffde4
					 | 
					
						
						
							
							BUG 29245
						
						
						
						
						
						
					 | 
					
						2022-04-22 10:36:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8bdc53d7ca
					 | 
					
						
						
							
							BUG 29244
						
						
						
						
						
						
					 | 
					
						2022-04-22 10:34:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d697c5213f
					 | 
					
						
						
							
							BUG 29243
						
						
						
						
						
						
					 | 
					
						2022-04-22 10:33:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b7104acd58
					 | 
					
						
						
							
							BUG 29242
						
						
						
						
						
						
					 | 
					
						2022-04-22 10:30:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b84d3bec66
					 | 
					
						
						
							
							BUG 29227
						
						
						
						
						
						
					 | 
					
						2022-04-22 10:29:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d2264c90d1
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-04-22 09:57:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1d0de7a9c5
					 | 
					
						
						
							
							BUG 29241
						
						
						
						
						
						
					 | 
					
						2022-04-22 09:57:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						cce3c47466
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-04-21 16:11:56 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						a01d79fe2f
					 | 
					
						
						
							
							视频监控
						
						
						
						
						
						
					 | 
					
						2022-04-21 16:11:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						283fb8767d
					 | 
					
						
						
							
							BUG 29229
						
						
						
						
						
						
					 | 
					
						2022-04-21 15:08:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9baf7fe2ef
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-04-21 15:07:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4ff43d632e
					 | 
					
						
						
							
							BUG 29236
						
						
						
						
						
						
					 | 
					
						2022-04-21 15:07:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						49dabf912c
					 | 
					
						
						
							
							视频监控
						
						
						
						
						
						
					 | 
					
						2022-04-21 15:04:23 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2fe01ec7cf
					 | 
					
						
						
							
							BUG 29223
						
						
						
						
						
						
					 | 
					
						2022-04-21 15:02:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7250ff3a45
					 | 
					
						
						
							
							BUG 29202
						
						
						
						
						
						
					 | 
					
						2022-04-21 14:53:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						832be3f1ec
					 | 
					
						
						
							
							BUG 29192
						
						
						
						
						
						
					 | 
					
						2022-04-21 14:52:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						69347cde15
					 | 
					
						
						
							
							BUG 29186
						
						
						
						
						
						
					 | 
					
						2022-04-21 14:47:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f384b4c73d
					 | 
					
						
						
							
							BUG 29174
						
						
						
						
						
						
					 | 
					
						2022-04-21 14:32:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						0c2b0c6733
					 | 
					
						
						
							
							三涧溪添加标签管理
						
						
						
						
						
						
					 | 
					
						2022-04-21 10:04:10 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						a49fb6016b
					 | 
					
						
						
							
							增加删除按钮
						
						
						
						
						
						
					 | 
					
						2022-04-20 18:15:33 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						0370ea61d9
					 | 
					
						
						
							
							BUG 29228
						
						
						
						
						
						
					 | 
					
						2022-04-20 18:09:00 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						25bdc08ede
					 | 
					
						
						
							
							BUG 29226
						
						
						
						
						
						
					 | 
					
						2022-04-20 18:07:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						e2583c25f9
					 | 
					
						
						
							
							BUG 29225
						
						
						
						
						
						
					 | 
					
						2022-04-20 18:07:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						d01a7b58fa
					 | 
					
						
						
							
							BUG 29227
						
						
						
						
						
						
					 | 
					
						2022-04-20 18:04:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						d3cb80666e
					 | 
					
						
						
							
							BUG 29205
						
						
						
						
						
						
					 | 
					
						2022-04-20 18:03:38 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						a52c3a1eca
					 | 
					
						
						
							
							BUG 29172
						
						
						
						
						
						
					 | 
					
						2022-04-20 17:58:19 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						38fcdfdb70
					 | 
					
						
						
							
							BUG 29193
						
						
						
						
						
						
					 | 
					
						2022-04-20 17:55:05 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						2360db1924
					 | 
					
						
						
							
							BUG 29190
						
						
						
						
						
						
					 | 
					
						2022-04-20 17:53:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						9baf96b0c2
					 | 
					
						
						
							
							BUG 29194
						
						
						
						
						
						
					 | 
					
						2022-04-20 17:51:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						44e8683cd5
					 | 
					
						
						
							
							BUG 29196
						
						
						
						
						
						
					 | 
					
						2022-04-20 17:50:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						9efa58ad49
					 | 
					
						
						
							
							BUG 29200
						
						
						
						
						
						
					 | 
					
						2022-04-20 17:47:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						71631bf2ca
					 | 
					
						
						
							
							BUG 29221
						
						
						
						
						
						
					 | 
					
						2022-04-20 17:46:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |