From a10d59528a36dc5a1fbe4d9caa6b4abf25ab828c Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 12 一月 2024 10:49:08 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/WMS --- models/file_template_attachment.go | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/models/file_template_attachment.go b/models/file_template_attachment.go index 575213e..a55c0db 100644 --- a/models/file_template_attachment.go +++ b/models/file_template_attachment.go @@ -10,12 +10,13 @@ type ( FileTemplateAttachment struct { WmsModel - Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` - Category constvar.FileTemplateCategory `json:"category" gorm:"type:int(11);comment:妯$増绉嶇被"` - Name string `json:"name" gorm:"type:varchar(63);comment:妯$増鍚嶇О"` - AttachmentId uint `json:"attachmentId" gorm:"comment:闄勪欢琛ㄥ閿�"` - Attachment Attachment `json:"attachment" gorm:"foreignKey:AttachmentId;references:Id"` - TableInfo string `json:"tableInfo" gorm:"type:varchar(31);comment:琛ㄥ悕"` + Id int `json:"id" gorm:"column:id;primary_key;AUTO_INCREMENT"` + Category constvar.FileTemplateCategory `json:"category" gorm:"type:int(11);comment:妯$増绉嶇被"` + Name string `json:"name" gorm:"type:varchar(63);comment:妯$増鍚嶇О"` + //AttachmentId uint `json:"attachmentId" gorm:"comment:闄勪欢琛ㄥ閿�"` + //Attachment Attachment `json:"attachment" gorm:"foreignKey:AttachmentId;references:Id"` + TableInfo string `json:"tableInfo" gorm:"type:varchar(31);comment:琛ㄥ悕"` + FileUrl string `json:"fileUrl" gorm:"type:varchar(255);comment:鏂囦欢鍦板潃"` } FileTemplateAttachmentSearch struct { FileTemplateAttachment @@ -61,10 +62,10 @@ return slf } -func (slf *FileTemplateAttachmentSearch) SetPreload(preload bool) *FileTemplateAttachmentSearch { - slf.Preload = preload - return slf -} +//func (slf *FileTemplateAttachmentSearch) SetPreload(preload bool) *FileTemplateAttachmentSearch { +// slf.Preload = preload +// return slf +//} func (slf *FileTemplateAttachmentSearch) SetCategory(category constvar.FileTemplateCategory) *FileTemplateAttachmentSearch { slf.Category = category @@ -81,9 +82,9 @@ db = db.Order(slf.Order) } - if slf.Preload { - db = db.Model(&FileTemplateAttachment{}).Preload("Attachment") - } + //if slf.Preload { + // db = db.Model(&FileTemplateAttachment{}).Preload("Attachment") + //} if int(slf.Category) != 0 { db = db.Where("category=?", slf.Category) -- Gitblit v1.8.0