From 9023e8a46a6027dafa16f65515530162ec289944 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 17 八月 2023 10:09:32 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

---
 model/request/followRecord.go |    2 +-
 docs/swagger.yaml             |    2 +-
 docs/docs.go                  |    2 +-
 docs/swagger.json             |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 0b42ee2..1eecb37 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -15096,7 +15096,7 @@
                     "type": "integer"
                 },
                 "search_map": {
-                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"topic\": \"璺熻繘涓婚\", \"member_name\": \"璺熻繘浜篭", \"client_name\": \"瀹㈡埛鍚嶇О\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"follow_time\": \"璺熻繘鏃堕棿\", \"next_follow_time\": \"涓嬫璺熻繘鏃堕棿\", \"record\": \"璺熻繘璁板綍\", \"phone\": \"鑱旂郴浜虹數璇漒", \"contact_name\": \"鑱旂郴浜哄鍚峔"}",
+                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"topic\": \"璺熻繘涓婚\", \"member_name\": \"璺熻繘浜篭", \"client_name\": \"瀹㈡埛鍚嶇О\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"follow_time\": \"璺熻繘鏃堕棿\", \"next_follow_time\": \"涓嬫璺熻繘鏃堕棿\", \"record\": \"璺熻繘璁板綍\", \"phone\": \"鑱旂郴浜虹數璇漒", \"contact_name\": \"鑱旂郴浜哄鍚峔", \"sales_leads_id\": \"閿�鍞嚎绱d\", \"sale_chance_id\": \"閿�鍞満浼歩d\"}",
                     "type": "object",
                     "additionalProperties": true
                 }
diff --git a/docs/swagger.json b/docs/swagger.json
index 779e9a6..5a1c7c1 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -15084,7 +15084,7 @@
                     "type": "integer"
                 },
                 "search_map": {
-                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"topic\": \"璺熻繘涓婚\", \"member_name\": \"璺熻繘浜篭", \"client_name\": \"瀹㈡埛鍚嶇О\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"follow_time\": \"璺熻繘鏃堕棿\", \"next_follow_time\": \"涓嬫璺熻繘鏃堕棿\", \"record\": \"璺熻繘璁板綍\", \"phone\": \"鑱旂郴浜虹數璇漒", \"contact_name\": \"鑱旂郴浜哄鍚峔"}",
+                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"topic\": \"璺熻繘涓婚\", \"member_name\": \"璺熻繘浜篭", \"client_name\": \"瀹㈡埛鍚嶇О\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"follow_time\": \"璺熻繘鏃堕棿\", \"next_follow_time\": \"涓嬫璺熻繘鏃堕棿\", \"record\": \"璺熻繘璁板綍\", \"phone\": \"鑱旂郴浜虹數璇漒", \"contact_name\": \"鑱旂郴浜哄鍚峔", \"sales_leads_id\": \"閿�鍞嚎绱d\", \"sale_chance_id\": \"閿�鍞満浼歩d\"}",
                     "type": "object",
                     "additionalProperties": true
                 }
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 4c608f8..2252a9b 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -3393,7 +3393,7 @@
         description: '鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"topic": "璺熻繘涓婚",
           "member_name": "璺熻繘浜�", "client_name": "瀹㈡埛鍚嶇О", "client_status": "瀹㈡埛鐘舵��", "follow_time":
           "璺熻繘鏃堕棿", "next_follow_time": "涓嬫璺熻繘鏃堕棿", "record": "璺熻繘璁板綍", "phone": "鑱旂郴浜虹數璇�",
-          "contact_name": "鑱旂郴浜哄鍚�"}'
+          "contact_name": "鑱旂郴浜哄鍚�", "sales_leads_id": "閿�鍞嚎绱d", "sale_chance_id": "閿�鍞満浼歩d"}'
         type: object
     type: object
   request.GetMasterOrderList:
diff --git a/model/request/followRecord.go b/model/request/followRecord.go
index 17dc170..3c64a93 100644
--- a/model/request/followRecord.go
+++ b/model/request/followRecord.go
@@ -28,7 +28,7 @@
 
 type GetFollowRecordList struct {
 	PageInfo
-	SearchMap map[string]interface{} `json:"search_map"` // 鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"topic": "璺熻繘涓婚", "member_name": "璺熻繘浜�", "client_name": "瀹㈡埛鍚嶇О", "client_status": "瀹㈡埛鐘舵��", "follow_time": "璺熻繘鏃堕棿", "next_follow_time": "涓嬫璺熻繘鏃堕棿", "record": "璺熻繘璁板綍", "phone": "鑱旂郴浜虹數璇�", "contact_name": "鑱旂郴浜哄鍚�"}
+	SearchMap map[string]interface{} `json:"search_map"` // 鎼滅储鏉′欢: map[string]interface{}{"name": "xxx"}; {"topic": "璺熻繘涓婚", "member_name": "璺熻繘浜�", "client_name": "瀹㈡埛鍚嶇О", "client_status": "瀹㈡埛鐘舵��", "follow_time": "璺熻繘鏃堕棿", "next_follow_time": "涓嬫璺熻繘鏃堕棿", "record": "璺熻繘璁板綍", "phone": "鑱旂郴浜虹數璇�", "contact_name": "鑱旂郴浜哄鍚�", "sales_leads_id": "閿�鍞嚎绱d", "sale_chance_id": "閿�鍞満浼歩d"}
 }
 
 type DeleteFollowRecord struct {

--
Gitblit v1.8.0