Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml

@@ -35,7 +35,8 @@
         <result property="eventTitle" column="eventTitle"/>
         <result property="eventSource" column="eventSource"/>
         <collection property="imgUrlList" ofType="java.lang.String">
-            <result property="EVENT_IMG_URL" column="imgUrl"/>
+            <result column="imgUrl"/>
+            <result column="id"/>
         </collection>
     </resultMap>
     <!-- 项目详情 -->
@@ -44,7 +45,8 @@
             dd.event_title AS eventTitle,
             dd.EVENT_CONTENT AS eventContent,
             dd.EVENT_SOURCE AS eventSource,
-            did.EVENT_IMG_URL AS imgUrl
+            did.EVENT_IMG_URL AS imgUrl,
+            did.id as id
         FROM
             screen_difficulty_data dd
             LEFT JOIN screen_difficulty_img_data did ON did.EVENT_ID = dd.EVENT_ID