Merge pull request 'merge conflict' (#155) from zhouqunjie/pcm-coordinator:master into master

Former-commit-id: e0e198e1736c2c5df8b0fb3a2b4a559731a730ef
This commit is contained in:
zhouqunjie 2024-05-10 22:20:06 +08:00
commit 40ea4818a4
1 changed files with 0 additions and 1 deletions

View File

@ -8,7 +8,6 @@ import (
type TaskCloudModel struct { type TaskCloudModel struct {
Id uint `json:"id" gorm:"primarykey;not null;comment:id"` Id uint `json:"id" gorm:"primarykey;not null;comment:id"`
TaskId uint `json:"taskId" gorm:"not null;comment:task表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"` AdapterId uint `json:"adapterId" gorm:"not null;comment:适配器id"`
AdapterName string `json:"adapterName" gorm:"not null;comment:适配器名称"` AdapterName string `json:"adapterName" gorm:"not null;comment:适配器名称"`
ClusterId uint `json:"clusterId" gorm:"not null;comment:集群id"` ClusterId uint `json:"clusterId" gorm:"not null;comment:集群id"`