~jiangyouyao/beauty-erp.git

Helius

2020-12-23 04ce01155d1218e7318afa9eb562cd2691b60539

refs
author	Helius <wangdoubleone@gmail.com>
	Wednesday, December 23, 2020 21:28 +0800
committer	Helius <wangdoubleone@gmail.com>
	Wednesday, December 23, 2020 21:28 +0800
commit	04ce01155d1218e7318afa9eb562cd2691b60539
tree	0a553dfbe05a600d3899d048c7a6f0b669e6a906 tree \| zip \| gz
parent	53c616910a3fd6f2f9669242690c1c85f2ba0a68 view \| diff e3b4931158274097a8389b4fbec05e44ac0bb2d2 view \| diff

Merge branch 'ty_urgent' into test

7 files modified

2 files added

	zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html	384 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive-erp/order/serviceOrderDetail.html	479 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html	10 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form-bak.html	140 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html	244 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form-bak.html	159 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html	296 ●●●●● diff \| view \| raw \| blame \| history