Commit Graph

1972 Commits

Author SHA1 Message Date
aixianling
9940da8ad2 Merge remote-tracking branch 'origin/dev' into dev 2022-03-15 14:50:02 +08:00
aixianling
84d7e778f7 BUG 27080 2022-03-15 14:49:31 +08:00
shijingjing
3a416ef22d 28226 2022-03-15 14:22:13 +08:00
liuye
60f60c9698 28229 2022-03-15 14:04:03 +08:00
liuye
d1d6ef69c1 居民档案编辑删除权限 2022-03-15 14:02:30 +08:00
aixianling
52729c9f65 修复异常 2022-03-15 11:06:15 +08:00
aixianling
52d32d9671 Merge remote-tracking branch 'origin/dev' into dev 2022-03-15 11:03:05 +08:00
aixianling
fefcf91da1 BUG 28184 2022-03-15 11:02:48 +08:00
liuye
4af350dd96 28218 2022-03-15 10:57:32 +08:00
aixianling
3744dbbe62 Merge remote-tracking branch 'origin/dev' into dev 2022-03-15 10:54:00 +08:00
aixianling
907524a074 调整字典 2022-03-15 10:53:46 +08:00
changjinpeng
c8e7b046c8 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev 2022-03-15 10:29:47 +08:00
changjinpeng
8f42cb7353 28201 2022-03-15 10:29:30 +08:00
liuye
75c88765ef 28217 2022-03-15 10:27:34 +08:00
aixianling
ca1d195723 Merge remote-tracking branch 'origin/dev' into dev 2022-03-15 10:25:59 +08:00
aixianling
ec803816c9 上传组件增加可选择上传途径 2022-03-15 10:25:48 +08:00
changjinpeng
b529813475 时间字段 2022-03-15 10:16:50 +08:00
aixianling
52ec1ebe41 Merge remote-tracking branch 'origin/dev' into dev 2022-03-15 10:04:08 +08:00
aixianling
13e5356898 整合js工具类 2022-03-15 10:03:54 +08:00
changjinpeng
7eef374de3 28207 2022-03-15 09:48:51 +08:00
aixianling
690c67375f BUG 28186 2022-03-15 09:38:12 +08:00
aixianling
c6b4f383f4 Merge remote-tracking branch 'origin/dev' into dev 2022-03-15 09:31:18 +08:00
aixianling
2082eb6121 BUG 28206 2022-03-15 09:31:04 +08:00
changjinpeng
43376f98b1 28202 2022-03-15 09:31:03 +08:00
liuye
562697e3fe 居民档案 2022-03-15 09:27:32 +08:00
liuye
05abc0abaf 居民档案打印 2022-03-15 09:22:30 +08:00
liuye
d792ca5b23 ct 2022-03-15 09:18:40 +08:00
liuye
bd71788474 居民档案 2022-03-15 09:18:12 +08:00
aixianling
0bd5c3c82a Merge remote-tracking branch 'origin/dev' into dev 2022-03-15 09:12:13 +08:00
aixianling
8d6a4ddfb5 BUG 28174 2022-03-15 09:11:46 +08:00
shijingjing
d2776593c5 28200 2022-03-15 08:36:33 +08:00
shijingjing
9af707fa88 28205 2022-03-15 08:31:53 +08:00
aixianling
c7e3d118c0 BUG 28186 2022-03-14 20:35:00 +08:00
aixianling
6be9eda1e1 BUG 28179 2022-03-14 20:26:16 +08:00
aixianling
e468bdca51 BUG 28177 2022-03-14 20:23:00 +08:00
aixianling
e5c0470c38 BUG 28176 2022-03-14 20:17:14 +08:00
aixianling
9dc13a5fae BUG 28182 2022-03-14 20:15:06 +08:00
aixianling
fd7f904de4 BUG 28180 2022-03-14 20:11:04 +08:00
aixianling
fa843289ba Merge remote-tracking branch 'origin/dev' into dev 2022-03-14 18:33:04 +08:00
aixianling
a26b43adff BUG 28178 2022-03-14 18:32:50 +08:00
shijingjing
41da9483a0 tabList 2022-03-14 18:30:56 +08:00
liuye
5f9fbfbff5 28196 2022-03-14 18:27:52 +08:00
aixianling
d74745e9bd BUG 28193 2022-03-14 18:16:17 +08:00
aixianling
72cbe90044 Merge remote-tracking branch 'origin/dev' into dev 2022-03-14 18:15:37 +08:00
aixianling
70dec3426a BUG 28187 2022-03-14 18:15:25 +08:00
shijingjing
5518eeb7b1 css 2022-03-14 18:11:58 +08:00
shijingjing
1f43f8a052 28195 2022-03-14 17:41:41 +08:00
yanran200730
037fc84d35 Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev 2022-03-14 17:15:49 +08:00
yanran200730
e67e3b3a85 28147 2022-03-14 17:15:44 +08:00
shijingjing
964e2b9576 css 2022-03-14 17:13:28 +08:00