From 99206c8d2d2579cf94a47166a1bf202b9290b822 Mon Sep 17 00:00:00 2001
From: liujiandao <274878379@qq.com>
Date: 星期五, 13 十月 2023 17:05:48 +0800
Subject: [PATCH] bug修改2

---
 router/index.go   |    5 
 docs/swagger.yaml |  313 -------------
 docs/docs.go      |  495 ----------------------
 docs/swagger.json |  495 ----------------------
 4 files changed, 33 insertions(+), 1,275 deletions(-)

diff --git a/docs/docs.go b/docs/docs.go
index 795c9c9..ab2884d 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -404,79 +404,6 @@
                 }
             }
         },
-        "/api/base/captcha": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Base"
-                ],
-                "summary": "鑾峰彇楠岃瘉鐮�",
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "allOf": [
-                                {
-                                    "$ref": "#/definitions/contextx.Response"
-                                },
-                                {
-                                    "type": "object",
-                                    "properties": {
-                                        "data": {
-                                            "$ref": "#/definitions/response.LoginResponse"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        },
-        "/api/base/login": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Base"
-                ],
-                "summary": "鐢ㄦ埛鐧诲綍",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.Login"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "allOf": [
-                                {
-                                    "$ref": "#/definitions/contextx.Response"
-                                },
-                                {
-                                    "type": "object",
-                                    "properties": {
-                                        "data": {
-                                            "$ref": "#/definitions/response.LoginResponse"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        },
         "/api/city/add": {
             "post": {
                 "produces": [
@@ -9775,259 +9702,6 @@
                 }
             }
         },
-        "/api/user/changePassword": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "鐢ㄦ埛淇敼瀵嗙爜",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.ChangePasswordReq"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/deleteUser": {
-            "delete": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "鍒犻櫎鐢ㄦ埛",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.DeleteUserReq"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/getUserInfo": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "鑾峰彇鑷韩淇℃伅",
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/getUserList": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "鍒嗛〉鑾峰彇鐢ㄦ埛鍒楄〃(涓嶄紶鍒嗛〉鍙傛暟锛岃幏鍙栧叏閮�)",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.GetUserList"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "allOf": [
-                                {
-                                    "$ref": "#/definitions/contextx.Response"
-                                },
-                                {
-                                    "type": "object",
-                                    "properties": {
-                                        "data": {
-                                            "$ref": "#/definitions/response.PageResult"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/register": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "娉ㄥ唽璐﹀彿",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.Register"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "allOf": [
-                                {
-                                    "$ref": "#/definitions/contextx.Response"
-                                },
-                                {
-                                    "type": "object",
-                                    "properties": {
-                                        "data": {
-                                            "$ref": "#/definitions/response.UserResponse"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/resetPassword": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "閲嶇疆鐢ㄦ埛瀵嗙爜",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/model.User"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/setSelfInfo": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "璁剧疆鐢ㄦ埛淇℃伅",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.ChangeUserInfo"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/setUserInfo": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "璁剧疆鐢ㄦ埛淇℃伅",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.ChangeUserInfo"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
         "/api/vetting/add": {
             "post": {
                 "produces": [
@@ -11892,6 +11566,9 @@
                     "items": {
                         "$ref": "#/definitions/model.Product"
                     }
+                },
+                "quotationName": {
+                    "type": "string"
                 },
                 "quotation_status": {
                     "$ref": "#/definitions/model.QuotationStatus"
@@ -14089,6 +13766,10 @@
                         "$ref": "#/definitions/model.Product"
                     }
                 },
+                "quotationName": {
+                    "description": "鎶ヤ环鍗曞悕绉�",
+                    "type": "string"
+                },
                 "quotation_status_id": {
                     "type": "integer"
                 },
@@ -15145,48 +14826,6 @@
                 }
             }
         },
-        "request.ChangePasswordReq": {
-            "type": "object",
-            "properties": {
-                "newPassword": {
-                    "description": "鏂板瘑鐮�",
-                    "type": "string"
-                },
-                "password": {
-                    "description": "瀵嗙爜",
-                    "type": "string"
-                }
-            }
-        },
-        "request.ChangeUserInfo": {
-            "type": "object",
-            "properties": {
-                "email": {
-                    "description": "鐢ㄦ埛閭",
-                    "type": "string"
-                },
-                "headerImg": {
-                    "description": "鐢ㄦ埛澶村儚",
-                    "type": "string"
-                },
-                "id": {
-                    "description": "鐢ㄦ埛ID",
-                    "type": "string"
-                },
-                "nickName": {
-                    "description": "鐢ㄦ埛鏄电О",
-                    "type": "string"
-                },
-                "phone": {
-                    "description": "鐢ㄦ埛鎵嬫満鍙�",
-                    "type": "string"
-                },
-                "pos": {
-                    "description": "鐢ㄦ埛宀椾綅",
-                    "type": "string"
-                }
-            }
-        },
         "request.CheckClientName": {
             "type": "object",
             "properties": {
@@ -15420,15 +15059,6 @@
                     "items": {
                         "type": "integer"
                     }
-                }
-            }
-        },
-        "request.DeleteUserReq": {
-            "type": "object",
-            "properties": {
-                "userId": {
-                    "description": "鐢ㄦ埛ID",
-                    "type": "string"
                 }
             }
         },
@@ -15966,44 +15596,6 @@
                 }
             }
         },
-        "request.GetUserList": {
-            "type": "object",
-            "properties": {
-                "keyword": {
-                    "description": "妯$硦鏌ヨ鍏抽敭瀛�",
-                    "type": "string"
-                },
-                "page": {
-                    "description": "椤电爜",
-                    "type": "integer"
-                },
-                "pageSize": {
-                    "description": "姣忛〉澶у皬",
-                    "type": "integer"
-                }
-            }
-        },
-        "request.Login": {
-            "type": "object",
-            "properties": {
-                "captcha": {
-                    "description": "楠岃瘉鐮�",
-                    "type": "string"
-                },
-                "captchaId": {
-                    "description": "楠岃瘉鐮両D",
-                    "type": "string"
-                },
-                "password": {
-                    "description": "瀵嗙爜",
-                    "type": "string"
-                },
-                "username": {
-                    "description": "鐢ㄦ埛鍚�",
-                    "type": "string"
-                }
-            }
-        },
         "request.Plan": {
             "type": "object",
             "properties": {
@@ -16067,52 +15659,6 @@
                             "$ref": "#/definitions/constvar.SalesStatus"
                         }
                     ]
-                }
-            }
-        },
-        "request.Register": {
-            "type": "object",
-            "properties": {
-                "authorityId": {
-                    "description": "鐢ㄦ埛瑙掕壊ID",
-                    "type": "integer"
-                },
-                "departmentId": {
-                    "type": "integer"
-                },
-                "email": {
-                    "type": "string"
-                },
-                "headerImg": {
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "nickName": {
-                    "type": "string"
-                },
-                "password": {
-                    "type": "string"
-                },
-                "phone": {
-                    "type": "string"
-                },
-                "pos": {
-                    "type": "string"
-                },
-                "rePassword": {
-                    "description": "纭瀵嗙爜",
-                    "type": "string"
-                },
-                "realName": {
-                    "type": "string"
-                },
-                "userType": {
-                    "$ref": "#/definitions/constvar.UserType"
-                },
-                "username": {
-                    "type": "string"
                 }
             }
         },
@@ -17368,6 +16914,10 @@
                     "items": {
                         "$ref": "#/definitions/model.Product"
                     }
+                },
+                "quotationName": {
+                    "description": "鎶ヤ环鍗曞悕绉�",
+                    "type": "string"
                 },
                 "quotation_status_id": {
                     "type": "integer"
@@ -19255,21 +18805,6 @@
                 }
             }
         },
-        "response.PageResult": {
-            "type": "object",
-            "properties": {
-                "list": {},
-                "page": {
-                    "type": "integer"
-                },
-                "pageSize": {
-                    "type": "integer"
-                },
-                "total": {
-                    "type": "integer"
-                }
-            }
-        },
         "response.PlanResponse": {
             "type": "object",
             "properties": {
@@ -19597,14 +19132,6 @@
                     "items": {
                         "$ref": "#/definitions/model.TimelyRate"
                     }
-                }
-            }
-        },
-        "response.UserResponse": {
-            "type": "object",
-            "properties": {
-                "user": {
-                    "$ref": "#/definitions/model.User"
                 }
             }
         }
diff --git a/docs/swagger.json b/docs/swagger.json
index 2bc0387..8016219 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -392,79 +392,6 @@
                 }
             }
         },
