diff --git a/app/constants/errorcode/error_code.go b/app/constants/errorcode/error_code.go
index 5102684..717a52f 100644
--- a/app/constants/errorcode/error_code.go
+++ b/app/constants/errorcode/error_code.go
@@ -29,30 +29,25 @@ const (
 	MerchantNotFound = 1100
 
 	// app
-<<<<<<< HEAD
+
 	AppNotFound              = 1200
 	AppDisabled              = 1201
 	AppIpNotAllow            = 1202
-	AppRsaDecryptKeyNotFound = 1300
-	AppRsaDecryptFail        = 1301
-	AppRsaEncryptKeyNotFound = 1302
-	AppRsaEncryptFail        = 1303
-	AppSM2DecryptKeyNotFound = 1310
-	AppSM2DecryptFail        = 1311
-	AppSM2EncryptKeyNotFound = 1312
-	AppSM2EncryptFail        = 1313
-	AppSM4DecryptKeyNotFound = 1320
-	AppSM4DecryptFail        = 1321
-	AppSM4EncryptKeyNotFound = 1322
-	AppSM4EncryptFail        = 1323
-=======
-	AppNotFound   = 1200
-	AppDisabled   = 1201
-	AppIpNotAllow = 1202
+	AppRsaDecryptKeyNotFound = 1203
+	AppRsaDecryptFail        = 1210
+	AppRsaEncryptKeyNotFound = 1211
+	AppRsaEncryptFail        = 1212
+	AppSM2DecryptKeyNotFound = 1220
+	AppSM2DecryptFail        = 1221
+	AppSM2EncryptKeyNotFound = 1222
+	AppSM2EncryptFail        = 1223
+	AppSM4DecryptKeyNotFound = 1230
+	AppSM4DecryptFail        = 1231
+	AppSM4EncryptKeyNotFound = 1232
+	AppSM4EncryptFail        = 1233
 
 	//渠道
 	PayChannelNotFound = 1300
->>>>>>> dev/dev1.0
 )
 
 var MsgEN = map[int]string{
@@ -75,7 +70,6 @@ var MsgZH = map[int]string{
 	AppNotFound:      "app_id未找到",
 	AppDisabled:      "app通道关闭",
 	AppIpNotAllow:    "ip不在白名单内",
-<<<<<<< HEAD
 
 	AppRsaDecryptKeyNotFound: "密匙缺失，无法进行Rsa解密",
 	AppRsaDecryptFail:        "Rsa解密失败",
@@ -91,9 +85,8 @@ var MsgZH = map[int]string{
 	AppSM4DecryptFail:        "sm4解密失败",
 	AppSM4EncryptKeyNotFound: "密匙缺失，无法进行sm4加密",
 	AppSM4EncryptFail:        "sm4加密失败",
-=======
+
 	PayChannelNotFound: "支付方式不存在",
->>>>>>> dev/dev1.0
 }
 var MsgMap map[string]map[int]string = map[string]map[int]string{"en": MsgZH}