Merge remote-tracking branch 'origin/master'

fei

3 天以前 68af47f24bc344d2e1c5e1a848458b38679ddad4

 zhang-content/src/main/java/com/ruoyi/domain/ZfCollection.java

@@ -31,6 +31,7 @@
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    private String fileName;
    /**
     * 类别
     */