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/quotation.go |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/model/request/quotation.go b/model/request/quotation.go
index a0d1425..87ea612 100644
--- a/model/request/quotation.go
+++ b/model/request/quotation.go
@@ -2,7 +2,6 @@
 
 import (
 	"aps_crm/model"
-	"aps_crm/proto/code"
 )
 
 type AddQuotation struct {
@@ -10,19 +9,18 @@
 }
 
 type Quotation struct {
-	QuotationName     string            `json:"quotationName"` //鎶ヤ环鍗曞悕绉�
-	ClientId          int               `json:"client_id"`
-	Number            string            `json:"number"`
-	QuotationStatusId int               `json:"quotation_status_id"`
-	ValidityDate      string            `json:"validity_date"`
-	ContactId         int               `json:"contact_id"`
-	MemberId          int               `json:"member_id"`
-	SaleChanceId      int               `json:"sale_chance_id"`
-	Conditions        string            `json:"conditions"`
-	File              string            `json:"file"`
-	CodeStandID       string            `json:"codeStandID"` //缂栫爜id
-	CodeRule          code.CodeStandard `json:"codeRule"`
-	Products          []model.Product   `json:"products"`
+	QuotationName     string          `json:"quotationName"` //鎶ヤ环鍗曞悕绉�
+	ClientId          int             `json:"client_id"`
+	Number            string          `json:"number"`
+	QuotationStatusId int             `json:"quotation_status_id"`
+	ValidityDate      string          `json:"validity_date"`
+	ContactId         int             `json:"contact_id"`
+	MemberId          int             `json:"member_id"`
+	SaleChanceId      int             `json:"sale_chance_id"`
+	Conditions        string          `json:"conditions"`
+	File              string          `json:"file"`
+	CodeStandID       string          `json:"codeStandID"` //缂栫爜id
+	Products          []model.Product `json:"products"`
 }
 
 type UpdateQuotation struct {

--
Gitblit v1.8.0