合并
This commit is contained in:
parent
335ecc1f41
commit
ae717f932e
|
@ -79,10 +79,7 @@ type AllModelsGen struct {
|
||||||
FsQuotationRemarkTemplate *FsQuotationRemarkTemplateModel // fs_quotation_remark_template 报价单备注模板
|
FsQuotationRemarkTemplate *FsQuotationRemarkTemplateModel // fs_quotation_remark_template 报价单备注模板
|
||||||
FsQuotationSaler *FsQuotationSalerModel // fs_quotation_saler 报价单业务员表
|
FsQuotationSaler *FsQuotationSalerModel // fs_quotation_saler 报价单业务员表
|
||||||
FsRefundReason *FsRefundReasonModel // fs_refund_reason
|
FsRefundReason *FsRefundReasonModel // fs_refund_reason
|
||||||
<<<<<<< HEAD
|
|
||||||
FsResource *FsResourceModel // fs_resource 资源表
|
FsResource *FsResourceModel // fs_resource 资源表
|
||||||
=======
|
|
||||||
>>>>>>> develop
|
|
||||||
FsResources *FsResourcesModel // fs_resources 资源表
|
FsResources *FsResourcesModel // fs_resources 资源表
|
||||||
FsStandardLogo *FsStandardLogoModel // fs_standard_logo 标准logo
|
FsStandardLogo *FsStandardLogoModel // fs_standard_logo 标准logo
|
||||||
FsTags *FsTagsModel // fs_tags 产品分类表
|
FsTags *FsTagsModel // fs_tags 产品分类表
|
||||||
|
@ -174,10 +171,7 @@ func NewAllModels(gdb *gorm.DB) *AllModelsGen {
|
||||||
FsQuotationRemarkTemplate: NewFsQuotationRemarkTemplateModel(gdb),
|
FsQuotationRemarkTemplate: NewFsQuotationRemarkTemplateModel(gdb),
|
||||||
FsQuotationSaler: NewFsQuotationSalerModel(gdb),
|
FsQuotationSaler: NewFsQuotationSalerModel(gdb),
|
||||||
FsRefundReason: NewFsRefundReasonModel(gdb),
|
FsRefundReason: NewFsRefundReasonModel(gdb),
|
||||||
<<<<<<< HEAD
|
|
||||||
FsResource: NewFsResourceModel(gdb),
|
FsResource: NewFsResourceModel(gdb),
|
||||||
=======
|
|
||||||
>>>>>>> develop
|
|
||||||
FsResources: NewFsResourcesModel(gdb),
|
FsResources: NewFsResourcesModel(gdb),
|
||||||
FsStandardLogo: NewFsStandardLogoModel(gdb),
|
FsStandardLogo: NewFsStandardLogoModel(gdb),
|
||||||
FsTags: NewFsTagsModel(gdb),
|
FsTags: NewFsTagsModel(gdb),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user