Commit Graph

1054 Commits

Author SHA1 Message Date
yanran200730
826fb5f4dd 28638 2022-03-29 16:34:27 +08:00
yanran200730
6c338a5dd4 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-03-29 16:31:17 +08:00
yanran200730
6aa4d5a6d8 28647 2022-03-29 16:31:04 +08:00
aixianling
abd55bd413 BUG 28634 2022-03-29 15:59:47 +08:00
aixianling
a1d439104e BUG 28633 2022-03-29 15:54:50 +08:00
aixianling
087165af50 Merge remote-tracking branch 'origin/dev' into dev 2022-03-29 15:53:53 +08:00
aixianling
d0daec7694 BUG 28632 2022-03-29 15:53:35 +08:00
yanran200730
de2eff8ce6 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-03-29 14:18:56 +08:00
yanran200730
195a1d460d bug 2022-03-29 14:18:51 +08:00
aixianling
a7f9c41667 Merge remote-tracking branch 'origin/dev' into dev 2022-03-29 13:56:43 +08:00
aixianling
eed93b27b4 BUG 28631 2022-03-29 13:56:21 +08:00
yanran200730
92853d3f5e Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-03-29 13:41:42 +08:00
yanran200730
47c52e3ef7 大屏数据源配置 2022-03-29 13:41:35 +08:00
aixianling
4c4240e3c8 BUG 28626 2022-03-29 11:49:43 +08:00
aixianling
2d35cdc95a BUG 28622 2022-03-29 10:48:30 +08:00
aixianling
30f28a4941 BUG 28623 2022-03-29 10:47:42 +08:00
aixianling
b1d93bb65f BUG 28614 2022-03-29 09:55:50 +08:00
yanran200730
8f0f4e7106 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-03-29 09:40:02 +08:00
yanran200730
45a1f53627 bug 2022-03-29 09:39:56 +08:00
aixianling
f3e003dfd6 BUG 28608 2022-03-29 09:29:14 +08:00
aixianling
ace4a8314b BUG 28575 2022-03-29 09:24:05 +08:00
aixianling
780a912b57 Merge remote-tracking branch 'origin/dev' into dev 2022-03-29 09:21:17 +08:00
aixianling
ad0040260e BUG 28600 2022-03-29 09:20:56 +08:00
yanran200730
34631c0668 28588 2022-03-29 09:17:02 +08:00
aixianling
d4ee80b802 Merge remote-tracking branch 'origin/dev' into dev 2022-03-28 18:12:23 +08:00
aixianling
efd0842832 BUG 28607 2022-03-28 18:12:10 +08:00
yanran200730
78c9c2a40c 大屏 数据源管理 2022-03-28 18:01:13 +08:00
yanran200730
746927e826 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-03-28 17:47:59 +08:00
yanran200730
1089e784db 大屏 2022-03-28 17:47:53 +08:00
aixianling
bfd7c20187 BUG 28599 2022-03-28 17:36:48 +08:00
yanran200730
c955e7016c Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-03-28 17:29:01 +08:00
yanran200730
0ead6bdffb 视频监控 2022-03-28 17:28:55 +08:00
aixianling
352c573251 BUG 28596 2022-03-28 17:26:45 +08:00
aixianling
4b20cd2dee BUG 28594 2022-03-28 17:22:51 +08:00
aixianling
d7b59ba7e1 BUG 28591 2022-03-28 17:21:54 +08:00
aixianling
d79cb21929 BUG 28593 2022-03-28 17:21:10 +08:00
aixianling
4db6925d38 BUG 28582 2022-03-28 16:59:04 +08:00
aixianling
30047204e1 BUG 28581 2022-03-28 16:57:25 +08:00
aixianling
76154527ef Merge remote-tracking branch 'origin/dev' into dev 2022-03-28 16:49:02 +08:00
aixianling
8879a71b51 BUG 28580 2022-03-28 16:48:41 +08:00
yanran200730
a3dac13b53 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-03-28 16:41:40 +08:00
yanran200730
5c8e207a57 28579 2022-03-28 16:41:33 +08:00
aixianling
8aae62c071 Merge remote-tracking branch 'origin/dev' into dev 2022-03-28 16:34:02 +08:00
aixianling
84f60ce32f BUG 28576 2022-03-28 16:33:45 +08:00
yanran200730
64c1ae7656 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-03-28 16:30:52 +08:00
yanran200730
ca3fbd9a89 28570 2022-03-28 16:30:42 +08:00
aixianling
a54d30684d BUG 28568 2022-03-28 16:27:15 +08:00
aixianling
cd21fd3e73 自动路由规则过滤优化 2022-03-28 15:27:07 +08:00
aixianling
2d4edcfc21 Merge remote-tracking branch 'origin/dev' into dev 2022-03-28 14:56:39 +08:00
aixianling
2611a72508 BUG 28556 28553 2022-03-28 14:56:24 +08:00