From c166f291fad03244e147fda671665aebd3027635 Mon Sep 17 00:00:00 2001
From: 1 <1@72wo.cn>
Date: Tue, 23 Sep 2025 15:09:39 +0000
Subject: [PATCH] =?UTF-8?q?refactor(task):=20=E9=87=8D=E6=9E=84=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=95=B0=E6=8D=AE=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8TaskEX=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=92=8C=E5=9B=9E=E8=B0=83=E5=87=BD=E6=95=B0=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=BB=BB=E5=8A=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/controller/task.go      |  5 -----
 modules/blazing/model/task.go | 10 ----------
 2 files changed, 15 deletions(-)

diff --git a/logic/controller/task.go b/logic/controller/task.go
index f6a75d8e..95e08539 100644
--- a/logic/controller/task.go
+++ b/logic/controller/task.go
@@ -109,16 +109,11 @@ func (h Controller) Complete_Task(data *task.CompleteTaskInboundInfo, c *player.
  */
 func (h Controller) Get_Task_Buf(data *task.GetTaskBufInboundInfo, c *player.Player) (result *task.GetTaskBufOutboundInfo, err errorcode.ErrorCode) {
 	result = &task.GetTaskBufOutboundInfo{}
-<<<<<<< HEAD
 	c.Service.Task(data.TaskId, func(te *model.TaskEX)bool {
 		result.TaskId = te.TaskID
 		result.TaskList = te.Data
 		return false
 	})
-=======
-	result.TaskId = data.TaskId
-	result.TaskList = info.Data
->>>>>>> ea1148039e70e6b1dadf6c892b49e547d0f10ac7
 
 	return result, 0
 }
diff --git a/modules/blazing/model/task.go b/modules/blazing/model/task.go
index e0de7414..ad450218 100644
--- a/modules/blazing/model/task.go
+++ b/modules/blazing/model/task.go
@@ -15,20 +15,10 @@ type Task struct {
 	Data     string `gorm:"type:text;not null;comment:'全部数据'" json:"data"`
 }
 
-<<<<<<< HEAD
 // TaskEX 单个任务的详细信息，包含任务步骤状态和整体状态
 type TaskEX struct {
 	Task
 	Data []uint32 `struc:"[20]byte"  orm:"data" json:"data"`
-=======
-// TaskInfo 单个任务的详细信息，包含任务步骤状态和整体状态
-type TaskInfo struct {
-	Task
-	// TaskInfo 任务步骤信息，
-	// struc:"[20]byte" 确保二进制序列化时固定20字节长度，json标签指定JSON字段名
-	//TaskID   uint32   `json:"task_id"` //区分是每日任务还是常规任务,常规为0,每日为1
-	Data []uint32 `orm:"data" struc:"[20]byte" json:"task_info"`
->>>>>>> ea1148039e70e6b1dadf6c892b49e547d0f10ac7
 	//LastResetTime time.Time `gorm:"not null;comment:'上次重置时间（UTC）'" json:"last_reset_time"` //这里是每天重置
 	// Status 任务整体状态：0-未接受，1-已接受，2-已完成未领取，3-已完成已领取
 	// json标签指定JSON字段名，与业务状态说明保持一致