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

peng

6 天以前 d4d9ea89dd109cb975eaa3412a15c5ff6e8d11dd

 framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java

@@ -76,6 +76,14 @@
    @ApiModelProperty("除了销售模式当前销售模式之外")
    private String neSalesModel;

    @ApiModelProperty("是否开启商品过滤")
    private Boolean canFilter;

    @ApiModelProperty("是否需要开启过滤预售商品")
    private Boolean needFilterPre;



    //过滤搜索关键字
    public String getKeyword() {
        if (CharSequenceUtil.isNotEmpty(keyword)) {