forked from kidgrow-microservices-platform
parent: 3b634c | patch | commitdiff
zhaoxiaohao
2020-04-26 fc223b26f87f7a221b38084bb62d8047974bbf1c
refs
author zhaoxiaohao <913652501@qq.com>
Sunday, April 26, 2020 12:42 +0800
committer zhaoxiaohao <913652501@qq.com>
Sunday, April 26, 2020 12:42 +0800
commitfc223b26f87f7a221b38084bb62d8047974bbf1c
tree eddae03dc96f87fe690c4b9cb67be34c1ec01caf tree | zip | gz
parent 3b634c3db32ca2eb3f661c29b3ff088a7f42318a view | diff
22bddb76460657a72663fdbe408450778e44f887 view | diff 
Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

 Conflicts:
	kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java
4 files added
9 files modified
438 ■■■■■ changed files
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/DiagnosticService.java 29 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/DiagnosticServiceFallbackFactory.java 20 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ProductOrderDetail.java 8 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/vo/ProductOrderJoinDetail.java 4 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml 6 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/OprationCenterApplication.java 6 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysMenuController.java 5 ●●●●● diff | view | raw | blame | history
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/ServiceNameConstants.java 5 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html 115 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/productdetail.html 35 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html 99 ●●●●● diff | view | raw | blame | history
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/verifyRecharge.html 102 ●●●●● diff | view | raw | blame | history