-        "/api/base/captcha": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Base"
-                ],
-                "summary": "鑾峰彇楠岃瘉鐮�",
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "allOf": [
-                                {
-                                    "$ref": "#/definitions/contextx.Response"
-                                },
-                                {
-                                    "type": "object",
-                                    "properties": {
-                                        "data": {
-                                            "$ref": "#/definitions/response.LoginResponse"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        },
-        "/api/base/login": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Base"
-                ],
-                "summary": "鐢ㄦ埛鐧诲綍",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.Login"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "allOf": [
-                                {
-                                    "$ref": "#/definitions/contextx.Response"
-                                },
-                                {
-                                    "type": "object",
-                                    "properties": {
-                                        "data": {
-                                            "$ref": "#/definitions/response.LoginResponse"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        },
         "/api/city/add": {
             "post": {
                 "produces": [
@@ -9763,259 +9690,6 @@
                 }
             }
         },
-        "/api/user/changePassword": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "鐢ㄦ埛淇敼瀵嗙爜",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.ChangePasswordReq"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/deleteUser": {
-            "delete": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "鍒犻櫎鐢ㄦ埛",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.DeleteUserReq"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/getUserInfo": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "鑾峰彇鑷韩淇℃伅",
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/getUserList": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "鍒嗛〉鑾峰彇鐢ㄦ埛鍒楄〃(涓嶄紶鍒嗛〉鍙傛暟锛岃幏鍙栧叏閮�)",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.GetUserList"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "allOf": [
-                                {
-                                    "$ref": "#/definitions/contextx.Response"
-                                },
-                                {
-                                    "type": "object",
-                                    "properties": {
-                                        "data": {
-                                            "$ref": "#/definitions/response.PageResult"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/register": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "娉ㄥ唽璐﹀彿",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.Register"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "allOf": [
-                                {
-                                    "$ref": "#/definitions/contextx.Response"
-                                },
-                                {
-                                    "type": "object",
-                                    "properties": {
-                                        "data": {
-                                            "$ref": "#/definitions/response.UserResponse"
-                                        }
-                                    }
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/resetPassword": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "閲嶇疆鐢ㄦ埛瀵嗙爜",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/model.User"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/setSelfInfo": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "璁剧疆鐢ㄦ埛淇℃伅",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.ChangeUserInfo"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
-        "/api/user/setUserInfo": {
-            "post": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "User"
-                ],
-                "summary": "璁剧疆鐢ㄦ埛淇℃伅",
-                "parameters": [
-                    {
-                        "description": "鏌ヨ鍙傛暟",
-                        "name": "object",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/request.ChangeUserInfo"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "鎴愬姛",
-                        "schema": {
-                            "$ref": "#/definitions/contextx.Response"
-                        }
-                    }
-                }
-            }
-        },
         "/api/vetting/add": {
             "post": {
                 "produces": [
@@ -11880,6 +11554,9 @@
                     "items": {
                         "$ref": "#/definitions/model.Product"
                     }
+                },
+                "quotationName": {
+                    "type": "string"
                 },
                 "quotation_status": {
                     "$ref": "#/definitions/model.QuotationStatus"
@@ -14077,6 +13754,10 @@
                         "$ref": "#/definitions/model.Product"
                     }
                 },
+                "quotationName": {
+                    "description": "鎶ヤ环鍗曞悕绉�",
+                    "type": "string"
+                },
                 "quotation_status_id": {
                     "type": "integer"
                 },
@@ -15133,48 +14814,6 @@
                 }
             }
         },
-        "request.ChangePasswordReq": {
-            "type": "object",
-            "properties": {
-                "newPassword": {
-                    "description": "鏂板瘑鐮�",
-                    "type": "string"
-                },
-                "password": {
-                    "description": "瀵嗙爜",
-                    "type": "string"
-                }
-            }
-        },
-        "request.ChangeUserInfo": {
-            "type": "object",
-            "properties": {
-                "email": {
-                    "description": "鐢ㄦ埛閭",
-                    "type": "string"
-                },
-                "headerImg": {
-                    "description": "鐢ㄦ埛澶村儚",
-                    "type": "string"
-                },
-                "id": {
-                    "description": "鐢ㄦ埛ID",
-                    "type": "string"
-                },
-                "nickName": {
-                    "description": "鐢ㄦ埛鏄电О",
-                    "type": "string"
-                },
-                "phone": {
-                    "description": "鐢ㄦ埛鎵嬫満鍙�",
-                    "type": "string"
-                },
-                "pos": {
-                    "description": "鐢ㄦ埛宀椾綅",
-                    "type": "string"
-                }
-            }
-        },
         "request.CheckClientName": {
             "type": "object",
             "properties": {
@@ -15408,15 +15047,6 @@
                     "items": {
                         "type": "integer"
                     }
-                }
-            }
-        },
-        "request.DeleteUserReq": {
-            "type": "object",
-            "properties": {
-                "userId": {
-                    "description": "鐢ㄦ埛ID",
-                    "type": "string"
                 }
             }
         },
@@ -15954,44 +15584,6 @@
                 }
             }
         },
-        "request.GetUserList": {
-            "type": "object",
-            "properties": {
-                "keyword": {
-                    "description": "妯$硦鏌ヨ鍏抽敭瀛�",
-                    "type": "string"
-                },
-                "page": {
-                    "description": "椤电爜",
-                    "type": "integer"
-                },
-                "pageSize": {
-                    "description": "姣忛〉澶у皬",
-                    "type": "integer"
-                }
-            }
-        },
-        "request.Login": {
-            "type": "object",
-            "properties": {
-                "captcha": {
-                    "description": "楠岃瘉鐮�",
-                    "type": "string"
-                },
-                "captchaId": {
-                    "description": "楠岃瘉鐮両D",
-                    "type": "string"
-                },
-                "password": {
-                    "description": "瀵嗙爜",
-                    "type": "string"
-                },
-                "username": {
-                    "description": "鐢ㄦ埛鍚�",
-                    "type": "string"
-                }
-            }
-        },
         "request.Plan": {
             "type": "object",
             "properties": {
@@ -16055,52 +15647,6 @@
                             "$ref": "#/definitions/constvar.SalesStatus"
                         }
                     ]
-                }
-            }
-        },
-        "request.Register": {
-            "type": "object",
-            "properties": {
-                "authorityId": {
-                    "description": "鐢ㄦ埛瑙掕壊ID",
-                    "type": "integer"
-                },
-                "departmentId": {
-                    "type": "integer"
-                },
-                "email": {
-                    "type": "string"
-                },
-                "headerImg": {
-                    "type": "string"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "nickName": {
-                    "type": "string"
-                },
-                "password": {
-                    "type": "string"
-                },
-                "phone": {
-                    "type": "string"
-                },
-                "pos": {
-                    "type": "string"
-                },
-                "rePassword": {
-                    "description": "纭瀵嗙爜",
-                    "type": "string"
-                },
-                "realName": {
-                    "type": "string"
-                },
-                "userType": {
-                    "$ref": "#/definitions/constvar.UserType"
-                },
-                "username": {
-                    "type": "string"
                 }
             }
         },
@@ -17356,6 +16902,10 @@
                     "items": {
                         "$ref": "#/definitions/model.Product"
                     }
+                },
+                "quotationName": {
+                    "description": "鎶ヤ环鍗曞悕绉�",
+                    "type": "string"
                 },
                 "quotation_status_id": {
                     "type": "integer"
@@ -19243,21 +18793,6 @@
                 }
             }
         },
