Commit Graph

61 Commits

Author SHA1 Message Date
shijingjing
e631b90569 29459 2022-04-29 19:35:33 +08:00
aixianling
352843b9be Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/apps/AppMonitoringObject/Add.vue
2022-04-29 19:27:27 +08:00
aixianling
b12ae2c588 BUG 29320 2022-04-29 19:26:41 +08:00
shijingjing
44fe1bfacc 29465 2022-04-29 19:01:52 +08:00
aixianling
4f7d06ac5e 修复异常 2022-04-29 18:42:51 +08:00
aixianling
37bfe6be03 Merge remote-tracking branch 'origin/dev' into dev 2022-04-29 18:32:49 +08:00
aixianling
6089dea690 BUG 29447 2022-04-29 18:32:34 +08:00
shijingjing
302c577da5 29464 2022-04-29 18:24:51 +08:00
shijingjing
5f1ca3a0b0 Merge remote-tracking branch 'origin/dev' into dev 2022-04-29 18:16:24 +08:00
shijingjing
858dc9f2fe Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev
# Conflicts:
#	src/apps/AppMonitoringObject/Add.vue
2022-04-29 18:15:05 +08:00
aixianling
92e5773157 BUG 29440 2022-04-29 18:03:16 +08:00
shijingjing
8bc68b050a no message 2022-04-29 17:53:20 +08:00
aixianling
1fbf7197c7 BUG 29360 2022-04-29 17:48:45 +08:00
aixianling
1d66d079c4 BUG 29320 2022-04-29 17:35:50 +08:00
aixianling
80feea6142 BUG 29319 2022-04-29 17:21:25 +08:00
shijingjing
8987b09157 29459 2022-04-29 17:16:03 +08:00
shijingjing
53e7431b74 29448 2022-04-29 16:46:39 +08:00
shijingjing
3d5d5dcfae 119380 2022-04-29 16:29:52 +08:00
shijingjing
ca06bb1502 29453 2022-04-29 16:26:06 +08:00
shijingjing
89ffe4380c 29443 2022-04-29 15:58:58 +08:00
shijingjing
5318e329b2 29444 2022-04-29 15:53:42 +08:00
shijingjing
ff7fda2b30 29428 2022-04-29 15:15:01 +08:00
shijingjing
d121cf450b 29425 2022-04-29 14:12:56 +08:00
shijingjing
4e56f446b6 bug 2022-04-29 11:53:01 +08:00
shijingjing
26c37b0c03 家庭收支 2022-04-29 09:57:50 +08:00
shijingjing
d1b7ab7424 29341 2022-04-28 16:45:49 +08:00
shijingjing
5e71c0ae07 详情 2022-04-28 16:28:39 +08:00
shijingjing
129a68033e 新增 2022-04-28 15:40:24 +08:00
shijingjing
6bcf7f6b1e 编辑家庭成员 2022-04-28 12:01:02 +08:00
shijingjing
ad6f02ed67 29388 2022-04-28 11:41:35 +08:00
shijingjing
a1419dd5c4 新增个人详情 2022-04-28 09:50:49 +08:00
shijingjing
d6f0c0f4a9 29316 2022-04-28 08:20:32 +08:00
shijingjing
9f525bab46 29338 2022-04-27 18:51:46 +08:00
shijingjing
61d1256c4c 29316 2022-04-27 18:02:03 +08:00
shijingjing
4a06402b35 29318 2022-04-27 17:38:43 +08:00
shijingjing
65436e058f 29331 2022-04-27 14:30:21 +08:00
shijingjing
9477eed089 29353 2022-04-27 14:27:10 +08:00
shijingjing
95ddb550e7 29319 2022-04-27 12:43:48 +08:00
shijingjing
d78c49aff4 29334 2022-04-27 11:27:00 +08:00
shijingjing
4b5dc3e42f 29326 2022-04-27 10:17:50 +08:00
shijingjing
8431e7e283 29320 2022-04-27 10:08:42 +08:00
shijingjing
d7cb903c17 取消地区 2022-04-26 11:20:05 +08:00
shijingjing
c945b53717 新增监测 2022-04-26 10:23:07 +08:00
shijingjing
91e320c81e 居民信息 2022-04-26 09:07:11 +08:00
shijingjing
97f5af4be9 产业分类 2022-04-25 13:59:02 +08:00
shijingjing
71adfa71f7 add 2022-04-25 10:38:40 +08:00
shijingjing
afef5f372f 步骤条 2022-04-25 09:41:48 +08:00
shijingjing
036526071c 地区选择 2022-04-25 09:10:26 +08:00
liuye
0e527f3497 监测对象初始值 2022-03-29 17:11:29 +08:00
liuye
4d6f0e8334 监测对象 2022-03-29 16:38:01 +08:00