Merge remote-tracking branch 'origin/master'

jiangping

2024-01-24 1bfec53e4e3a196a3ca53e06e9bec88139cbb689

 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;

}