parent: 8f9e38 | patch | commitdiff
Helius
2021-03-17 effd505edb4985b5f22de82c6c92e24e102ac778
refs
author Helius <wangdoubleone@gmail.com>
Wednesday, March 17, 2021 11:44 +0800
committer Helius <wangdoubleone@gmail.com>
Wednesday, March 17, 2021 11:44 +0800
commiteffd505edb4985b5f22de82c6c92e24e102ac778
tree d30230add781957335ba9cdece79818fbca3609d tree | zip | gz
parent 8f9e3814fd49efd763f06305ffbfff6d87012627 view | diff
c37fec0e03f244d3270e890b1efe566c9757f5a8 view | diff 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
9 files modified
1 files added
238 ■■■■■ changed files
zq-erp/.gitignore 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java 37 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 50 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopOrderV2Dao.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/vo/SalesmanApplyCondition.java 35 ●●●●● 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/xcxShop/ShopOrderV2Dao.xml 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-order.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html 88 ●●●●● diff | view | raw | blame | history