Commit Graph

81 Commits

Author SHA1 Message Date
shijingjing
0620ac6046 户类型 2022-06-13 18:46:53 +08:00
shijingjing
9775fd01f8 监测对象 2022-06-13 15:29:42 +08:00
aixianling
c75a2b7fd3 无等级网格版合并 2022-06-13 09:57:52 +08:00
shijingjing
3afde14618 防返贫 2022-06-11 15:47:54 +08:00
shijingjing
34235b0657 家庭人口 2022-06-11 15:45:06 +08:00
shijingjing
e8f736fce8 防返贫 2022-05-07 18:50:28 +08:00
shijingjing
65bcb5213b bug 2022-05-06 18:06:11 +08:00
shijingjing
39bc75b0a1 29497 2022-05-06 17:55:25 +08:00
shijingjing
5119c8d3fd bug 2022-05-06 10:18:12 +08:00
shijingjing
e0123f55d9 29495 2022-05-05 17:17:26 +08:00
shijingjing
d95e80b2f2 29495 2022-05-05 16:39:57 +08:00
shijingjing
a40ec9a147 29497 2022-05-05 15:14:28 +08:00
shijingjing
07a78300e4 29492 2022-05-05 11:44:10 +08:00
shijingjing
34f3233ed0 29472 2022-05-05 09:46:05 +08:00
shijingjing
5c6fba6949 bug 2022-04-29 21:38:19 +08:00
shijingjing
8cd4edef16 bug 2022-04-29 21:16:30 +08:00
aixianling
c56b6c7535 Merge remote-tracking branch 'origin/dev' into dev 2022-04-29 19:55:58 +08:00
aixianling
b1b96f71de BUG 29461 2022-04-29 19:55:45 +08:00
shijingjing
2878a23b92 no message 2022-04-29 19:36:01 +08:00
shijingjing
e631b90569 29459 2022-04-29 19:35:33 +08:00
aixianling
6552467cea BUG 29456 2022-04-29 19:35:24 +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