From d1f6a557ae1a7886aa6a54bd3923b3483db02a68 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Wed, 30 Dec 2020 20:26:25 +0800
Subject: [PATCH] Merge branch 'master' into dev

---
 kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/model/FileInfo.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/model/FileInfo.java b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/model/FileInfo.java
index f1b9def..bcf5181 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-api/src/main/java/com/kidgrow/filecenter/model/FileInfo.java
+++ b/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;
     /**
      * 上传文件类型
      */

--
Gitblit v1.8.0