From 2387b4051c095af26f158500596d21167955f971 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期二, 15 八月 2023 17:39:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
docs/docs.go | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 8d18427..d451ef2 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -10263,6 +10263,29 @@
"SalesRefundKeywordPriceTotal"
]
},
+ "constvar.SalesReturnKeywordType": {
+ "type": "string",
+ "enum": [
+ "閿�鍞��璐у崟缂栧彿",
+ "瀹㈡埛鍚嶇О",
+ "閫�娆炬棩鏈�",
+ "鐘舵��",
+ "閫�鍏ヤ粨搴�",
+ "搴旈��娆�",
+ "宸查��娆�",
+ "閿�鍞礋璐ｄ汉"
+ ],
+ "x-enum-varnames": [
+ "SalesReturnKeywordReturnNumber",
+ "SalesReturnKeywordClientName",
+ "SalesReturnKeywordReturnDate",
+ "SalesReturnKeywordStatus",
+ "SalesReturnKeywordRepository",
+ "SalesReturnKeywordAmountShouldRefund",
+ "SalesReturnKeywordAmountHasRefund",
+ "SalesReturnKeywordPrincipal"
+ ]
+ },
"constvar.SalesReturnSourceType": {
"type": "integer",
"enum": [
@@ -12066,7 +12089,7 @@
"type": "integer"
},
"isInvoice": {
- "type": "integer"
+ "type": "string"
},
"member": {
"$ref": "#/definitions/model.User"
@@ -12123,6 +12146,14 @@
"$ref": "#/definitions/model.SalesReturnStatus"
}
]
+ },
+ "amountHasRefund": {
+ "description": "宸查��娆鹃噾棰�",
+ "type": "number"
+ },
+ "amountShouldRefund": {
+ "description": "搴旈��娆鹃噾棰�",
+ "type": "number"
},
"client": {
"$ref": "#/definitions/model.Client"
@@ -14954,7 +14985,7 @@
"description": "姣忛〉澶у皬",
"type": "integer"
},
- "searchMap": {
+ "search_map": {
"description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 閿�鍞嚎绱d, \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"contact_name\": \"鑱旂郴浜篭", \"validity_date\": \"鏈夋晥鏈焅"}",
"type": "object",
"additionalProperties": true
@@ -15040,6 +15071,9 @@
"properties": {
"keyword": {
"type": "string"
+ },
+ "keywordType": {
+ "$ref": "#/definitions/constvar.SalesReturnKeywordType"
},
"page": {
"description": "椤电爜",
@@ -15384,7 +15418,7 @@
"type": "integer"
},
"isInvoice": {
- "type": "integer"
+ "type": "string"
},
"memberId": {
"type": "integer"
--
Gitblit v1.8.0