xzx.git - Gitblit

main / xzx

Helius

2021-06-25 f80e1595c702e1251eaab8ec9fe112a53736df7f

refs
author	Helius <wangdoubleone@gmail.com>
	Friday, June 25, 2021 16:47 +0800
committer	Helius <wangdoubleone@gmail.com>
	Friday, June 25, 2021 16:47 +0800
commit	f80e1595c702e1251eaab8ec9fe112a53736df7f
tree	ffd37ad842ab8f436ac7aa218f3b7a08d53617f1 tree \| zip \| gz
parent	cd56d5963f7234a03fec057d807ad1607be17c23 view \| diff 7108de563329444c690f96c373e67173be54cf32 view \| diff

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

2 files modified

1 files added

	gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java	28 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/dto/CancelOrderDto.java	11 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java	16 ●●●●● diff \| view \| raw \| blame \| history