Merge branch 'master' into fly

wangpengfei

2023-08-14 f84d9c46574a2cd663105859035bc17891270923

 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\": \"销售负责人\", \"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\": 销售线索id}",
                    "description": "搜索条件: map[string]interface{}{\"name\": \"xxx\"}; {\"sale_chance_id\": 销售线索id, \"client_name\": \"客户名称\", \"member_name\": \"销售负责人\", \"contact_name\": \"联系人\", \"validity_date\": \"有效期\"}",
                    "type": "object",
                    "additionalProperties": true
                }