forked from kidgrow-microservices-platform
parent: 92257d | patch | commitdiff
houruijun
2020-08-09 e84df331a8ee600d369eeac4172b750db563926d
refs
author houruijun <411269194@kidgrow.com>
Sunday, August 9, 2020 15:16 +0800
committer houruijun <411269194@kidgrow.com>
Sunday, August 9, 2020 15:16 +0800
commite84df331a8ee600d369eeac4172b750db563926d
tree 52ea64da5c23856f6715808f4987e7aa935fe7fd tree | zip | gz
parent 92257d291a9d171a15b22c1fc6527b1a909ac3f6 view | diff
f532169845c8fc4214dc1cb817981cc1d3e7befd view | diff 
Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java
4 files modified
386 ■■■■■ changed files
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java 357 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysOrganizationServiceImpl.java 19 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysDepartmentController.java 7 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysHospitalController.java 3 ●●●●● diff | view | raw | blame | history