parent: 819f0f | patch | commitdiff
xiaoyong931011
2021-03-11 31037e96240c14bab943e73f341c259a8322a9a1
refs
author xiaoyong931011 <15274802129@163.com>
Thursday, March 11, 2021 19:46 +0800
committer xiaoyong931011 <15274802129@163.com>
Thursday, March 11, 2021 19:46 +0800
commit31037e96240c14bab943e73f341c259a8322a9a1
tree 2d161dc734fce61b23944be1646ad1ddffbc4f88 tree | zip | gz
parent 819f0f2f11936ca80903d545db7cbf5631dcdc5b view | diff
3e5dc8c645b73e73fbeb5564c60a979d0557f5b4 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

 Conflicts:
	zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java
3 files modified
1 files added
59 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/core/pojo/BasePageQueryDto.java 44 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml 2 ●●●●● diff | view | raw | blame | history