-        "response.PageResult": {
-            "type": "object",
-            "properties": {
-                "list": {},
-                "page": {
-                    "type": "integer"
-                },
-                "pageSize": {
-                    "type": "integer"
-                },
-                "total": {
-                    "type": "integer"
-                }
-            }
-        },
         "response.PlanResponse": {
             "type": "object",
             "properties": {
@@ -19585,14 +19120,6 @@
                     "items": {
                         "$ref": "#/definitions/model.TimelyRate"
                     }
-                }
-            }
-        },
-        "response.UserResponse": {
-            "type": "object",
-            "properties": {
-                "user": {
-                    "$ref": "#/definitions/model.User"
                 }
             }
         }
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 00f968f..6b262fd 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1151,6 +1151,8 @@
         $ref: '#/definitions/model.QuotationStatus'
       quotation_status_id:
         type: integer
+      quotationName:
+        type: string
       sale_chance:
         $ref: '#/definitions/model.SaleChance'
       sale_chance_id:
@@ -2624,6 +2626,9 @@
         type: array
       quotation_status_id:
         type: integer
+      quotationName:
+        description: 鎶ヤ环鍗曞悕绉�
+        type: string
       sale_chance_id:
         type: integer
       validity_date:
@@ -3338,36 +3343,6 @@
         description: 璺緞
         type: string
     type: object
