Merge remote-tracking branch 'origin/user_action' into user_action

peng

2 天以前 40d3bb9fe638a0bd79e829e7fd5114871101390b

 framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java

@@ -277,6 +277,15 @@
                        "          }\n" +
                        "        }\n" +
                        "      },\n" +
                        "      \"customizeFlag\": {\n" +
                        "        \"type\": \"text\",\n" +
                        "        \"fields\": {\n" +
                        "          \"keyword\": {\n" +
                        "            \"type\": \"keyword\",\n" +
                        "            \"ignore_above\": 256\n" +
                        "          }\n" +
                        "        }\n" +
                        "      },\n" +
                        "      \"point\": {\n" +
                        "        \"type\": \"long\"\n" +
                        "      },\n" +