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

peng

3 天以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

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

@@ -202,6 +202,9 @@
                        "      \"skuSource\": {\n" +
                        "        \"type\": \"long\"\n" +
                        "      },\n" +
                        "      \"goodsSort\": {\n" +
                        "        \"type\": \"long\"\n" +
                        "      },\n" +
                        "      \"goodsId\": {\n" +
                        "        \"type\": \"text\",\n" +
                        "        \"fields\": {\n" +