parent: f3b34b | patch | commitdiff
xiaoyong931011
2021-03-11 7387cb3e2f9e8b588c7be30b129faeee4050034d
refs
author xiaoyong931011 <15274802129@163.com>
Thursday, March 11, 2021 18:28 +0800
committer xiaoyong931011 <15274802129@163.com>
Thursday, March 11, 2021 18:28 +0800
commit7387cb3e2f9e8b588c7be30b129faeee4050034d
tree 911c8d702f425b4700e8dd1a206e7de3458ac0b7 tree | zip | gz
parent f3b34b0c7ba026e686d58af93ab8ae5ad6aa9f48 view | diff
c744ee1d7296080e80272e084ebe016d04169b6a view | diff 
Merge remote-tracking branch 'origin/score_shop' into score_shop

# Conflicts:
#	zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
5 files modified
1 files added
92 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanVo.java 31 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/SourceFlowTests.java 14 ●●●●● diff | view | raw | blame | history