Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

zhangqian

2023-08-17 9023e8a46a6027dafa16f65515530162ec289944

Merge branch 'master' of ssh://192.168.5.5:29418/aps/crm

 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\": \"销售线索id\", \"sale_chance_id\": \"销售机会id\"}",
                    "type": "object",
                    "additionalProperties": true
                }

 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\": \"销售线索id\", \"sale_chance_id\": \"销售机会id\"}",
                    "type": "object",
                    "additionalProperties": true
                }

 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": "销售线索id", "sale_chance_id": "销售机会id"}'
        type: object
    type: object
  request.GetMasterOrderList:

 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": "销售线索id", "sale_chance_id": "销售机会id"}
}

type DeleteFollowRecord struct {