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

epmet-user/epmet-user-server/src/main/resources/mapper/StaffPatrolRecordDao.xml

@@ -22,7 +22,7 @@
                     pr.STAFF_ID = #{userId}
                 </foreach>
                 )
-        ORDER BY pd.SERIAL_NUM DESC)t GROUP BY ID
+        GROUP BY pr.STAFF_ID ORDER BY pr.CREATED_TIME DESC)t
     </select>
 
     <!-- 巡查记录查询 -->