parent: 7e5365 | patch | commitdiff
xiaoyong931011
2021-06-29 d397b54e3924c55e80782a80d9f19d616d40ccba
refs
author xiaoyong931011 <15274802129@163.com>
Tuesday, June 29, 2021 16:53 +0800
committer xiaoyong931011 <15274802129@163.com>
Tuesday, June 29, 2021 16:53 +0800
commitd397b54e3924c55e80782a80d9f19d616d40ccba
tree 6a16f835149de10afb1583fefcb369b80fa740cd tree | zip | gz
parent 7e536551c09cea3b50c773308fb80d90d98d472a view | diff
9e560392543d3db3f269bbc0cb1f2c75e8f7f436 view | diff 
Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

 Conflicts:
	gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java
4 files modified
19 ■■■■■ changed files
gc-core/src/main/java/com/xzx/gc/entity/JhyInfo.java 3 ●●●●● diff | view | raw | blame | history
gc-shop/src/main/java/com/xzx/gc/shop/dto/XcxGoodsListDto.java 3 ●●●●● diff | view | raw | blame | history
gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml 10 ●●●●● diff | view | raw | blame | history
gc-user/src/main/java/com/xzx/gc/user/service/JhyInfoService.java 3 ●●●●● diff | view | raw | blame | history