提交 · 34978bba56b326fe7198bc4fa9cfae39c84d7479 · jingqi.liu / pica.cloud.web-education-admin

12 6月, 2019 22 次提交
- Merge branch 'dev-patients-20190513' into release-0612 · 34978bba
  由 yongbo.wang 提交于 6月 12, 2019
```
# Conflicts:
#	src/style/patient-manager/new-patient/new-patient.less
```
  34978bba
- no message · 37bbc043
  由 tao.wu 提交于 6月 12, 2019
  
  37bbc043
- Merge branch 'dev-patients-20190513' of... · 2d5417e5
  由 tao.wu 提交于 6月 12, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  2d5417e5
- no message · 472bcbce
  由 tao.wu 提交于 6月 12, 2019
  
  472bcbce
- Merge branch 'dev-patients-20190513' into 'release-0612' · e2efaae2
  由 hujun 提交于 6月 12, 2019
```
dd



See merge request !33
```
  e2efaae2
- dd · 361e450b
  由 chengxiang.li 提交于 6月 12, 2019
  
  361e450b
- Merge branch 'dev-patients-20190513' into 'release-0612' · deb878c9
  由 hujun 提交于 6月 12, 2019
```
Dev patients 20190513



See merge request !32
```
  deb878c9
- Merge branch 'dev-patients-20190513' of... · b1df5d5e
  由 chengxiang.li 提交于 6月 12, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  b1df5d5e
- done new features · fa70adfb
  由 chengxiang.li 提交于 6月 12, 2019
  
  fa70adfb
- Merge branch 'dev-patients-20190513' into 'release-0612' · a4b696e1
  由 hujun 提交于 6月 12, 2019
```
Dev patients 20190513



See merge request !31
```
  a4b696e1
- 增加权限校验，跳转saas 、basis机构相关页面 · 77dbd797
  由 tao.wu 提交于 6月 12, 2019
  
  77dbd797
- Merge branch 'dev-patients-20190513' of... · ee05e225
  由 tao.wu 提交于 6月 12, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  ee05e225
- no message · fdc7c572
  由 tao.wu 提交于 6月 12, 2019
  
  fdc7c572
- Merge branch 'dev-patients-20190513' into 'release-0612' · 6c2a1552
  由 hujun 提交于 6月 12, 2019
```
Dev patients 20190513



See merge request !30
```
  6c2a1552
- Merge branch 'dev-patients-20190513' of... · 06d11c35
  由 chengxiang.li 提交于 6月 12, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  06d11c35
- update · d9a387f1
  由 chengxiang.li 提交于 6月 12, 2019
  
  d9a387f1
- Merge branch 'dev-patients-20190513' of... · cfb99870
  由 yi.li 提交于 6月 12, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  cfb99870
- 我的居民列表，资料不全列表的空数据做处理 · d8b61c6a
  由 yi.li 提交于 6月 12, 2019
  
  d8b61c6a
- Merge branch 'dev-patients-20190513' into 'release-0612' · fbf56730
  由 hujun 提交于 6月 12, 2019
```
Dev patients 20190513



See merge request !29
```
  fbf56730
- Merge branch 'dev-patients-20190513' of... · c0b9c6ec
  由 chengxiang.li 提交于 6月 12, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  c0b9c6ec
- update · 0aa4a91c
  由 chengxiang.li 提交于 6月 12, 2019
  
  0aa4a91c
- Merge branch 'dev-patients-20190513' into 'release-0612' · 8ee31738
  由 hujun 提交于 6月 12, 2019
```
Dev patients 20190513



See merge request !28
```
  8ee31738
11 6月, 2019 7 次提交
- Merge branch 'dev-patients-20190513' of... · a8b7b7d3
  由 yi.li 提交于 6月 11, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  a8b7b7d3
- 选择居民显示优化 · 2d5cfb5f
  由 yi.li 提交于 6月 11, 2019
  
  2d5cfb5f
- Merge branch 'dev-patients-20190513' of... · 5a219000
  由 chengxiang.li 提交于 6月 11, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  5a219000
- update · ae874e90
  由 chengxiang.li 提交于 6月 11, 2019
  
  ae874e90
- 身份校验规则修改 · b1cf4234
  由 yi.li 提交于 6月 11, 2019
  
  b1cf4234
- Merge branch 'dev-patients-20190513' of... · 298d7ec8
  由 yi.li 提交于 6月 11, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  298d7ec8
- 新增居民接口调整 · 9c0b203c
  由 yi.li 提交于 6月 11, 2019
  
  9c0b203c
10 6月, 2019 11 次提交
- no message · eb176658
  由 tao.wu 提交于 6月 10, 2019
  
  eb176658
- no message · d7f9473e
  由 tao.wu 提交于 6月 10, 2019
  
  d7f9473e
- no message · 8127c4c7
  由 tao.wu 提交于 6月 10, 2019
  
  8127c4c7
- Merge branch 'dev-patients-20190513' of... · 59427ae0
  由 tao.wu 提交于 6月 10, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  59427ae0
- no message · 3fbaa023
  由 tao.wu 提交于 6月 10, 2019
  
  3fbaa023
- Merge branch 'dev-patients-20190513' of... · 3efa5709
  由 chengxiang.li 提交于 6月 10, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  3efa5709
- update · faf23b28
  由 chengxiang.li 提交于 6月 10, 2019
  
  faf23b28
- no message · 1b9c344c
  由 tao.wu 提交于 6月 10, 2019
  
  1b9c344c
- no message · f6c901c6
  由 tao.wu 提交于 6月 10, 2019
  
  f6c901c6
- no message · bd0603c6
  由 tao.wu 提交于 6月 10, 2019
  
  bd0603c6
- Merge branch 'dev-patients-20190513' of... · 65cf4c29
  由 tao.wu 提交于 6月 10, 2019
```
Merge branch 'dev-patients-20190513' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-education-admin into dev-patients-20190513
```
  65cf4c29