forked from kidgrow-microservices-platform
parent: e6bdc3 | patch | commitdiff
zxh
2020-08-26 b4db4529845be5a229431cbc358ed0ed6485e970
refs
author zxh <279049017@qq.com>
Wednesday, August 26, 2020 09:50 +0800
committer zxh <279049017@qq.com>
Wednesday, August 26, 2020 09:50 +0800
commitb4db4529845be5a229431cbc358ed0ed6485e970
tree 52082a94dd7d4aba0a5cce312aa49d10ddd2bb2f tree | zip | gz
parent e6bdc34995298e807824097e555c3e46fb746e3b view | diff
678016586371e7b17a210b5bde3a65314ebc88b0 view | diff 
Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev

 Conflicts:
	kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/menus.html
1 files added
8 files modified
241 ■■■■■ changed files
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml 5 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/departmentProduct.html 166 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctorTemplete.html 15 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/feedback.html 2 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/hospital.html 6 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/product.html 6 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html 8 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html 23 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user.html 10 ●●●●● diff | view | raw | blame | history