fix

wangpengfei

2023-08-15 a86df1054649f0594e4c77174fd254b8abd800ca

fix

add the return parameters

 docs/docs.go

@@ -11992,6 +11992,9 @@
                "region_id": {
                    "type": "integer"
                },
                "sales_sources": {
                    "$ref": "#/definitions/model.SalesSources"
                },
                "sales_sources_id": {
                    "type": "integer"
                },

 docs/swagger.json

@@ -11980,6 +11980,9 @@
                "region_id": {
                    "type": "integer"
                },
                "sales_sources": {
                    "$ref": "#/definitions/model.SalesSources"
                },
                "sales_sources_id": {
                    "type": "integer"
                },

 docs/swagger.yaml

@@ -1397,6 +1397,8 @@
        $ref: '#/definitions/model.Region'
      region_id:
        type: integer
      sales_sources:
        $ref: '#/definitions/model.SalesSources'
      sales_sources_id:
        type: integer
      sales_status:

 model/salesLeads.go

@@ -15,9 +15,9 @@
        ContactPhone    string               `json:"contact_phone" gorm:"column:contact_phone;type:varchar(255);comment:联系人电话"`
        ContactPosition string               `json:"contact_position" gorm:"column:contact_position;type:varchar(255);comment:联系人职位"`
        SalesSourcesId  int                  `json:"sales_sources_id" gorm:"column:sales_sources_id;type:int(11);comment:商机来源ID"`
        SalesSources    SalesSources         `json:"-" gorm:"foreignKey:SalesSourcesId"`
        SalesSources    SalesSources         `json:"sales_sources" gorm:"foreignKey:SalesSourcesId"`
        MemberId        int                  `json:"member_id" gorm:"column:member_id;type:int(11);comment:销售负责人ID"`
        Member          User                 `json:"-" gorm:"foreignKey:MemberId"`
        Member          User                 `json:"member" gorm:"foreignKey:MemberId"`
        SalesStatus     constvar.SalesStatus `json:"sales_status" gorm:"column:sales_status;type:int(11);comment:销售状态"`
        Desc            string               `json:"desc" gorm:"column:desc;type:varchar(255);comment:备注"`
        Reason          string               `json:"reason" gorm:"column:reason;type:text;comment:失败原因"`
@@ -133,7 +133,7 @@
        db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
    }

    err := db.Preload("Member").Preload("Province").Preload("City").Preload("FollowRecord").Order("id desc").Find(&records).Error
    err := db.Preload("SalesSources").Preload("Member").Preload("Province").Preload("City").Preload("FollowRecord").Order("id desc").Find(&records).Error
    return records, total, err
}