From a86df1054649f0594e4c77174fd254b8abd800ca Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 15 八月 2023 11:22:10 +0800
Subject: [PATCH] fix
---
model/salesLeads.go | 6 +++---
docs/swagger.yaml | 2 ++
docs/docs.go | 3 +++
docs/swagger.json | 3 +++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 0a86965..78076e2 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -11992,6 +11992,9 @@
"region_id": {
"type": "integer"
},
+ "sales_sources": {
+ "$ref": "#/definitions/model.SalesSources"
+ },
"sales_sources_id": {
"type": "integer"
},
diff --git a/docs/swagger.json b/docs/swagger.json
index b3c429f..fba412a 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -11980,6 +11980,9 @@
"region_id": {
"type": "integer"
},
+ "sales_sources": {
+ "$ref": "#/definitions/model.SalesSources"
+ },
"sales_sources_id": {
"type": "integer"
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 5514aac..968a045 100644
--- a/docs/swagger.yaml
+++ b/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:
diff --git a/model/salesLeads.go b/model/salesLeads.go
index 7ec3c69..a2cc2aa 100644
--- a/model/salesLeads.go
+++ b/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
}
--
Gitblit v1.8.0