From 289b0503bc197d196997142f60b3a8ef8b70f0cc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Jun 2021 22:00:44 +0800
Subject: [PATCH] conflect fix
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxScoreProductAction.java | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxScoreProductAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxScoreProductAction.java
index 98cfc12..ebdc64d 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxScoreProductAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxScoreProductAction.java
@@ -69,12 +69,4 @@
}
-
-
-
-
-
-
-
-
}
--
Gitblit v1.9.1