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

zxl

4 天以前 90488cb6f12f0d79fa0d8bc881c1d0f3bab355ec

 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" +