Merge remote-tracking branch 'origin/master'

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)