~jiangyouyao/beauty-erp.git

Merge branch 'score_shop' into api_score_meger

jyy

2021-07-17 274fceda8d8ae15eead0fc6490f4d1680d9ab3c5

refs
author	jyy <jyy>
	Saturday, July 17, 2021 16:45 +0800
committer	jyy <jyy>
	Saturday, July 17, 2021 16:45 +0800
commit	274fceda8d8ae15eead0fc6490f4d1680d9ab3c5
tree	dc645fda9a4a95506e293892886aa6a65e5ce0e2 tree \| zip \| gz
parent	2437327e2a9f89c6ee8c93e468939cf49ff8bd71 view \| diff ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8 view \| diff

Merge branch 'score_shop' into api_score_meger

17 files modified

2 files added

	zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java	22 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java	3 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml	14 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form-bak.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form-bak.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form-bak2.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/print-order.html	215 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/meidu.html	201 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/taiyan.html	219 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html	10 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html	13 ●●●●● diff \| view \| raw \| blame \| history