Merge remote-tracking branch 'origin/master'

doum

2026-02-13 8dfc59832df6e86f1840857a5b497faa9061a2af

 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;

}