~jiangyouyao/beauty-erp.git

935090232@qq.com

2021-07-09 5ebd818a240239e22cb3a587e616991bf208d56b

bug修复

7 files modified

	zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/print-order.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/print-service.html	2 ●●●●● diff \| view \| raw \| blame \| history