xzx.git - Gitblit

main / xzx

Helius

2021-07-23 375237a59434d61567161131d85229d45c792366

refs
author	Helius <wangdoubleone@gmail.com>
	Friday, July 23, 2021 10:17 +0800
committer	Helius <wangdoubleone@gmail.com>
	Friday, July 23, 2021 10:17 +0800
commit	375237a59434d61567161131d85229d45c792366
tree	328314c85d41133aa488566e7a153c0f4c3b5213 tree \| zip \| gz
parent	f2187e1fde463c5d8c99fa02ca13eb9240eea33e view \| diff e9a190cb174a989fc3f9d7238aa83feff439f409 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/controller/AdminJhyOrderController.java	2 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java	5 ●●●●● diff \| view \| raw \| blame \| history
	gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	gc-sys/src/main/resources/mapper/system/BannerMapper.xml	1 ●●●●● diff \| view \| raw \| blame \| history
	gc-sys/src/main/resources/mapper/system/SysNewsMapper.xml	1 ●●●●● diff \| view \| raw \| blame \| history