diff --git a/app/http/controller/web/encounter_controller.go b/app/http/controller/web/encounter_controller.go index d21d79b..563e207 100644 --- a/app/http/controller/web/encounter_controller.go +++ b/app/http/controller/web/encounter_controller.go @@ -37,10 +37,6 @@ func (e *Encounters) Create(context *gin.Context) { context.Set(consts.ValidatorPrefix+"avatar_width", int(avatarWidth)) } // 将 Array 转化为 string 类型 -<<<<<<< HEAD -======= - animals_id := data_transfer.GetIntSlice(context, "animals_id") ->>>>>>> 1f88b110bfca3168fbb371e7fdb316cb53ee0cd0 if res, err := data_transfer.ConvertSliceToString(animals_id); err == nil { context.Set(consts.ValidatorPrefix+"animals_id", res) } else { diff --git a/app/model/encounter.go b/app/model/encounter.go index bde46e3..967c3c6 100644 --- a/app/model/encounter.go +++ b/app/model/encounter.go @@ -6,6 +6,7 @@ import ( "github.com/gin-gonic/gin" "go.uber.org/zap" + ) func CreateEncounterFactory(sqlType string) *Encounter { @@ -17,17 +18,10 @@ type Encounter struct { // Encounter 或者称为 post,指的就是 Human 单 // TAG 外键关联 UsersModelId int `gorm:"column:user_id" json:"user_id"` UsersModel UsersModel -<<<<<<< HEAD AnimalsId string `gorm:"size:20" json:"animals_id"` // TODO 关联对象存在上限 Title string `gorm:"size:20;column:title" json:"title"` Content string `json:"content"` -======= - AnimalsId string `gorm:"size:20"` // TODO 关联对象存在上限 - - Title string `gorm:"size:20;column:title"` - Content string ->>>>>>> 1f88b110bfca3168fbb371e7fdb316cb53ee0cd0 // Time 从 CreatedAt 中解析 // TAG Avatar 最好是压缩后的备份图像