forked from kidgrow-microservices-platform
parent: 346ae7 | patch | commitdiff
侯瑞军
2020-05-14 293d5042a773595ded45bdc9c69c4555ab9c5dd5
refs
author 侯瑞军 <411269194@kidgrow.com>
Thursday, May 14, 2020 18:39 +0800
committer 侯瑞军 <411269194@kidgrow.com>
Thursday, May 14, 2020 18:39 +0800
commit293d5042a773595ded45bdc9c69c4555ab9c5dd5
tree ccb618d5d315814b5c39465e8452d824922b33d5 tree | zip | gz
parent 346ae7f3ce0e30785b9cc0aea1d92204534a83d6 view | diff
eaf5199c2eee33f5add31d6dbe17d731eb9eab66 view | diff 
Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/company.html
#	kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html
#	kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html
#	kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html
#	kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html
#	kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysdictionaries.html
#	kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html
15 files modified
384 ■■■■■ changed files
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysUserMapper.java 2 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/ISysUserService.java 2 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml 34 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserController.java 14 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/attestation/app.html 11 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/businessRecords.html 2 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html 37 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html 2 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/sysOrganization.html 23 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/menus.html 68 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/role.html 28 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/sysArea.html 116 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/tokens.html 7 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html 32 ●●●●● diff | view | raw | blame | history