From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 docs/docs.go |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 6ac3333..71f27c6 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -14783,9 +14783,6 @@
         "request.GetMasterOrderList": {
             "type": "object",
             "properties": {
-                "keyword": {
-                    "type": "string"
-                },
                 "page": {
                     "description": "椤电爜",
                     "type": "integer"
@@ -14793,6 +14790,11 @@
                 "pageSize": {
                     "description": "姣忛〉澶у皬",
                     "type": "integer"
+                },
+                "search_map": {
+                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"number\": \"閿�鍞�诲崟鍙穃", \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐d汉\", \"start_time\": \"寮�濮嬫椂闂碶", \"end_time\": \"缁撴潫鏃堕棿\", \"money\": \"鎬婚噾棰漒", \"member_name\": \"璐熻矗浜篭"}",
+                    "type": "object",
+                    "additionalProperties": true
                 }
             }
         },
@@ -14840,7 +14842,7 @@
                     "type": "integer"
                 },
                 "searchMap": {
-                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 閿�鍞嚎绱d}",
+                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 閿�鍞嚎绱d, \"client_name\": \"瀹㈡埛鍚嶇О\", \"member_name\": \"閿�鍞礋璐d汉\", \"contact_name\": \"鑱旂郴浜篭", \"validity_date\": \"鏈夋晥鏈焅"}",
                     "type": "object",
                     "additionalProperties": true
                 }

--
Gitblit v1.8.0