From 0a2c622e933365d3eeedaf525ff0130374d31095 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 22 Jun 2020 15:40:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=85=8D=E7=BD=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E8=BE=93=E5=85=A5=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java    | 5 +++++
 .../elink/esua/epdc/dto/result/EpdcImgConfigResultDTO.java | 5 +++++
 .../java/com/elink/esua/epdc/entity/ImgConfigEntity.java   | 5 +++++
 .../src/main/resources/mapper/ImgConfigDao.xml             | 7 +++++--
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java
index dc87f320..530831c6 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java
@@ -87,4 +87,9 @@ public class ImgConfigDTO implements Serializable {
      * 图片地址
      */
     private String imgCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcImgConfigResultDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcImgConfigResultDTO.java
index 589bf26b..3f0f0c6d 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcImgConfigResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcImgConfigResultDTO.java
@@ -29,4 +29,9 @@ public class EpdcImgConfigResultDTO implements Serializable {
      * 图片地址
      */
     private String imgCode;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java
index 20134c6d..c55b9a25 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java
@@ -57,4 +57,9 @@ public class ImgConfigEntity extends BaseEpdcEntity {
 	 * 图片地址
 	 */
 	private String imgCode;
+
+	/**
+	 * 备注
+	 */
+	private String remark;
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml
index f237046e..fa976110 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml
@@ -15,6 +15,7 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="imgCode" column="IMG_CODE"/>
+        <result property="remark" column="REMARK"/>
     </resultMap>
 
     <select id="selectListImgConfig" resultType="com.elink.esua.epdc.dto.ImgConfigDTO">
@@ -24,7 +25,8 @@
             IMG_URL imgUrl,
             SORT sort,
             IMG_CODE imgCode,
-            CREATED_TIME createdTime
+            CREATED_TIME createdTime,
+            REMARK remark
         FROM
             `epdc_img_config`
             WHERE DEL_FLAG = 0
@@ -38,7 +40,8 @@
         SELECT
           IMG_URL imgUrl,
           IMG_TYPE imgType,
-          IMG_CODE imgCode
+          IMG_CODE imgCode,
+          REMARK remark
         FROM
         `epdc_img_config`
         WHERE DEL_FLAG = 0