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

peng

3 天以前 9b9e43adee86384abdcbc50af29c7ba68b818fb7

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