From 4b2c52b17abef8521f9211b4865e1cad0288b12a Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期六, 21 十月 2023 17:47:50 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

---
 model/saleChance.go |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/model/saleChance.go b/model/saleChance.go
index 751863b..f136914 100644
--- a/model/saleChance.go
+++ b/model/saleChance.go
@@ -30,6 +30,7 @@
 		Currency              int                    `json:"currency" gorm:"column:currency;type:int(11);comment:甯佺"`
 		ExpectedTime          *CustomTime            `json:"expected_time" gorm:"column:expected_time;type:datetime;comment:棰勮鎴愪氦鏃堕棿"`
 		StatusId              int                    `json:"status_id" gorm:"column:status_id;type:int(11);comment:鐘舵�両D"`
+		Status                Status                 `json:"status"` //鐘舵��
 		PainPoints            string                 `json:"pain_points" gorm:"column:pain_points;type:text;comment:鐥涚偣"`
 		WhetherEstablished    string                 `json:"whether_established" gorm:"column:whether_established;type:text;comment:鏄惁鎴愮珛"`
 		CapitalBudget         string                 `json:"capital_budget" gorm:"column:capital_budget;type:text;comment:璧勯噾棰勭畻"`
@@ -164,7 +165,7 @@
 	err := db.Preload("SaleType").Preload("RegularCustomers").Preload("SalesSources").Preload("Products").
 		Preload("Member").Preload("SaleStage").Preload("Possibility").
 		Preload("CollectionProjections").Preload("Client").
-		Preload("Province").Preload("City").Preload("Contact").Order("id desc").Find(&records).Error
+		Preload("Province").Preload("City").Preload("Contact").Preload("Status").Order("id desc").Find(&records).Error
 	return records, total, err
 }
 

--
Gitblit v1.8.0