xc-mall.git - Gitblit

xiaoyong931011

2022-08-17 cf7f9a5533ab0cb981049f5d54885694eebdcc48

refs
author	xiaoyong931011 <15274802129@163.com>
	Wednesday, August 17, 2022 16:12 +0800
committer	xiaoyong931011 <15274802129@163.com>
	Wednesday, August 17, 2022 16:12 +0800
commit	cf7f9a5533ab0cb981049f5d54885694eebdcc48
tree	f7f33f6a2828ddb39a08b4c3effedea4774f6c04 tree \| zip \| gz
parent	2ea0cf53e081089c8d7918dd61c0f3985511d2ca view \| diff 94e644443a660b39521f08805b66c27ced736e40 view \| diff

Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz

6 files modified

	src/main/java/cc/mrbird/febs/mall/quartz/OrderSettlementJob.java	6 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java	3 ●●●●● diff \| view \| raw \| blame \| history
	src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java	6 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/application.yml	2 ●●●●● diff \| view \| raw \| blame \| history
	src/main/resources/mapper/modules/MallOrderInfoMapper.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	src/test/java/cc/mrbird/febs/ProfitTest.java	11 ●●●●● diff \| view \| raw \| blame \| history