~jiangyouyao/beauty-erp.git

Helius

2020-12-27 321d1fae7dbd5b399d8df3491ef60a8ea2575451

refs
author	Helius <wangdoubleone@gmail.com>
	Sunday, December 27, 2020 10:53 +0800
committer	Helius <wangdoubleone@gmail.com>
	Sunday, December 27, 2020 10:53 +0800
commit	321d1fae7dbd5b399d8df3491ef60a8ea2575451
tree	a2e6fdc8767a1ef2c441a7483aec5692accf35e2 tree \| zip \| gz
parent	9f08b3ce3d4d0a1f3837c34ccd4d318da4b64076 view \| diff 2cf928a22b6cf8ea7a29f29127ffc333c73b0bca view \| diff

Merge branch 'ty_urgent' into api

1 files added

8 files modified

	zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseDao.java	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjUseDao.java	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/job/InvalidTimeJob.java	48 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml	22 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.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/mybatis/mapper/hive/SysStoreInfoDao.xml	6 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html	1 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/templates/views/admin/hive/statistics/custom-consume-list.html	6 ●●●●● diff \| view \| raw \| blame \| history