Commit Graph

837 Commits

Author SHA1 Message Date
花有清香月有阴
26e1d9e6ea Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev 2021-12-31 14:18:52 +08:00
花有清香月有阴
09a7c47480 26269 2021-12-31 14:18:43 +08:00
aixianling
c3a865fa0a Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/apps/AppWalkask/AppWalkask.vue
2021-12-31 14:13:38 +08:00
aixianling
6392826608 BUG 26212 2021-12-31 14:13:00 +08:00
花有清香月有阴
adeb6f3062 26122 2021-12-31 14:07:32 +08:00
花有清香月有阴
7429e255a5 26206 2021-12-31 11:53:11 +08:00
花有清香月有阴
c97b6515f0 26261 2021-12-31 11:48:12 +08:00
花有清香月有阴
b7261fd838 26262 2021-12-31 11:44:34 +08:00
花有清香月有阴
aa9cc87b52 26211 2021-12-31 11:28:45 +08:00
花有清香月有阴
c1e3fbd7b5 26209 2021-12-31 11:11:56 +08:00
花有清香月有阴
6a62d6fbaf 26209 2021-12-31 11:10:29 +08:00
aixianling
88a1e7fddf 同步问卷表单 2021-12-31 11:05:00 +08:00
aixianling
9c75da02dd BUG 26212 2021-12-31 11:03:45 +08:00
aixianling
becae6f41c BUG 26225 2021-12-31 11:00:16 +08:00
aixianling
3805678f60 Merge remote-tracking branch 'origin/dev' into dev 2021-12-31 11:00:04 +08:00
aixianling
6a81d36beb BUG 26225 2021-12-31 11:00:00 +08:00
aixianling
5ac5516c84 BUG 26225 2021-12-31 10:59:51 +08:00
花有清香月有阴
7e935bc4c6 人员选择 2021-12-31 10:59:00 +08:00
liuye
1e12c3e3e6 ct 2021-12-31 10:42:04 +08:00
liuye
e809d92adc 问卷表单 2021-12-31 10:41:48 +08:00
aixianling
99f84a7ff2 Merge remote-tracking branch 'origin/dev' into dev 2021-12-31 10:28:49 +08:00
aixianling
f395c5afd0 BUG 26119 2021-12-31 10:28:36 +08:00
liuye
c6b145c12f bug 2021-12-31 10:24:08 +08:00
aixianling
41b4957440 Merge remote-tracking branch 'origin/dev' into dev 2021-12-31 10:23:02 +08:00
aixianling
8b7c7694c9 BUG 26241 2021-12-31 10:22:47 +08:00
花有清香月有阴
9375544f6c 走访慰问人员选择 2021-12-31 10:19:09 +08:00
aixianling
f191726408 BUG 26233 2021-12-31 10:16:43 +08:00
aixianling
969b64ff97 同步3.0 2021-12-31 09:38:08 +08:00
aixianling
80db42b055 Merge remote-tracking branch 'origin/dev' into dev 2021-12-30 21:05:55 +08:00
aixianling
f510951dc7 提交一波居民议事 2021-12-30 21:05:45 +08:00
花有清香月有阴
15b3caefb6 selectType 2021-12-30 20:51:37 +08:00
aixianling
24d5fa8f5d Merge remote-tracking branch 'origin/dev' into dev 2021-12-30 20:28:43 +08:00
aixianling
78823877da 评论组件调整 2021-12-30 20:28:32 +08:00
liuye
0a497180b3 楼栋 2021-12-30 19:54:57 +08:00
liuye
1536c29b0a 26224 2021-12-30 19:20:11 +08:00
liuye
b5f3dcab29 ct 2021-12-30 19:18:10 +08:00
liuye
cc1f45fc67 26226 2021-12-30 19:17:29 +08:00
aixianling
4f149cfa3d BUG 26232 2021-12-30 19:16:54 +08:00
aixianling
dffef065ff Merge remote-tracking branch 'origin/dev' into dev 2021-12-30 19:14:32 +08:00
aixianling
aef2facdc5 BUG 26100 2021-12-30 19:14:21 +08:00
liuye
1b198db0e0 bug 2021-12-30 19:12:56 +08:00
liuye
831d3723c6 ct 2021-12-30 18:52:27 +08:00
liuye
be3c76f29b 地区 2021-12-30 18:51:34 +08:00
花有清香月有阴
99ab8f41ec bug 2021-12-30 18:45:18 +08:00
liuye
92d159597a bug 2021-12-30 18:38:44 +08:00
aixianling
10379cacae Merge remote-tracking branch 'origin/dev' into dev 2021-12-30 18:26:29 +08:00
aixianling
4097778003 提交一点地区组件功能 2021-12-30 18:26:18 +08:00
花有清香月有阴
6be5230b9c 26122 2021-12-30 18:04:45 +08:00
liuye
eb9f316b36 走访慰问 2021-12-30 17:41:08 +08:00
aixianling
b69852d4af Merge remote-tracking branch 'origin/dev' into dev 2021-12-30 17:36:38 +08:00