Commit Graph

303 Commits

Author SHA1 Message Date
aixianling
68b8c4f43d Merge remote-tracking branch 'origin/dev' into build 2022-09-01 16:06:13 +08:00
yanran200730
ec24628e02 协同宣发 2022-09-01 13:47:14 +08:00
yanran200730
9f5b6e10a3 协同宣发 2022-09-01 13:45:42 +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
yanran200730
f50166c297 协同宣发 2022-08-31 14:25:01 +08:00
yanran200730
aea4f4e5c0 协同宣发 2022-08-31 14:19:04 +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
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
f2b9834cb1 工作台入库 2022-08-24 11:51:27 +08:00
aixianling
7bbdaee6d3 Merge branch 'dev' into build
# Conflicts:
#	components/AiOkrTree/AiOkrTree.vue
#	project/dv/apps/AppGridDV.vue
2022-08-23 11:04:07 +08:00
liuye
6561f31e2d css 2022-08-23 08:58:46 +08:00
aixianling
4bb6e3be77 Merge branch 'dev' into build 2022-08-22 15:23:01 +08:00
liuye
53ee346ba0 上架宣发 2022-08-22 11:42:30 +08:00
aixianling
b388d03536 Merge branch 'dev' into build 2022-08-19 11:54:33 +08:00
aixianling
e6c3c1c857 BUG 30939 2022-08-19 11:12:07 +08:00
liuye
329f7562db 回调 2022-08-19 10:24:51 +08:00
yanran200730
a80efb09c0 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev 2022-08-19 09:42:59 +08:00
yanran200730
122d12fec0 bug 2022-08-19 09:42:46 +08:00
liuye
17bc8ad651 30941 2022-08-19 09:15:46 +08:00
aixianling
097b434712 更换列表上标绘接口 2022-08-18 17:36:39 +08:00
aixianling
98946c1e28 构建版本修改 2022-08-12 11:20:51 +08:00
aixianling
277029ad85 上架直接使用标准版居民档案 2022-08-11 10:45:21 +08:00
liuye
a9a466cca5 选择部门 2022-08-11 09:15:22 +08:00
yanran200730
ff8120d1b5 30786 2022-08-11 08:21:56 +08:00
yanran200730
e4707cb090 30798 2022-08-11 08:14:04 +08:00
yanran200730
97181c4e8d 30796 2022-08-10 17:03:18 +08:00
yanran200730
4f6d6b9e77 bug 2022-08-10 09:55:22 +08:00
liuye
c06d38bb5f 宣发效果时间格式 2022-08-10 09:29:47 +08:00
yanran200730
e2c7e81482 30791 2022-08-09 17:52:30 +08:00
yanran200730
5aead81caa 30782 2022-08-09 16:26:59 +08:00
yanran200730
37b470cc6c 30779 2022-08-09 14:49:42 +08:00
yanran200730
01fd644312 30783 2022-08-09 14:40:52 +08:00
yanran200730
cb3f7da491 30784 2022-08-09 14:36:08 +08:00
yanran200730
1ce37c38af 30780 2022-08-09 14:29:10 +08:00
yanran200730
f8dbd96dc2 30778 2022-08-09 14:25:55 +08:00
yanran200730
61716196cd 30778 2022-08-09 14:24:39 +08:00
yanran200730
9bf8f4f754 30782 2022-08-09 14:19:57 +08:00
yanran200730
8229258af4 30785 2022-08-09 14:17:17 +08:00
yanran200730
a12a2b2d72 30781 2022-08-09 14:03:58 +08:00
yanran200730
fe14f74288 bug 2022-08-09 11:20:00 +08:00
yanran200730
c6a515554f bug 2022-08-09 09:37:22 +08:00
yanran200730
4aa1d4259d 30769 2022-08-09 09:26:20 +08:00
yanran200730
5d9ea10cb0 优化 2022-08-09 09:01:41 +08:00