| 
							
							
								 aixianling | fdf441c8e8 | BUG 30384 | 2022-06-29 14:03:58 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | d4bb5d2de0 | BUG 30357 | 2022-06-29 14:03:07 +08:00 |  | 
			
				
					| 
							
							
								 刘仕伟 | 024cb5831b | Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev | 2022-06-28 18:18:46 +08:00 |  | 
			
				
					| 
							
							
								 刘仕伟 | 84bf07717a | 设备配置 | 2022-06-28 18:18:43 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | cc211cd22b | 优化大屏组件 | 2022-06-28 18:18:37 +08:00 |  | 
			
				
					| 
							
							
								 刘仕伟 | b117cf9d51 | Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev | 2022-06-28 16:13:09 +08:00 |  | 
			
				
					| 
							
							
								 刘仕伟 | 8341473672 | 设备配置页面调整 | 2022-06-28 16:13:03 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | d021781d75 | 经办人 | 2022-06-28 16:05:19 +08:00 |  | 
			
				
					| 
							
							
								 刘仕伟 | d923fd5420 | Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev | 2022-06-28 15:08:20 +08:00 |  | 
			
				
					| 
							
							
								 刘仕伟 | 92d5b99384 | 查询条件 | 2022-06-28 15:08:13 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 315d852eaf | BUG 30381 | 2022-06-28 15:03:50 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | e1760adf4e | Merge remote-tracking branch 'origin/dev' into dev | 2022-06-28 14:55:08 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | f69550c015 | BUG 30380 | 2022-06-28 14:54:50 +08:00 |  | 
			
				
					| 
							
							
								 刘仕伟 | 18e4ffa7a1 | 列表调整 | 2022-06-28 14:42:51 +08:00 |  | 
			
				
					| 
							
							
								 刘仕伟 | 51d2b8eaf9 | 设备配置 | 2022-06-28 14:20:35 +08:00 |  | 
			
				
					| 
							
							
								 liuye | 1605d280b8 | Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev | 2022-06-28 11:54:32 +08:00 |  | 
			
				
					| 
							
							
								 liuye | 7ae4e92a93 | 设备管理 | 2022-06-28 11:53:49 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | d5fe146cec | BUG 30376 | 2022-06-28 11:42:55 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | a6924dac90 | Merge remote-tracking branch 'origin/dev' into dev | 2022-06-28 11:16:25 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 9ea41700c7 | BUG 30357 | 2022-06-28 11:16:08 +08:00 |  | 
			
				
					| 
							
							
								 liuye | 09cced8bc3 | Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev | 2022-06-28 10:40:43 +08:00 |  | 
			
				
					| 
							
							
								 liuye | 4b893b6c49 | 设备管理 | 2022-06-28 10:40:13 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 6eb7b5d13d | 30377 | 2022-06-28 10:36:31 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 4b93111ae0 | 30371 | 2022-06-27 17:54:50 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | bfa2985b2f | Merge remote-tracking branch 'origin/dev' into dev | 2022-06-27 17:42:03 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 0ac30e762e | BUG 30372 | 2022-06-27 17:41:44 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | d5fadfc498 | 格式化 | 2022-06-27 17:33:31 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 7b3fcef56e | BUG 30360 | 2022-06-27 17:22:52 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | a9e4aae662 | 30355 | 2022-06-27 14:37:00 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 0a154f0c1f | 30346 | 2022-06-27 11:17:22 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | a59a96b092 | 30344 | 2022-06-27 11:10:14 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 6e5a1c3921 | BUG 30340 | 2022-06-27 10:45:29 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | aa846b62a7 | bug 30322 | 2022-06-27 10:34:15 +08:00 |  | 
			
				
					| 
							
							
								 yanran200730 | b5ae298ee9 | bug | 2022-06-27 09:43:09 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | a3cb513b57 | 删除多余代码 | 2022-06-27 09:03:16 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 54127cc668 | Merge remote-tracking branch 'origin/dev' into dev | 2022-06-27 08:55:21 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 3e466e01cb | BUG 30330 | 2022-06-27 08:54:51 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 47b681c99d | 列表 详情 | 2022-06-24 23:21:18 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | a1ca224a98 | 完成 | 2022-06-24 23:12:16 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 07bc1389c1 | Merge remote-tracking branch 'origin/dev' into dev # Conflicts:
#	packages/wxwork/AppMassNotification/components/Add.vue
#	packages/wxwork/AppMassNotification/components/List.vue | 2022-06-24 20:52:39 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 9292429c8c | 页面整合 | 2022-06-24 20:50:47 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | 356758a184 | 群发 | 2022-06-24 20:45:45 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 6deb734d94 | Merge remote-tracking branch 'origin/dev' into dev | 2022-06-24 17:04:21 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | e55e0fc2cc | 大屏应用位置整合 | 2022-06-24 17:03:35 +08:00 |  | 
			
				
					| 
							
							
								 shijingjing | d8817261ca | 群发消息 | 2022-06-24 15:08:02 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 8e04ec040a | 大屏应用位置整合 | 2022-06-24 13:51:32 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 90ab2dec01 | 秀山需求变更 | 2022-06-23 15:58:25 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 1a3827e541 | 样式整合 | 2022-06-23 14:28:48 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | cc283155a1 | BUG 30299 | 2022-06-23 14:00:34 +08:00 |  | 
			
				
					| 
							
							
								 aixianling | 503416902c | BUG 30288 | 2022-06-22 17:45:00 +08:00 |  |