-  request.ChangePasswordReq:
-    properties:
-      newPassword:
-        description: 鏂板瘑鐮�
-        type: string
-      password:
-        description: 瀵嗙爜
-        type: string
-    type: object
-  request.ChangeUserInfo:
-    properties:
-      email:
-        description: 鐢ㄦ埛閭
-        type: string
-      headerImg:
-        description: 鐢ㄦ埛澶村儚
-        type: string
-      id:
-        description: 鐢ㄦ埛ID
-        type: string
-      nickName:
-        description: 鐢ㄦ埛鏄电О
-        type: string
-      phone:
-        description: 鐢ㄦ埛鎵嬫満鍙�
-        type: string
-      pos:
-        description: 鐢ㄦ埛宀椾綅
-        type: string
-    type: object
   request.CheckClientName:
     properties:
       name:
@@ -3525,12 +3500,6 @@
         items:
           type: integer
         type: array
-    type: object
-  request.DeleteUserReq:
-    properties:
-      userId:
-        description: 鐢ㄦ埛ID
-        type: string
     type: object
   request.DownloadFile:
     properties:
@@ -3925,33 +3894,6 @@
           "master_order_id": "閿�鍞�诲崟id"}'
         type: object
     type: object
-  request.GetUserList:
-    properties:
-      keyword:
-        description: 妯$硦鏌ヨ鍏抽敭瀛�
-        type: string
-      page:
-        description: 椤电爜
-        type: integer
-      pageSize:
-        description: 姣忛〉澶у皬
-        type: integer
-    type: object
-  request.Login:
-    properties:
-      captcha:
-        description: 楠岃瘉鐮�
-        type: string
-      captchaId:
-        description: 楠岃瘉鐮両D
-        type: string
-      password:
-        description: 瀵嗙爜
-        type: string
-      username:
-        description: 鐢ㄦ埛鍚�
-        type: string
-    type: object
   request.Plan:
     properties:
       clientId:
