xzx.git - Gitblit

main / xzx

Helius

2021-06-25 d10ebec3da961f2cff0d96c5e7da4c43f2444e74

refs
author	Helius <wangdoubleone@gmail.com>
	Friday, June 25, 2021 19:05 +0800
committer	Helius <wangdoubleone@gmail.com>
	Friday, June 25, 2021 19:05 +0800
commit	d10ebec3da961f2cff0d96c5e7da4c43f2444e74
tree	08d71432c826b8e7345c6bd1247a2db326b33d2d tree \| zip \| gz
parent	169cb73ac1a9cf243c0e8cb955cef16dd7daef29 view \| diff c4dcdec3c5419bffdf98a021cac170a5cec2e114 view \| diff

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

6 files modified

	gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminGoodsController.java	11 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminJhyOrderController.java	2 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java	2 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/dto/UpdateGoodsDto.java	2 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/service/GoodsService.java	2 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/resources/mapper/shop/ScoreGoodsMapper.xml	2 ●●●●● diff \| view \| raw \| blame \| history