parent: 5632ae | patch | commitdiff
Helius
2021-03-29 fd563c2a20613325efcc37cbc8aa754eeeba5e45
refs
author Helius <wangdoubleone@gmail.com>
Monday, March 29, 2021 14:19 +0800
committer Helius <wangdoubleone@gmail.com>
Monday, March 29, 2021 14:19 +0800
commitfd563c2a20613325efcc37cbc8aa754eeeba5e45
tree 48653e96155b73e51691420c672f04808bc6314e tree | zip | gz
parent 5632ae9ae36760932c1aeb1b43f954c0367379f2 view | diff
ee8f8eb816608956f55f60dd4ed65488b706767b view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
22 files modified
1 files added
647 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/biz/service/BizUserService.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/biz/service/impl/BizUserServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/impl/InitBusParameterSettingService.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/constant/FenxiaoSettingConstant.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/dto/UpdateFyfaDto.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/entity/ShopSalesmanGrade.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/vo/FyfaManageVo.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopAdvertis.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopSku.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/SalesOrderTask.java 178 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/推广员.sql 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanGradeDao.xml 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopAdvertisDao.xml 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopSkuDao.xml 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html 33 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-user.html 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopProduct-form.html 48 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/SalesOrderTaskTest.java 247 ●●●●● diff | view | raw | blame | history