From 6228861484778aebd5e6fed97569c36b3d928ef6 Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Tue, 23 Aug 2022 11:15:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- models/modelshonory/photos_gallery.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/models/modelshonory/photos_gallery.go b/models/modelshonory/photos_gallery.go index 88d1651..c1d55a3 100644 --- a/models/modelshonory/photos_gallery.go +++ b/models/modelshonory/photos_gallery.go @@ -5,13 +5,8 @@ import ( "strings" ) -<<<<<<< HEAD:models/photos_gallery.go -//图片库 -type PhotosGallery struct { -======= // 图片库 type PhotosGallery struct { ->>>>>>> v1_dev:models/modelshonory/photos_gallery.go Id int64 `json:"id" gorm:"primaryKey;column:id;type:bigint(20) unsigned;not null;comment:ID"` Url string `json:"url" gorm:"column:url;type:varchar(255) unsigned;default:'';not null;comment:图片地址"` ImgPath string `json:"imgpath" gorm:"column:img_path;type:varchar(255) unsigned;default:'';not null;comment:物理地址"` @@ -19,7 +14,7 @@ type PhotosGallery struct { FileSize string `json:"filesize" gorm:"column:file_size;type:varchar(255) unsigned;default:'';not null;comment:文档大小"` Time int64 `json:"time" gorm:"column:time;type:bigint(20) unsigned;default:0;not null;comment:创建时间"` AscriptionId int64 `json:"ascriptionid" gorm:"column:ascription_id;type:bigint(20) unsigned;default:0;not null;comment:归属"` - AscriptionDataSheet string `json:"ascriptiondatasheet" gorm:"column:ascription_data_sheet;type:varchar(255) unsigned;default:'';not null;comment:归属哪个数据表"` + AscriptionDataSheet string `json:"ascriptiondatasheet" gorm:"column:ascription_data_sheet;type:varchar(255) unsigned;default:'';not null;comment:归属拿个数据表"` State int `json:"state" gorm:"column:state;type:tinyint(1) unsigned;default:1;not null;comment:状态（1：启用；2：禁用；3：删除）"` }