parent: 8d08ca | patch | commitdiff
xiaoyong931011
2021-07-14 cf148cae4937f807347e56d94b2dc96c9f258c59
refs
author xiaoyong931011 <15274802129@163.com>
Wednesday, July 14, 2021 15:04 +0800
committer xiaoyong931011 <15274802129@163.com>
Wednesday, July 14, 2021 15:04 +0800
commitcf148cae4937f807347e56d94b2dc96c9f258c59
tree 109acfc910933d0d59f562e0080ee3f9e949632e tree | zip | gz
parent 8d08ca6bdfc3dd61b0aaa7daa27308c3d59f0df1 view | diff
e39d80c3ea8356882fe508f213caec02184fa64c view | diff 
Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

 Conflicts:
	gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
6 files modified
7 files added
249 ■■■■■ changed files
gc-core/src/main/java/com/xzx/gc/entity/AccountInfo.java 7 ●●●●● diff | view | raw | blame | history
gc-core/src/main/resources/application.properties 2 ●●●●● diff | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/controller/ApiDistribController.java 42 ●●●●● diff | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/controller/UserController.java 6 ●●●●● diff | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/dto/DistribJoinDto.java 17 ●●●●● diff | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/mapper/UserHeadRelateMapper.java 13 ●●●●● diff | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/mapper/UserShareInfoMapper.java 3 ●●●●● diff | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java 76 ●●●●● diff | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/service/UserService.java 10 ●●●●● diff | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/vo/HeadInfoVo.java 29 ●●●●● diff | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/vo/UserIdentityVo.java 17 ●●●●● diff | view | raw | blame | history
gc-user/src/main/resources/mapper/user/UserHeadRelateMapper.xml 19 ●●●●● diff | view | raw | blame | history
gc-user/src/main/resources/mapper/user/UserShareInfoMapper.xml 8 ●●●●● diff | view | raw | blame | history