From d54baf16f7d0e9ad4a26a9650f02a3089d57c2db Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 24 八月 2023 11:23:42 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm
---
model/request/serviceContract.go | 34 +++++++++--------
docs/swagger.yaml | 8 ++++
docs/docs.go | 12 ++++++
docs/swagger.json | 12 ++++++
4 files changed, 50 insertions(+), 16 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 2be434c..e7b3a29 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -14385,6 +14385,12 @@
"salesDetailsId": {
"type": "integer"
},
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
+ "type": "integer"
+ },
"serviceTimes": {
"type": "integer"
},
@@ -17668,6 +17674,12 @@
"salesDetailsId": {
"type": "integer"
},
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
+ "type": "integer"
+ },
"serviceTimes": {
"type": "integer"
},
diff --git a/docs/swagger.json b/docs/swagger.json
index 484cf0a..b107890 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -14373,6 +14373,12 @@
"salesDetailsId": {
"type": "integer"
},
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
+ "type": "integer"
+ },
"serviceTimes": {
"type": "integer"
},
@@ -17656,6 +17662,12 @@
"salesDetailsId": {
"type": "integer"
},
+ "serviceContractStatusId": {
+ "type": "integer"
+ },
+ "serviceContractTypeId": {
+ "type": "integer"
+ },
"serviceTimes": {
"type": "integer"
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index a2e23cf..647faa9 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -2854,6 +2854,10 @@
type: integer
salesDetailsId:
type: integer
+ serviceContractStatusId:
+ type: integer
+ serviceContractTypeId:
+ type: integer
serviceTimes:
type: integer
signTime:
@@ -5098,6 +5102,10 @@
type: integer
salesDetailsId:
type: integer
+ serviceContractStatusId:
+ type: integer
+ serviceContractTypeId:
+ type: integer
serviceTimes:
type: integer
signTime:
diff --git a/model/request/serviceContract.go b/model/request/serviceContract.go
index 5e179a5..dddcfd5 100644
--- a/model/request/serviceContract.go
+++ b/model/request/serviceContract.go
@@ -10,22 +10,24 @@
}
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"`
+ 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"`
}
type UpdateServiceContract struct {
--
Gitblit v1.8.0