Commit Graph

2812 Commits

Author SHA1 Message Date
yanran200730
faffbaeafe 协同宣发 2022-09-05 14:31:44 +08:00
aixianling
617ef4b9c9 企业微信设置调整,系统信息科在修改调整 2022-09-05 11:11:10 +08:00
aixianling
efc537a45b 慧治理设置完毕 2022-09-05 11:08:44 +08:00
yanran200730
9cf8ffc5c1 协同宣发 2022-09-05 10:54:11 +08:00
aixianling
1ae777d0d5 兼容登录页做调整 2022-09-05 10:00:38 +08:00
aixianling
dd33829b39 Merge remote-tracking branch 'origin/dev' into build 2022-09-05 09:18:06 +08:00
yanran200730
e2acdacf1f Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-09-02 16:11:50 +08:00
yanran200730
db077cb9d5 协同宣发 2022-09-02 16:11:29 +08:00
aixianling
8edddb8cda 增加手动同步库信息脚本 2022-09-02 15:36:44 +08:00
aixianling
f68fef4012 Merge remote-tracking branch 'origin/dev' into build 2022-09-02 15:34:39 +08:00
aixianling
5a287a627a 增加手动同步库信息脚本 2022-09-02 15:25:46 +08:00
liuye
0aa51096a3 企微配置 2022-09-02 14:16:20 +08:00
aixianling
37c6f38354 Merge remote-tracking branch 'origin/dev' into build 2022-09-02 09:20:59 +08:00
liuye
a863c70ea4 企微应用配置 2022-09-01 17:46:23 +08:00
aixianling
68b8c4f43d Merge remote-tracking branch 'origin/dev' into build 2022-09-01 16:06:13 +08:00
liuye
9f8f035b83 企微配置 2022-09-01 15:58:10 +08:00
liuye
71bebd8048 企微应用配置 2022-09-01 15:31:58 +08:00
yanran200730
4a75301322 协同宣发 2022-09-01 15:08:54 +08:00
yanran200730
ec24628e02 协同宣发 2022-09-01 13:47:14 +08:00
yanran200730
7f51812208 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-09-01 13:45:49 +08:00
yanran200730
9f5b6e10a3 协同宣发 2022-09-01 13:45:42 +08:00
shijingjing
7e918cbf4a 取绝对值 2022-09-01 11:10:02 +08:00
aixianling
422b809a08 BUG 31009 2022-09-01 10:30:07 +08:00
aixianling
d34a69d143 BUG 31009 2022-09-01 10:00:53 +08:00
shijingjing
3383deabd2 31011 2022-09-01 09:30:23 +08:00
aixianling
e8b49517e2 Merge remote-tracking branch 'origin/dev' into build 2022-09-01 09:02:27 +08:00
shijingjing
6c99807d85 size 2022-08-31 17:43:01 +08:00
aixianling
b1d31708da 修复接口代理问题 2022-08-31 17:29:17 +08:00
aixianling
6c44cf5a65 Merge remote-tracking branch 'origin/dev' into build
# Conflicts:
#	packages/bigscreen/designer/components/Add.vue
2022-08-31 16:32:37 +08:00
aixianling
06f02e3435 更换新组件 2022-08-31 16:15:25 +08:00
yanran200730
564a4e57d8 31001 2022-08-31 15:16:37 +08:00
yanran200730
dd8e0b8f5f 31006 2022-08-31 14:36:52 +08:00
yanran200730
f50166c297 协同宣发 2022-08-31 14:25:01 +08:00
yanran200730
aea4f4e5c0 协同宣发 2022-08-31 14:19:04 +08:00
aixianling
28968f7cbb 统一文件名 2022-08-31 11:49:32 +08:00
aixianling
bc5408bfbc Merge remote-tracking branch 'origin/dev' into build 2022-08-31 10:58:04 +08:00
yanran200730
8a91728452 协同宣发 2022-08-31 10:29:57 +08:00
aixianling
072c780824 Merge remote-tracking branch 'origin/dev' into build 2022-08-30 18:01:05 +08:00
aixianling
c0cbb61731 定制大屏调整位置 2022-08-30 17:49:35 +08:00
aixianling
73355a8f07 定制大屏调整位置 2022-08-30 17:29:29 +08:00
aixianling
eef6c52ac5 定制大屏调整位置 2022-08-30 17:20:15 +08:00
yanran200730
70ddb69006 群发居民群 2022-08-30 17:05:02 +08:00
aixianling
33a5d975ce Merge remote-tracking branch 'origin/dev' into build 2022-08-30 16:22:31 +08:00
yanran200730
72eae2fb4b 协同宣发 2022-08-30 16:02:41 +08:00
aixianling
ee91eeb7c5 Merge branch 'dev' into build 2022-08-30 11:00:57 +08:00
yanran200730
e92613391f 郫都优化 2022-08-30 10:48:59 +08:00
yanran200730
bef847e128 bug 2022-08-30 10:37:15 +08:00
aixianling
c85c6f85fa 控制样式,当前节点,当前节点model 2022-08-29 17:20:12 +08:00
yanran200730
8f17c453e1 秀山 2022-08-29 17:17:44 +08:00
aixianling
7b6640a42e 增加权限码控制 2022-08-29 17:07:29 +08:00