From ae717f932eee8b2f810d0ee94615f3be84489bc9 Mon Sep 17 00:00:00 2001 From: Hiven Date: Fri, 28 Jul 2023 11:24:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/gmodel/var_gen.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/model/gmodel/var_gen.go b/model/gmodel/var_gen.go index 741c6b05..191a9898 100644 --- a/model/gmodel/var_gen.go +++ b/model/gmodel/var_gen.go @@ -79,10 +79,7 @@ type AllModelsGen struct { FsQuotationRemarkTemplate *FsQuotationRemarkTemplateModel // fs_quotation_remark_template 报价单备注模板 FsQuotationSaler *FsQuotationSalerModel // fs_quotation_saler 报价单业务员表 FsRefundReason *FsRefundReasonModel // fs_refund_reason -<<<<<<< HEAD FsResource *FsResourceModel // fs_resource 资源表 -======= ->>>>>>> develop FsResources *FsResourcesModel // fs_resources 资源表 FsStandardLogo *FsStandardLogoModel // fs_standard_logo 标准logo FsTags *FsTagsModel // fs_tags 产品分类表 @@ -174,10 +171,7 @@ func NewAllModels(gdb *gorm.DB) *AllModelsGen { FsQuotationRemarkTemplate: NewFsQuotationRemarkTemplateModel(gdb), FsQuotationSaler: NewFsQuotationSalerModel(gdb), FsRefundReason: NewFsRefundReasonModel(gdb), -<<<<<<< HEAD FsResource: NewFsResourceModel(gdb), -======= ->>>>>>> develop FsResources: NewFsResourcesModel(gdb), FsStandardLogo: NewFsStandardLogoModel(gdb), FsTags: NewFsTagsModel(gdb),