From 1fe0bab9cc3d4d13c9524a89837bd2b9992e52b4 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Sat, 25 May 2024 11:44:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rule/micro_applications/happy_orchard_user_seed_record.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rule/micro_applications/happy_orchard_user_seed_record.go b/rule/micro_applications/happy_orchard_user_seed_record.go
index 42b8c65..600fb73 100644
--- a/rule/micro_applications/happy_orchard_user_seed_record.go
+++ b/rule/micro_applications/happy_orchard_user_seed_record.go
@@ -40,8 +40,9 @@ func GetHappyOrchardUserSeedRecordData(engine *xorm.Engine, record models.HappyO
 	//3、判断当前种子状态
 	if record.State == int(enum.HappyOrchardUserSeedRecordStateForPlanting) {
 		//4、解析基础设置中的 "阶段自定义" 数据
-		stageNameCustomData, err := AnalysisStageNameCustom(happyOrchardBasicSetting.StageNameCustom)
-		if err != nil {
+		stageNameCustomData, err1 := AnalysisStageNameCustom(happyOrchardBasicSetting.StageNameCustom)
+		if err1 != nil {
+			err = err1
 			return
 		}
 		seedState, nextSeedStateWaters := getHappyOrchardUserSeedStage(record, *happyOrchardSeed)