@@ -3993,37 +3935,6 @@
         allOf:
         - $ref: '#/definitions/constvar.SalesStatus'
         description: '鍟嗘満鐘舵��: 1: 璺熻繘涓�; -1:澶辫触'
-    type: object
-  request.Register:
-    properties:
-      authorityId:
-        description: 鐢ㄦ埛瑙掕壊ID
-        type: integer
-      departmentId:
-        type: integer
-      email:
-        type: string
-      headerImg:
-        type: string
-      id:
-        type: string
-      nickName:
-        type: string
-      password:
-        type: string
-      phone:
-        type: string
-      pos:
-        type: string
-      rePassword:
-        description: 纭瀵嗙爜
-        type: string
-      realName:
-        type: string
-      userType:
-        $ref: '#/definitions/constvar.UserType'
-      username:
-        type: string
     type: object
   request.SalesDetails:
     properties:
@@ -4873,6 +4784,9 @@
         type: array
       quotation_status_id:
         type: integer
+      quotationName:
+        description: 鎶ヤ环鍗曞悕绉�
+        type: string
       sale_chance_id:
         type: integer
       validity_date:
@@ -6141,16 +6055,6 @@
           $ref: '#/definitions/model.OrderType'
         type: array
     type: object
-  response.PageResult:
-    properties:
-      list: {}
-      page:
-        type: integer
-      pageSize:
-        type: integer
-      total:
-        type: integer
-    type: object
   response.PlanResponse:
     properties:
       count:
