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

zxl

7 天以前 0d5ce03a7e150d034fadc7f864ee659cf4c6150f

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

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

    @ApiModelProperty(value = "商品排序")
    @Field(type = FieldType.Long)
    private Integer goodsSort;

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