Merge remote-tracking branch 'origin/master'

k94314517

2025-07-15 9d7979a2933632bc2083c7f0b3e4a793b0dc3f3e

 server/services/src/main/java/com/doumee/dao/business/model/Category.java

@@ -26,7 +26,7 @@

    @ApiModelProperty(value = "是否已删除 0未删除 1已删除", example = "1")
    @ExcelColumn(name="是否已删除 0未删除 1已删除")
    private Byte deleted;
    private Integer deleted;

    @ApiModelProperty(value = "状态:0=启用；1=禁用；", example = "1")
    @ExcelColumn(name="状态:0=启用；1=禁用；")