Commit Graph

2987 Commits

Author SHA1 Message Date
aixianling
37340e04af BUG 30076 2022-06-08 11:37:33 +08:00
aixianling
42fbe2fcbb BUG 30082 2022-06-08 11:36:21 +08:00
aixianling
9eb9c7610c Merge remote-tracking branch 'origin/dev' into dev 2022-06-08 11:35:21 +08:00
aixianling
04ef27f3f9 BUG 30090 2022-06-08 11:35:00 +08:00
yanran200730
78247b7e9e 实时喊话 2022-06-08 11:18:02 +08:00
liuye
ee61c8f194 播放记录 2022-06-08 11:12:55 +08:00
aixianling
59bdedff60 Merge remote-tracking branch 'origin/dev' into dev 2022-06-08 11:01:11 +08:00
aixianling
4a92213a6d BUG 30084 2022-06-08 10:59:11 +08:00
yanran200730
c74ca4fdae Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev 2022-06-08 10:53:44 +08:00
yanran200730
afcb2be506 实时喊话 2022-06-08 10:53:38 +08:00
aixianling
5cde980b42 Merge remote-tracking branch 'origin/dev' into dev 2022-06-08 10:48:35 +08:00
aixianling
a7ced7a899 BUG 30097 2022-06-08 10:48:17 +08:00
liuye
ea28c38990 设备管理 2022-06-08 10:31:36 +08:00
aixianling
aae31a7bb8 优化搜索 2022-06-08 10:30:50 +08:00
aixianling
17a347e530 Merge remote-tracking branch 'origin/dev' into dev 2022-06-08 10:03:22 +08:00
aixianling
0f77efc8b9 BUG 30091 2022-06-08 10:03:06 +08:00
liuye
99ccf2fba8 群发消息bug 2022-06-08 09:43:32 +08:00
liuye
49d80c1208 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev 2022-06-07 19:08:12 +08:00
liuye
dcefef9660 bug 2022-06-07 19:07:38 +08:00
aixianling
f0a2458455 Merge remote-tracking branch 'origin/dev' into dev 2022-06-07 17:59:52 +08:00
aixianling
fc47eca88a BUG 29782 2022-06-07 17:59:35 +08:00
yanran200730
4e65790c17 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev 2022-06-07 17:59:29 +08:00
yanran200730
fd047a7b46 bug 2022-06-07 17:59:23 +08:00
liuye
9c94633114 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev 2022-06-07 17:44:35 +08:00
liuye
694e6c84f7 设备管理 2022-06-07 17:43:51 +08:00
yanran200730
8d241d6efd 实时喊话 2022-06-07 15:28:29 +08:00
liuye
b2e701b716 大喇叭 2022-06-07 15:06:06 +08:00
liuye
45d7577eb3 媒资管理 2022-06-07 14:09:56 +08:00
yanran200730
dd36a7a1e8 bug 2022-06-07 10:38:53 +08:00
yanran200730
66c7a88b34 BUG 2022-06-07 09:51:10 +08:00
yanran200730
4a66490d94 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev 2022-06-07 09:38:37 +08:00
yanran200730
7d0742cb34 实时喊话 2022-06-07 09:38:31 +08:00
liuye
be54606b0d 返回 2022-06-07 09:27:51 +08:00
liuye
5a64c3bbf5 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev 2022-06-07 09:24:58 +08:00
liuye
df535e9c41 删除多余 2022-06-07 09:24:28 +08:00
yanran200730
dfa5b9ded5 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev 2022-06-07 09:24:15 +08:00
yanran200730
9db63a6e91 实时喊话 2022-06-07 09:24:08 +08:00
liuye
7a51a28f91 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev 2022-06-07 09:12:01 +08:00
liuye
0915665e52 消息通知 2022-06-07 09:11:47 +08:00
yanran200730
22bafd7733 实时喊话 2022-06-06 18:26:24 +08:00
yanran200730
2286812805 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev 2022-06-06 17:52:41 +08:00
yanran200730
eaa1f38c40 bug 2022-06-06 17:52:36 +08:00
aixianling
00648aec5c 新网格版本提测 2022-06-06 17:27:33 +08:00
aixianling
962ef1ced4 Merge remote-tracking branch 'origin/dev' into dev 2022-06-06 17:27:11 +08:00
aixianling
b9eb1191bc 新网格版本提测 2022-06-06 17:26:56 +08:00
yanran200730
5dc3aff7a2 bug 2022-06-06 16:09:33 +08:00
liuye
02097cf031 消息发送 2022-06-06 12:03:55 +08:00
aixianling
86799c2f37 增加湖南公安项目的配置 2022-06-06 10:25:07 +08:00
aixianling
35328f3b54 增加湖南公安项目的配置 2022-06-06 10:15:45 +08:00
yanran200730
4895449771 删除控制 2022-06-02 15:47:21 +08:00