~jiangyouyao/beauty-erp.git

935090232@qq.com

2021-05-19 23f5815a2327bde2a5259be3e83909c1aee94105

refs
author	935090232@qq.com <ak473600000>
	Wednesday, May 19, 2021 21:04 +0800
committer	935090232@qq.com <ak473600000>
	Wednesday, May 19, 2021 21:04 +0800
commit	23f5815a2327bde2a5259be3e83909c1aee94105
tree	b901585494d679616918de59d7adde5ea4ffefb7 tree \| zip \| gz
parent	20a2ca2e0e9a290419abca7947d7599d111cd50c view \| diff 1bcb0f4f3956f61523dc7a27ee254d58a9d4b137 view \| diff

Merge remote-tracking branch 'origin/score_shop' into score_shop

6 files modified

1 files added

	zq-erp/pom.xml	4 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/hive/dao/SysVipInfoDao.java	2 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesProductAction.java	32 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java	6 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml	7 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/test/java/com/matrix/JyyTests.java	41 ●●●●● diff \| view \| raw \| blame \| history
	zq-erp/src/test/java/com/matrix/JyyTests2.java	241 ●●●●● diff \| view \| raw \| blame \| history