From 12e09639dcbfa63b5a23cde8642b72829d4f3a3b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 10 八月 2023 11:42:31 +0800
Subject: [PATCH] Merge branch 'zq'
---
docs/docs.go | 59 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 9a17b79..e39c3f4 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -7620,7 +7620,7 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.DeleteserviceContract"
+ "$ref": "#/definitions/request.DeleteServiceContract"
}
}
],
@@ -7642,7 +7642,7 @@
"tags": [
"ServiceContract"
],
- "summary": "鐢熸垚璁″垝鍒楄〃",
+ "summary": "鏈嶅姟鍚堝悓鍒楄〃",
"parameters": [
{
"description": "鍙傛暟",
@@ -11366,6 +11366,9 @@
"model.ServiceContract": {
"type": "object",
"properties": {
+ "SaleChance": {
+ "$ref": "#/definitions/model.SaleChance"
+ },
"amountInvoiced": {
"description": "宸插紑绁ㄩ噾棰�",
"type": "number"
@@ -11382,9 +11385,6 @@
"type": "integer"
},
"contactId": {
- "type": "integer"
- },
- "contractId": {
"type": "integer"
},
"endTime": {
@@ -11405,6 +11405,9 @@
"$ref": "#/definitions/model.Product"
}
},
+ "quotation": {
+ "$ref": "#/definitions/model.Quotation"
+ },
"quotationId": {
"type": "integer"
},
@@ -11414,8 +11417,20 @@
"saleChanceId": {
"type": "integer"
},
+ "salesDetails": {
+ "$ref": "#/definitions/model.SalesDetails"
+ },
+ "salesDetailsId": {
+ "type": "integer"
+ },
+ "serviceContractStatus": {
+ "$ref": "#/definitions/model.ServiceContractStatus"
+ },
"serviceContractStatusId": {
"type": "integer"
+ },
+ "serviceContractType": {
+ "$ref": "#/definitions/model.ServiceContractType"
},
"serviceContractTypeId": {
"type": "integer"
@@ -12889,9 +12904,6 @@
"contactId": {
"type": "integer"
},
- "contractId": {
- "type": "integer"
- },
"endTime": {
"type": "string"
},
@@ -12914,6 +12926,9 @@
"type": "string"
},
"saleChanceId": {
+ "type": "integer"
+ },
+ "salesDetailsId": {
"type": "integer"
},
"serviceTimes": {
@@ -13536,6 +13551,17 @@
}
}
},
+ "request.DeleteServiceContract": {
+ "type": "object",
+ "properties": {
+ "ids": {
+ "type": "array",
+ "items": {
+ "type": "integer"
+ }
+ }
+ }
+ },
"request.DeleteServiceFeeManage": {
"type": "object",
"properties": {
@@ -13564,17 +13590,6 @@
"userId": {
"description": "鐢ㄦ埛ID",
"type": "string"
- }
- }
- },
- "request.DeleteserviceContract": {
- "type": "object",
- "properties": {
- "ids": {
- "type": "array",
- "items": {
- "type": "integer"
- }
}
}
},
@@ -15888,9 +15903,6 @@
"contactId": {
"type": "integer"
},
- "contractId": {
- "type": "integer"
- },
"endTime": {
"type": "string"
},
@@ -15918,6 +15930,9 @@
"saleChanceId": {
"type": "integer"
},
+ "salesDetailsId": {
+ "type": "integer"
+ },
"serviceTimes": {
"type": "integer"
},
--
Gitblit v1.8.0