parent: dc13a8 | patch | commitdiff
xiaoyong931011
2021-04-07 894cde4d057b5805177a8af046a97580030de066
refs
author xiaoyong931011 <15274802129@163.com>
Wednesday, April 7, 2021 15:59 +0800
committer xiaoyong931011 <15274802129@163.com>
Wednesday, April 7, 2021 15:59 +0800
commit894cde4d057b5805177a8af046a97580030de066
tree 7d41d259298a3bbe61ca403f4f8bfeba2ead01aa tree | zip | gz
parent dc13a869ce41c289ea30ea3156e038cab3890032 view | diff
a6f09682c0f6f876673aa483cb71ec419e2fcb02 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

 Conflicts:
	zq-erp/src/test/java/com/matrix/FenxiaoSoreInitTest.java
1 files modified
1 ■■■■■ changed files
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 1 ●●●●● diff | view | raw | blame | history