~jiangyouyao/beauty-erp.git

jyy

2021-07-14 a2d8b47677fcf9eff87faff1bb89a8674714ddd7

refs
author	jyy <jyy>
	Wednesday, July 14, 2021 15:41 +0800
committer	jyy <jyy>
	Wednesday, July 14, 2021 15:41 +0800
commit	a2d8b47677fcf9eff87faff1bb89a8674714ddd7
tree	2558e40f86a3cf5ce41baa41820c3a84eb337357 tree \| zip \| gz
parent	931aa435ba161f9f9fcbb8fa9d1e27add7638994 view \| diff d13ae240c54c59b04c0571bfc0136ed0c8ba32a3 view \| diff

Merge branch 'score_shop' into api_score_meger

7 files modified

	zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml	6 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml	5 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/order/projService-list.html	5 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/products/goods-form.html	13 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/store/projService-list.html	5 ●●●●● diff \| view \| raw \| blame \| history