@@ -6361,11 +6265,6 @@
         items:
           $ref: '#/definitions/model.TimelyRate'
         type: array
-    type: object
-  response.UserResponse:
-    properties:
-      user:
-        $ref: '#/definitions/model.User'
     type: object
 info:
   contact: {}
@@ -6609,47 +6508,6 @@
       summary: 鏇存柊閾惰璐︽埛
       tags:
       - 閾惰璐︽埛绠$悊
-  /api/base/captcha:
-    post:
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            allOf:
-            - $ref: '#/definitions/contextx.Response'
-            - properties:
-                data:
-                  $ref: '#/definitions/response.LoginResponse'
-              type: object
-      summary: 鑾峰彇楠岃瘉鐮�
-      tags:
-      - Base
-  /api/base/login:
-    post:
-      parameters:
-      - description: 鏌ヨ鍙傛暟
-        in: body
-        name: object
-        required: true
-        schema:
-          $ref: '#/definitions/request.Login'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            allOf:
-            - $ref: '#/definitions/contextx.Response'
-            - properties:
-                data:
-                  $ref: '#/definitions/response.LoginResponse'
-              type: object
-      summary: 鐢ㄦ埛鐧诲綍
-      tags:
-      - Base
   /api/city/add:
     post:
       parameters:
@@ -12378,161 +12236,6 @@
       summary: 鏇存柊閿�鍞樁娈�
       tags:
       - TimelyRate
