parent: 1a879b76 | patch | commit | ignore whitespace
Helius
2021-03-12 dcd1bf2779233eabc8ce4c7d2be825c661d9c93d 
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
2 files modified
5 ■■■■■ changed files
zq-erp/pom.xml 4 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java 1 ●●●●● patch | view | raw | blame | history 
 zq-erp/pom.xml


@@ -394,11 +394,11 @@


                    <exclude>config/test/*</exclude>


                    <exclude>config/xcx/*</exclude>




                    <!--


                    <!---->


                    <exclude>config/config.json</exclude>


                    <exclude>config/application.properties</exclude>


                    <exclude>config/system.properties</exclude>


                    -->








                    <exclude>**/*.woff</exclude>




 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxSalesmanAction.java


@@ -214,4 +214,5 @@










}