fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

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

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










}