forked from kidgrow-microservices-platform
parent: 99b5fd | patch | commitdiff
zhaoxiaohao
2020-08-17 73d5561cbf2bea50acc22f91050fcc3557d49de4
refs
author zhaoxiaohao <913652501@qq.com>
Monday, August 17, 2020 09:58 +0800
committer zhaoxiaohao <913652501@qq.com>
Monday, August 17, 2020 09:58 +0800
commit73d5561cbf2bea50acc22f91050fcc3557d49de4
tree b80ec72229bf0dc6604bb6103e4cd43e7697c0a3 tree | zip | gz
parent 99b5fdc410847a9ee7f5ea6f2e9e4dda305a93cb view | diff
0eb9482d1315c1da1e16bf00312093b5d66e1075 view | diff 
Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

 Conflicts:
	kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
6 files modified
2 files added
250 ■■■■■ changed files
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ProductOrderService.java 28 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/fallback/ProductOrderFallbackFactory.java 19 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderService.java 6 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderServiceImpl.java 115 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderController.java 28 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/pom.xml 4 ●●●●● diff | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java 37 ●●●●● diff | view | raw | blame | history
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java 13 ●●●●● diff | view | raw | blame | history