Merge branch 'master' into fly

wangpengfei

2023-08-17 06c0b03df2955475fe39ff2a793a5f151f4da99f

 docs/docs.go

@@ -12810,6 +12810,14 @@
                    "description": "服务合同id",
                    "type": "integer"
                },
                "serviceMan": {
                    "description": "服务人员",
                    "allOf": [
                        {
                            "$ref": "#/definitions/model.User"
                        }
                    ]
                },
                "serviceManId": {
                    "description": "服务人员",
                    "type": "integer"
@@ -15096,7 +15104,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\": \"销售线索id\", \"sale_chance_id\": \"销售机会id\"}",
                    "type": "object",
                    "additionalProperties": true
                }