~jiangyouyao/beauty-erp.git

Merge remote-tracking branch 'origin/api' into api

jyy

2021-01-19 0a67d6a24417507a27e03d53da82bbd802257148

refs
author	jyy <935090232@qq.com>
	Tuesday, January 19, 2021 02:20 +0800
committer	jyy <935090232@qq.com>
	Tuesday, January 19, 2021 02:20 +0800
commit	0a67d6a24417507a27e03d53da82bbd802257148
tree	4a1d61e25e95d6b020da301b4b22ba7f622a4049 tree \| zip \| gz
parent	92515dc67259069d6fa95936c7794fea976702e6 view \| diff e4b7bef6177bd6cdd046c09233ed913d636e997f view \| diff

Merge remote-tracking branch 'origin/api' into api

21 files modified

2 files added

	zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/app/action/ApiRankingAction.java	15 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java	6 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java	10 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/pojo/CzXkVo.java	14 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java	13 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/statistics/DailySaleVo.java	10 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/statistics/SysBusinessDataAction.java	28 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java	31 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml	27 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysBusinessDataDao.xml	17 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/TjVipSumDao.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-sale-list.html	157 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html	7 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form-bak.html	239 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html	565 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html	24 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html	7 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html	17 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-sale-list.html	16 ●●●●● diff \| view \| raw \| blame \| history