Merge branch 'master' into 1.0.1

k94314517

2024-03-18 277f2d65a70bddbf9c571e2023315faad26e12d0

 server/service/src/main/java/com/doumee/dao/system/model/SystemDictData.java

@@ -59,5 +59,7 @@

    @ApiModelProperty(value = "是否删除", hidden = true)
    private Boolean deleted;
    @ApiModelProperty(value = "备注说明" )
    private String remark;

}