Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 4f2a2b480f1d36782c315881bad50066a52e71aa

 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;

}