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),