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：删除）"`
 }