fix conflect

wzy

2021-11-11 8f7460c6ddff45ec39bf2026d75a3f4e2b26f13d

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

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










}