diff --git a/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java b/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
index ea2844a..d611e52 100644
--- a/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
+++ b/hangtag-module-oms/hangtag-module-oms-api/src/main/java/cn/hangtag/module/oms/enums/ErrorCodeConstants.java
@@ -7,11 +7,6 @@ public interface ErrorCodeConstants  extends cn.hangtag.module.system.enums.Erro
     // ========== 产品资料  TODO 补充编号 ==========
     ErrorCode PRODUCT_INFO_NOT_EXISTS = new ErrorCode(3200, "产品资料 不存在");
  	ErrorCode CUSTOMER_NOT_EXISTS = new ErrorCode(3300, "客户不存在");
-	ErrorCode SHAPE_TEMPLATE_NOT_EXISTS = new ErrorCode(3200, "图形模板管理 不存在");<<<<<<< .mine
-    ErrorCode SHAPE_TEMPLATE_NOT_EXISTS = new ErrorCode(3200, "图形模板管理 不存在");
+	ErrorCode SHAPE_TEMPLATE_NOT_EXISTS = new ErrorCode(3200, "图形模板管理 不存在");
 
-=======
-    ErrorCode CUSTOMER_NOT_EXISTS = new ErrorCode(3300, "客户不存在");
-
->>>>>>> .theirs
 }