merge conflict

Former-commit-id: 6bb70e13e9
2024-05-10 22:16:23 +08:00 · 2024-05-10 22:16:23 +08:00 · 7c41605443
parent 891467285d
commit 7c41605443
1 changed files with 0 additions and 1 deletions
--- 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"`