From 296da0a188a28f3da5175271a750a0bdb873eb1e Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Tue, 28 Feb 2023 11:30:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/hero/module.go | 2 +-
 pb/errorcode.pb.go     | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/modules/hero/module.go b/modules/hero/module.go
index 60c235618..3736f7cec 100644
--- a/modules/hero/module.go
+++ b/modules/hero/module.go
@@ -807,7 +807,7 @@ func (this *Hero) RegisterInstructor(session comm.IUserSession, heroOid string,
 	if _hero.Fulllvenr == 0 {
 		// 校验有没有满级
 		if _hero.Lv < _hero.Star*comm.HeroStarLvRatio {
-			code = pb.ErrorCode_HeroInsufficientLv // 必须满级
+			code = pb.ErrorCode_HeroLvNoEnough // 必须满级
 			return
 		}
 		_hero.Fulllvenr = fulllvenr
diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go
index ebbfb171f..646d748f6 100644
--- a/pb/errorcode.pb.go
+++ b/pb/errorcode.pb.go
@@ -131,11 +131,7 @@ const (
 	ErrorCode_HeroMaxSkillLv          ErrorCode = 1323 // 达到最大技能等级
 	ErrorCode_HeroAlreadyKongFuStatus ErrorCode = 1324 // 已经是练功状态
 	ErrorCode_HeroLvNoEnough          ErrorCode = 1325 // 英雄等级不足
-<<<<<<< HEAD
 	ErrorCode_HeroIsRegister          ErrorCode = 1326 // 英雄已经登记过
-	ErrorCode_HeroInsufficientLv      ErrorCode = 1327 // 英雄等级不足
-=======
->>>>>>> c2734cac73c48a8839ff1330a49c8151eab53939
 	// equipment
 	ErrorCode_EquipmentOnFoundEquipment ErrorCode = 1400 // 未找到武器
 	ErrorCode_EquipmentLvlimitReached   ErrorCode = 1401 // 武器等级已达上限