xzx.git - Gitblit

main / xzx

xiaoyong931011

2021-06-24 b8b21ccb301ebc4e0bd199ddfdae920a95245893

refs
author	xiaoyong931011 <15274802129@163.com>
	Thursday, June 24, 2021 19:23 +0800
committer	xiaoyong931011 <15274802129@163.com>
	Thursday, June 24, 2021 19:23 +0800
commit	b8b21ccb301ebc4e0bd199ddfdae920a95245893
tree	8ed96e6562dbe005fc8ef94cc6746e3dae7a4800 tree \| zip \| gz
parent	4db4c67a30a94515fdfebeaff06819908e7df018 view \| diff d375fe94715d15bfa748991df5d922106a477e5d view \| diff

Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

7 files modified

	gc-shop/src/main/java/com/xzx/gc/shop/controller/ApiGoodsController.java	15 ●●●●● 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/java/com/xzx/gc/shop/mapper/ScoreGoodsMapper.java	3 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java	25 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsDetailVo.java	18 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml	49 ●●●●● diff \| view \| raw \| blame \| history
	pom.xml	6 ●●●●● diff \| view \| raw \| blame \| history