xzx.git - Gitblit

main / xzx

xiaoyong931011

2021-06-25 74a7354764449e8bb602e137a172c5c1593a261e

refs
author	xiaoyong931011 <15274802129@163.com>
	Friday, June 25, 2021 18:14 +0800
committer	xiaoyong931011 <15274802129@163.com>
	Friday, June 25, 2021 18:14 +0800
commit	74a7354764449e8bb602e137a172c5c1593a261e
tree	cf48b2f0fe96699f1dd33ffb21446ccc1c7653a3 tree \| zip \| gz
parent	38d980c51678f8eca8486a83a6667f9075edb08f view \| diff 4a0980a5d393f6b78961d221d45a1951eb1bd51e view \| diff

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

5 files modified

	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/service/GoodsService.java	9 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java	11 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsDetailVo.java	3 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml	3 ●●●●● diff \| view \| raw \| blame \| history