aixianling
							
						 
					 | 
					
						
						
							
						
						70aa2ef31e
					 | 
					
						
						
							
							BUG 27847
						
						
						
						
						
						
					 | 
					
						2022-03-01 14:18:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						a251149452
					 | 
					
						
						
							
							BUG 27803
						
						
						
						
						
						
					 | 
					
						2022-03-01 14:14:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						9d1e81b492
					 | 
					
						
						
							
							BUG 27840
						
						
						
						
						
						
					 | 
					
						2022-03-01 14:10:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						4ac2f5a134
					 | 
					
						
						
							
							BUG 27835
						
						
						
						
						
						
					 | 
					
						2022-03-01 12:17:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						c6b293d4bd
					 | 
					
						
						
							
							BUG 27833
						
						
						
						
						
						
					 | 
					
						2022-03-01 12:13:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						2e7adce3db
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-03-01 12:10:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						30965d9bdf
					 | 
					
						
						
							
							BUG 27881
						
						
						
						
						
						
					 | 
					
						2022-03-01 12:10:26 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						19e82479e4
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-03-01 12:02:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						6d7492cebe
					 | 
					
						
						
							
							去掉areaId
						
						
						
						
						
						
					 | 
					
						2022-03-01 12:02:32 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						6f5d6c6ee7
					 | 
					
						
						
							
							BUG 27803
						
						
						
						
						
						
					 | 
					
						2022-03-01 12:00:13 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						e887776b57
					 | 
					
						
						
							
							BUG 27790
						
						
						
						
						
						
					 | 
					
						2022-03-01 11:58:30 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						6f1b930a54
					 | 
					
						
						
							
							BUG 27782
						
						
						
						
						
						
					 | 
					
						2022-03-01 11:57:51 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						6618bc07cb
					 | 
					
						
						
							
							BUG 27773
						
						
						
						
						
						
					 | 
					
						2022-03-01 11:56:58 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						9fefb8fe7e
					 | 
					
						
						
							
							BUG 27749
						
						
						
						
						
						
					 | 
					
						2022-03-01 11:55:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						1b70874b25
					 | 
					
						
						
							
							BUG 27802
						
						
						
						
						
						
					 | 
					
						2022-03-01 11:54:22 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						54f35593d3
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-03-01 11:19:57 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						d2244a049c
					 | 
					
						
						
							
							BUG 27801
						
						
						
						
						
						
					 | 
					
						2022-03-01 11:19:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						a64d93f2e6
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-03-01 11:06:40 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						1188f2532e
					 | 
					
						
						
							
							27869
						
						
						
						
						
						
					 | 
					
						2022-03-01 11:06:37 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						f32f109095
					 | 
					
						
						
							
							BUG 27811
						
						
						
						
						
						
					 | 
					
						2022-03-01 10:36:47 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						f20a2d8146
					 | 
					
						
						
							
							BUG 27793
						
						
						
						
						
						
					 | 
					
						2022-03-01 10:34:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						d6ca31c7b1
					 | 
					
						
						
							
							BUG 27783
						
						
						
						
						
						
					 | 
					
						2022-03-01 10:31:18 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						adac56a1c1
					 | 
					
						
						
							
							BUG 27779
						
						
						
						
						
						
					 | 
					
						2022-03-01 10:30:01 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						f01a37a883
					 | 
					
						
						
							
							BUG 27778
						
						
						
						
						
						
					 | 
					
						2022-03-01 10:28:54 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						3c7983bf65
					 | 
					
						
						
							
							BUG 27776
						
						
						
						
						
						
					 | 
					
						2022-03-01 10:27:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						c0a7716606
					 | 
					
						
						
							
							BUG 27748
						
						
						
						
						
						
					 | 
					
						2022-03-01 10:24:16 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						04b2f02a13
					 | 
					
						
						
							
							BUG 27747
						
						
						
						
						
						
					 | 
					
						2022-03-01 10:15:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						47c22cb822
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into dev
						
						
						
						
						
						
					 | 
					
						2022-03-01 10:04:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								aixianling
							
						 
					 | 
					
						
						
							
						
						c01c66c8ca
					 | 
					
						
						
							
							BUG 27819
						
						
						
						
						
						
					 | 
					
						2022-03-01 10:03:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						00bd53dd3a
					 | 
					
						
						
							
							设置最热
						
						
						
						
						
						
					 | 
					
						2022-03-01 10:01:03 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						d9ba2bc1c5
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-02-28 18:09:24 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						8790f07496
					 | 
					
						
						
							
							27816
						
						
						
						
						
						
					 | 
					
						2022-02-28 18:09:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						7381b11f0f
					 | 
					
						
						
							
							27614
						
						
						
						
						
						
					 | 
					
						2022-02-28 17:53:46 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						5b668855f3
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-02-28 17:48:48 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						7c187894b3
					 | 
					
						
						
							
							审批意见
						
						
						
						
						
						
					 | 
					
						2022-02-28 17:48:45 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						6818260611
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
						
						# Conflicts:
#	examples/entries.js 
						
						
					 | 
					
						2022-02-28 17:16:09 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						0f96320a9b
					 | 
					
						
						
							
							27658
						
						
						
						
						
						
					 | 
					
						2022-02-28 17:15:31 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						73bfdcb4c3
					 | 
					
						
						
							
							27791
						
						
						
						
						
						
					 | 
					
						2022-02-28 17:08:55 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						835502ba9f
					 | 
					
						
						
							
							27794
						
						
						
						
						
						
					 | 
					
						2022-02-28 16:56:04 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						6f395305bf
					 | 
					
						
						
							
							27799
						
						
						
						
						
						
					 | 
					
						2022-02-28 16:54:50 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						6a70b457de
					 | 
					
						
						
							
							27804
						
						
						
						
						
						
					 | 
					
						2022-02-28 16:49:12 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						82d8c9a826
					 | 
					
						
						
							
							27797
						
						
						
						
						
						
					 | 
					
						2022-02-28 16:32:49 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						1c884e1b1b
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-02-28 16:25:39 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						da306f69ea
					 | 
					
						
						
							
							新闻调整
						
						
						
						
						
						
					 | 
					
						2022-02-28 16:25:36 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						fd7897694c
					 | 
					
						
						
							
							27638
						
						
						
						
						
						
					 | 
					
						2022-02-28 10:16:21 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						0eddd90703
					 | 
					
						
						
							
							27480
						
						
						
						
						
						
					 | 
					
						2022-02-28 10:06:44 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						0da9b78a13
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-02-28 10:03:59 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								yanran200730
							
						 
					 | 
					
						
						
							
						
						3c44b2580d
					 | 
					
						
						
							
							27723
						
						
						
						
						
						
					 | 
					
						2022-02-28 10:03:53 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						82b11cd362
					 | 
					
						
						
							
							Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev
						
						
						
						
						
						
					 | 
					
						2022-02-28 10:01:29 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								刘仕伟
							
						 
					 | 
					
						
						
							
						
						0369ac26db
					 | 
					
						
						
							
							调整权限
						
						
						
						
						
						
					 | 
					
						2022-02-28 10:01:25 +08:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |