From a84272074623e287fc45421fb75964b50f6ff61d Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 25 八月 2023 10:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 docs/docs.go |  102 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 100 insertions(+), 2 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 0c73b72..8d2e5b7 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -6779,7 +6779,19 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/contextx.Response"
+                            "allOf": [
+                                {
+                                    "$ref": "#/definitions/contextx.Response"
+                                },
+                                {
+                                    "type": "object",
+                                    "properties": {
+                                        "data": {
+                                            "$ref": "#/definitions/request.AddSalesDetails"
+                                        }
+                                    }
+                                }
+                            ]
                         }
                     }
                 }
@@ -11229,6 +11241,9 @@
                 "quotationId": {
                     "type": "integer"
                 },
+                "serviceContractStatus": {
+                    "$ref": "#/definitions/model.ServiceContractStatus"
+                },
                 "statusId": {
                     "type": "integer"
                 },
@@ -11842,6 +11857,14 @@
                     "description": "璐︽埛id",
                     "type": "integer"
                 },
+                "client": {
+                    "description": "瀹㈡埛id",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.Client"
+                        }
+                    ]
+                },
                 "clientId": {
                     "description": "瀹㈡埛id",
                     "type": "integer"
@@ -12230,6 +12253,9 @@
                 "signTime": {
                     "type": "string"
                 },
+                "updateTime": {
+                    "type": "string"
+                },
                 "wechatOrderStatus": {
                     "$ref": "#/definitions/model.WechatOrderStatus"
                 },
@@ -12263,6 +12289,9 @@
                     "type": "integer"
                 },
                 "desc": {
+                    "type": "string"
+                },
+                "detail_address": {
                     "type": "string"
                 },
                 "followRecord": {
@@ -12383,6 +12412,9 @@
                             "$ref": "#/definitions/constvar.RefundSourceType"
                         }
                     ]
+                },
+                "updateTime": {
+                    "type": "string"
                 }
             }
         },
@@ -12462,6 +12494,9 @@
                             "$ref": "#/definitions/constvar.SalesReturnSourceType"
                         }
                     ]
+                },
+                "updateTime": {
+                    "type": "string"
                 }
             }
         },
@@ -12612,6 +12647,12 @@
                 "contactId": {
                     "type": "integer"
                 },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorName": {
+                    "type": "string"
+                },
                 "endTime": {
                     "type": "string"
                 },
@@ -12673,6 +12714,9 @@
                     "type": "string"
                 },
                 "terms": {
+                    "type": "string"
+                },
+                "updateTime": {
                     "type": "string"
                 }
             }
@@ -12743,6 +12787,12 @@
                 "contactId": {
                     "type": "integer"
                 },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorName": {
+                    "type": "string"
+                },
                 "file": {
                     "type": "string"
                 },
@@ -12796,6 +12846,9 @@
                 },
                 "timelyRateId": {
                     "type": "integer"
+                },
+                "updateTime": {
+                    "type": "string"
                 }
             }
         },
@@ -12831,6 +12884,12 @@
                 "contactId": {
                     "description": "鑱旂郴浜篿d",
                     "type": "integer"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "creatorName": {
+                    "type": "string"
                 },
                 "expectTime": {
                     "description": "甯屾湜澶勭悊鏃堕棿",
@@ -12952,6 +13011,9 @@
                 "timeSpentId": {
                     "description": "鑺辫垂鏃堕棿",
                     "type": "integer"
+                },
+                "updateTime": {
+                    "type": "string"
                 }
             }
         },
@@ -13874,6 +13936,14 @@
                     "description": "璐︽埛id",
                     "type": "integer"
                 },
+                "client": {
+                    "description": "瀹㈡埛id",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.Client"
+                        }
+                    ]
+                },
                 "clientId": {
                     "description": "瀹㈡埛id",
                     "type": "integer"
@@ -14204,6 +14274,10 @@
                     "description": "澶囨敞",
                     "type": "string"
                 },
+                "detail_address": {
+                    "description": "璇︾粏鍦板潃",
+                    "type": "string"
+                },
                 "member_id": {
                     "description": "閿�鍞礋璐ｄ汉ID",
                     "type": "integer"
@@ -14328,6 +14402,12 @@
                     "type": "integer"
                 },
                 "salesDetailsId": {
+                    "type": "integer"
+                },
+                "serviceContractStatusId": {
+                    "type": "integer"
+                },
+                "serviceContractTypeId": {
                     "type": "integer"
                 },
                 "serviceTimes": {
@@ -15174,7 +15254,7 @@
                     "type": "integer"
                 },
                 "search_map": {
-                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\"}",
+                    "description": "鎼滅储鏉′欢: map[string]interface{}{\"name\": \"xxx\"}; {\"name\": \"瀹㈡埛鍚嶇О\", \"phone\": \"鎵嬫満鍙风爜\", \"detail_address\":\"璇︾粏鍦板潃\", \"next_visit_time\":\"涓嬪洖鍥炶鏃ユ湡\", \"member_name\": \"閿�鍞礋璐ｄ汉\", \"client_status\": \"瀹㈡埛鐘舵�乗", \"client_level\": \"閲嶈绾у埆\",\"representative\": \"娉曞畾浠ｈ〃浜篭", \"registration_time\": \"娉ㄥ唽鏃堕棿\", \"business_scope\": \"缁忚惀鑼冨洿\", \"remark\": \"澶囨敞\", \"not_admin\":\"1:鎴戠殑瀹㈡埛; 2:admin瀹㈡埛\"}",
                     "type": "object",
                     "additionalProperties": true
                 }
@@ -16927,6 +17007,14 @@
                     "description": "璐︽埛id",
                     "type": "integer"
                 },
+                "client": {
+                    "description": "瀹㈡埛id",
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/model.Client"
+                        }
+                    ]
+                },
                 "clientId": {
                     "description": "瀹㈡埛id",
                     "type": "integer"
@@ -17354,6 +17442,10 @@
                     "description": "澶囨敞",
                     "type": "string"
                 },
+                "detail_address": {
+                    "description": "璇︾粏鍦板潃",
+                    "type": "string"
+                },
                 "id": {
                     "type": "integer"
                 },
@@ -17605,6 +17697,12 @@
                 "salesDetailsId": {
                     "type": "integer"
                 },
+                "serviceContractStatusId": {
+                    "type": "integer"
+                },
+                "serviceContractTypeId": {
+                    "type": "integer"
+                },
                 "serviceTimes": {
                     "type": "integer"
                 },

--
Gitblit v1.8.0