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

RMS/src/main/resources/mapper/FollowUpMapper.xml

@@ -100,9 +100,9 @@
     <select id="query" resultMap="queryMap">
         SELECT a.ID, a.REPORT_ID, a.PARENT_ID, a.FOLLOW_UP_NAME,a.REMARK,a.TIME_LIMIT,a.AGENT,a.ASSIST_PERSON,a.FINISH_TIME,a.STATUS, a.CONCLUSION,
                a.CREATE_PERSON_ID, a.CREATE_PERSON_NAME, a.CREATE_TIME, d.FILE_ID, d.NAME, d.ADDRESS, d.ZID,d.FILEREMARK, d.UPDATE_TIME, d.UID,d.TYPE, d.SIZE, d.SUFFIX, d.FILE_NAME
-        FROM FOLLOW_UP a LEFT JOIN (SELECT b.follow_up_id, b.FILE_ID, c.ID, c.NAME, c.ADDRESS, c.ZID, c.REMARK AS FILEREMARK, c.UPDATE_TIME, c.UID, c.TYPE, c.SIZE, c.SUFFIX, c.FILE_NAME
+        FROM FOLLOW_UP a LEFT JOIN (SELECT b.FOLLOW_UP_ID, b.FILE_ID, c.ID, c.NAME, c.ADDRESS, c.ZID, c.REMARK AS FILEREMARK, c.UPDATE_TIME, c.UID, c.TYPE, c.SIZE, c.SUFFIX, c.FILE_NAME
                                     FROM ASSO_FOLLOW_UP_FILE b LEFT JOIN REPORT_FILE c ON b.FILE_ID = c.ID) d
-                                   ON a.ID = d.FOLLOW_UP_ID
+                                    ON a.ID = d.FOLLOW_UP_ID
         WHERE a.REPORT_ID = #{reportId} ORDER BY CREATE_TIME DESC
     </select>