conflect fix

Helius

2021-06-11 289b0503bc197d196997142f60b3a8ef8b70f0cc

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

@@ -69,12 +69,4 @@
    }










}