合并

MrShi

昨天 55596a760d26af8e3ff8797544a1dbf5cfa2657f

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/SearchHistory.java

@@ -59,8 +59,8 @@
    @ExcelColumn(name="搜索词")
    private String content;

    @ApiModelProperty(value = "类型 0发现 1百科 2门店", example = "1")
    @ExcelColumn(name="类型 0发现 1百科 2门店")
    @ApiModelProperty(value = "类型 0商品", example = "1")
    @ExcelColumn(name="类型 0商品")
    private Integer type;

}