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

peng

9 天以前 3fdc508014c167ee5b1e4afca62fee7fb87b62e9

 framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java

@@ -296,7 +296,8 @@
    @Field(type = FieldType.Text)
    @ApiModelProperty("商品促销活动集合JSON，key 为 促销活动类型，value 为 促销活动实体信息 ")
    private String promotionMapJson;

    @ApiModelProperty(value = "商品排序")
    private Integer goodsSort;

    public EsGoodsIndex(GoodsSku sku) {
        if (sku != null) {