From 7c41605443dc6734e1b011a806b7d0230e7aaecd Mon Sep 17 00:00:00 2001
From: Jake <450705171@qq.com>
Date: Fri, 10 May 2024 22:16:23 +0800
Subject: [PATCH] merge conflict

Former-commit-id: 6bb70e13e9ec954eb128dd3d8c8201d9cbc54529
---
 pkg/models/cloud/task_cloud.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkg/models/cloud/task_cloud.go b/pkg/models/cloud/task_cloud.go
index 784196c0..5cb1e1c9 100644
--- a/pkg/models/cloud/task_cloud.go
+++ b/pkg/models/cloud/task_cloud.go
@@ -8,7 +8,6 @@ import (
 type TaskCloudModel struct {
 	Id          uint       `json:"id" gorm:"primarykey;not null;comment:id"`
 	TaskId      uint       `json:"taskId" gorm:"not null;comment:task表id"`
-	AdapterName string     `json:"adapterName" gorm:"not null;comment:适配器名称"`
 	AdapterId   uint       `json:"adapterId" gorm:"not null;comment:适配器id"`
 	AdapterName string     `json:"adapterName" gorm:"not null;comment:适配器名称"`
 	ClusterId   uint       `json:"clusterId" gorm:"not null;comment:集群id"`