Merge remote-tracking branch 'origin/master'

doum

2026-02-13 8dfc59832df6e86f1840857a5b497faa9061a2af

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

@@ -62,8 +62,8 @@
    @ExcelColumn(name="对象编码")
    private Integer objId;

    @ApiModelProperty(value = "对象类型 0活动探店咨询 1商品", example = "1")
    @ExcelColumn(name="对象类型 0活动探店咨询")
    @ApiModelProperty(value = "对象类型 0社区 1商品", example = "1")
    @ExcelColumn(name="对象类型 0社区 1商品")
    private Integer objType;

    @ApiModelProperty(value = "列表图")