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/serviceContract.go |   40 +++++++++++++++++++---------------------
 1 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/model/request/serviceContract.go b/model/request/serviceContract.go
index a8ea3b5..f3cb2fe 100644
--- a/model/request/serviceContract.go
+++ b/model/request/serviceContract.go
@@ -3,7 +3,6 @@
 import (
 	"aps_crm/constvar"
 	"aps_crm/model"
-	"aps_crm/proto/code"
 )
 
 type AddServiceContract struct {
@@ -11,26 +10,25 @@
 }
 
 type ServiceContract struct {
-	ClientId                int               `json:"clientId"`
-	Number                  string            `json:"number"`
-	MemberId                int               `json:"memberId" binding:"required"`
-	ContactId               int               `json:"contactId"`
-	SaleChanceId            int               `json:"saleChanceId"`
-	SalesDetailsId          int               `json:"salesDetailsId"`
-	QuotationId             int               `json:"quotationId"`
-	TypeId                  int               `json:"typeId"`
-	SignTime                string            `json:"signTime" binding:"datetime=2006-01-02"`
-	StartTime               string            `json:"startTime"`
-	EndTime                 string            `json:"endTime"`
-	StatusId                int               `json:"statusId"`
-	ServiceTimes            int               `json:"serviceTimes"`
-	Terms                   string            `json:"terms"`
-	Remark                  string            `json:"remark"`
-	Products                []*model.Product  `json:"products"`
-	ServiceContractTypeId   int               `json:"serviceContractTypeId"`
-	ServiceContractStatusId int               `json:"serviceContractStatusId"`
-	CodeStandID             string            `json:"codeStandID"` //缂栫爜id
-	CodeRule                code.CodeStandard `json:"codeRule"`
+	ClientId                int              `json:"clientId"`
+	Number                  string           `json:"number"`
+	MemberId                int              `json:"memberId" binding:"required"`
+	ContactId               int              `json:"contactId"`
+	SaleChanceId            int              `json:"saleChanceId"`
+	SalesDetailsId          int              `json:"salesDetailsId"`
+	QuotationId             int              `json:"quotationId"`
+	TypeId                  int              `json:"typeId"`
+	SignTime                string           `json:"signTime" binding:"datetime=2006-01-02"`
+	StartTime               string           `json:"startTime"`
+	EndTime                 string           `json:"endTime"`
+	StatusId                int              `json:"statusId"`
+	ServiceTimes            int              `json:"serviceTimes"`
+	Terms                   string           `json:"terms"`
+	Remark                  string           `json:"remark"`
+	Products                []*model.Product `json:"products"`
+	ServiceContractTypeId   int              `json:"serviceContractTypeId"`
+	ServiceContractStatusId int              `json:"serviceContractStatusId"`
+	CodeStandID             string           `json:"codeStandID"` //缂栫爜id
 }
 
 type UpdateServiceContract struct {

--
Gitblit v1.8.0