Merge remote-tracking branch 'origin/dev_0421bug_yzm' into dev

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

@@ -20,6 +20,7 @@
             m.DEL_FLAG = '0'
             AND a.AREA_CODE LIKE concat( #{areaCode}, '%')
             AND M.DATE_ID=#{dateId}
+            order by resolvedRatio desc
     </select>
 
     <select id="selectLastDateId" resultType="java.lang.String">

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

@@ -51,5 +51,6 @@
                 order by t1.DATE_ID desc
                 limit 1
             )and m.CUSTOMER_ID=#{customerId}
+            order by resolvedRatio desc
     </select>
 </mapper>