~jiangyouyao/beauty-erp.git

Merge branch 'score_shop' into api_score_meger

jyy

2021-07-22 de5d98edb80742185b91b2d892167b82a8b64430

refs
author	jyy <jyy>
	Thursday, July 22, 2021 18:03 +0800
committer	jyy <jyy>
	Thursday, July 22, 2021 18:03 +0800
commit	de5d98edb80742185b91b2d892167b82a8b64430
tree	d9801565cf79cc1b1100775fbe9a127e893f3f7b tree \| zip \| gz
parent	c4f92fc59c25cc7564ff16895ab271c0d04f1e11 view \| diff 1625f969871fa40da7de9c8f73b974bfc992c436 view \| diff

Merge branch 'score_shop' into api_score_meger

24 files modified

	zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java	23 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/statistics/OrderStatisticsAction.java	78 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/statistics/ProjUseStatisticsAction.java	43 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/statistics/ServiceStatisticsAction.java	43 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/statistics/moneyCardUseStatisticsAction.java	40 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml	8 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-item.html	10 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-moneyCar-summary.html	14 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-order-item.html	8 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-order-summary.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-item.html	15 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projSercice-sumary.html	14 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-item.html	12 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/statistics-projuse-sumary.html	15 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-item.html	13 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-moneyCar-summary.html	15 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-order-item.html	14 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-order-summary.html	14 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-item.html	15 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projSercice-sumary.html	14 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-item.html	12 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/statistics-projuse-sumary.html	15 ●●●●● diff \| view \| raw \| blame \| history