parent: 62bf99 | patch | commitdiff
Helius
2021-03-12 0a16ffd3e627278bc317109ef7102f5673a1242d
refs
author Helius <wangdoubleone@gmail.com>
Friday, March 12, 2021 16:24 +0800
committer Helius <wangdoubleone@gmail.com>
Friday, March 12, 2021 16:24 +0800
commit0a16ffd3e627278bc317109ef7102f5673a1242d
tree b959ef5a5477e469eee4b33a37f539b98a1d201a tree | zip | gz
parent 62bf99d419e470f5556f21682d0d8ee8b9e20412 view | diff
b12efd16399d217756bf71b92d88b29bd4781295 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
18 files modified
6 files added
589 ■■■■■ changed files
zq-erp/pom.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/biz/bean/BizUser.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoUserAction.java 52 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanApplyDao.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanGradeDao.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dao/ShopSalesmanOrderItemDao.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/AddSaleManApplyDto.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/ShopSalesmanAppliingDto.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanApply.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrder.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanOrderItem.java 54 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java 53 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanOrderItemService.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/ShopSalesmanGradeVo.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java 106 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/推广员.sql 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/test/application.properties 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/fenxiao/ShopSalesmanGradeDao.xml 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanOrderItemDao.xml 33 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-apply.html 59 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html 47 ●●●●● diff | view | raw | blame | history