From 05582688724c78bc70a7bc860193c67677f6c8cf Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 28 十月 2023 10:46:37 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

---
 model/request/saleChance.go |   66 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/model/request/saleChance.go b/model/request/saleChance.go
index 20d4619..05c8aa6 100644
--- a/model/request/saleChance.go
+++ b/model/request/saleChance.go
@@ -1,43 +1,45 @@
 package request
 
-import "aps_crm/proto/code"
+import (
+	"aps_crm/model"
+)
 
 type AddSaleChance struct {
 	SaleChance
 }
 
 type SaleChance struct {
-	Name               string            `json:"name"`
-	ClientId           int               `json:"client_id"`
-	Number             string            `json:"number"`
-	ContactId          int               `json:"contact_id"`
-	SalesSourcesId     int               `json:"sales_sources_id"`
-	SaleTypeId         int               `json:"sale_type_id"`
-	SaleStageId        int               `json:"sale_stage_id"`
-	MemberId           int               `json:"member_id"`
-	RegularCustomersId int               `json:"regular_customers_id"`
-	Competitors        string            `json:"competitors"`
-	Possibilities      int               `json:"possibilities"`
-	Budget             float64           `json:"budget"`
-	ProjectedAmount    float64           `json:"projected_amount"`
-	Currency           int               `json:"currency"`
-	ExpectedTime       string            `json:"expected_time"`
-	StatusId           int               `json:"status_id"`
-	PainPoints         string            `json:"pain_points"`
-	WhetherEstablished string            `json:"whether_established"`
-	CapitalBudget      string            `json:"capital_budget"`
-	KeyMaker           string            `json:"key_maker"`
-	KeyFactors         string            `json:"key_factors"`
-	Process            string            `json:"process"`
-	Solutions          string            `json:"solutions"`
-	Advantages         string            `json:"advantages"`
-	Disadvantages      string            `json:"disadvantages"`
-	Opportunities      string            `json:"opportunities"`
-	Threats            string            `json:"threats"`
-	Remark             string            `json:"remark"`
-	DetailAddress      string            `json:"detail_address"`
-	CodeStandID        string            `json:"codeStandID"` //缂栫爜id
-	CodeRule           code.CodeStandard `json:"codeRule"`
+	Name               string           `json:"name"`
+	ClientId           int              `json:"client_id"`
+	Number             string           `json:"number"`
+	ContactId          int              `json:"contact_id"`
+	SalesSourcesId     int              `json:"sales_sources_id"`
+	SaleTypeId         int              `json:"sale_type_id"`
+	SaleStageId        int              `json:"sale_stage_id"`
+	MemberId           int              `json:"member_id"`
+	RegularCustomersId int              `json:"regular_customers_id"`
+	Competitors        string           `json:"competitors"`
+	Possibilities      int              `json:"possibilities"`
+	Budget             float64          `json:"budget"`
+	ProjectedAmount    float64          `json:"projected_amount"`
+	Currency           int              `json:"currency"`
+	ExpectedTime       string           `json:"expected_time"`
+	StatusId           int              `json:"status_id"`
+	PainPoints         string           `json:"pain_points"`
+	WhetherEstablished string           `json:"whether_established"`
+	CapitalBudget      string           `json:"capital_budget"`
+	KeyMaker           string           `json:"key_maker"`
+	KeyFactors         string           `json:"key_factors"`
+	Process            string           `json:"process"`
+	Solutions          string           `json:"solutions"`
+	Advantages         string           `json:"advantages"`
+	Disadvantages      string           `json:"disadvantages"`
+	Opportunities      string           `json:"opportunities"`
+	Threats            string           `json:"threats"`
+	Remark             string           `json:"remark"`
+	DetailAddress      string           `json:"detail_address"`
+	CodeStandID        string           `json:"codeStandID"` //缂栫爜id
+	Products           []*model.Product `json:"products" gorm:"many2many:SaleChance_Product;"`
 	Address
 }
 

--
Gitblit v1.8.0