Merge remote-tracking branch 'origin/dev' into dev

luliqiang

2021-02-26 e7c3314727fc06444689c0e6ecab5fea337afeb0

 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/model/FileInfo.java

@@ -35,6 +35,13 @@
     * 是否图片
     */
    private Boolean isImg;

    /**
     * 图片类型
     * Xray还是logo
     */
    @TableField(exist = false)
    private String imgType;
    /**
     * 上传文件类型
     */