-  /api/user/changePassword:
-    post:
-      parameters:
-      - description: 鏌ヨ鍙傛暟
-        in: body
-        name: object
-        required: true
-        schema:
-          $ref: '#/definitions/request.ChangePasswordReq'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            $ref: '#/definitions/contextx.Response'
-      summary: 鐢ㄦ埛淇敼瀵嗙爜
-      tags:
-      - User
-  /api/user/deleteUser:
-    delete:
-      parameters:
-      - description: 鏌ヨ鍙傛暟
-        in: body
-        name: object
-        required: true
-        schema:
-          $ref: '#/definitions/request.DeleteUserReq'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            $ref: '#/definitions/contextx.Response'
-      summary: 鍒犻櫎鐢ㄦ埛
-      tags:
-      - User
-  /api/user/getUserInfo:
-    post:
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            $ref: '#/definitions/contextx.Response'
-      summary: 鑾峰彇鑷韩淇℃伅
-      tags:
-      - User
-  /api/user/getUserList:
-    post:
-      parameters:
-      - description: 鏌ヨ鍙傛暟
-        in: body
-        name: object
-        required: true
-        schema:
-          $ref: '#/definitions/request.GetUserList'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            allOf:
-            - $ref: '#/definitions/contextx.Response'
-            - properties:
-                data:
-                  $ref: '#/definitions/response.PageResult'
-              type: object
-      summary: 鍒嗛〉鑾峰彇鐢ㄦ埛鍒楄〃(涓嶄紶鍒嗛〉鍙傛暟锛岃幏鍙栧叏閮�)
-      tags:
-      - User
-  /api/user/register:
-    post:
-      parameters:
-      - description: 鏌ヨ鍙傛暟
-        in: body
-        name: object
-        required: true
-        schema:
-          $ref: '#/definitions/request.Register'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            allOf:
-            - $ref: '#/definitions/contextx.Response'
-            - properties:
-                data:
-                  $ref: '#/definitions/response.UserResponse'
-              type: object
-      summary: 娉ㄥ唽璐﹀彿
-      tags:
-      - User
-  /api/user/resetPassword:
-    post:
-      parameters:
-      - description: 鏌ヨ鍙傛暟
-        in: body
-        name: object
-        required: true
-        schema:
-          $ref: '#/definitions/model.User'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            $ref: '#/definitions/contextx.Response'
-      summary: 閲嶇疆鐢ㄦ埛瀵嗙爜
-      tags:
-      - User
-  /api/user/setSelfInfo:
-    post:
-      parameters:
-      - description: 鏌ヨ鍙傛暟
-        in: body
-        name: object
-        required: true
-        schema:
-          $ref: '#/definitions/request.ChangeUserInfo'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            $ref: '#/definitions/contextx.Response'
-      summary: 璁剧疆鐢ㄦ埛淇℃伅
-      tags:
-      - User
-  /api/user/setUserInfo:
-    post:
-      parameters:
-      - description: 鏌ヨ鍙傛暟
-        in: body
-        name: object
-        required: true
-        schema:
-          $ref: '#/definitions/request.ChangeUserInfo'
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: 鎴愬姛
-          schema:
-            $ref: '#/definitions/contextx.Response'
-      summary: 璁剧疆鐢ㄦ埛淇℃伅
-      tags:
-      - User
   /api/vetting/add:
     post:
       parameters:
diff --git a/router/index.go b/router/index.go
index 8913ffe..c9d55be 100644
--- a/router/index.go
+++ b/router/index.go
@@ -4,6 +4,7 @@
 	v1 "aps_crm/api/v1"
 	"aps_crm/conf"
 	_ "aps_crm/docs"
+	"aps_crm/middleware"
 	"fmt"
 	"github.com/gin-contrib/cors"
 	"github.com/gin-gonic/gin"
@@ -111,10 +112,10 @@
 
 	PrivateGroup := Router.Group("api")
 	//PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
-	//PrivateGroup.Use(middleware.JWTAuth2())
+	PrivateGroup.Use(middleware.JWTAuth2())
 	//PrivateGroup.Use(middleware.CasbinHandler())
 	{
-		//routerGroup.InitJwtRouter(PrivateGroup) // jwt鐩稿叧璺敱
+		routerGroup.InitJwtRouter(PrivateGroup) // jwt鐩稿叧璺敱
 		//routerGroup.InitUserRouter(PrivateGroup)                 // 娉ㄥ唽鐢ㄦ埛璺敱
 		routerGroup.InitCountryRouter(PrivateGroup)              // 娉ㄥ唽country璺敱
 		routerGroup.InitProvinceRouter(PrivateGroup)             // 娉ㄥ唽province璺敱

--
Gitblit v1.8.0