beauty-erp.git - Gitblit

姜友瑶

2022-05-23 eaefb5f0d4fb5918786936dd60f4be7dd93011ba

refs
author	姜友瑶 <935090232@qq.com>
	Monday, May 23, 2022 12:20 +0800
committer	姜友瑶 <935090232@qq.com>
	Monday, May 23, 2022 12:20 +0800
commit	eaefb5f0d4fb5918786936dd60f4be7dd93011ba
tree	2e215750f7ec002e0120d1ccc5c551e804472959 tree \| zip \| gz
parent	81507d0c196821cd333f08c75f3978e726df24cd view \| diff e2049d69ea6e752697562a400e7f4c107d0076a6 view \| diff

Merge branch 'developer'

20 files modified

	zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java	9 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java	7 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java	3 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/config/application.properties	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/common/OperstionLogDao.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml	30 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml	14 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml	14 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.xml	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml	18 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml	66 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml	8 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml	4 ●●●●● diff \| view \| raw \| blame \| history