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

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

@@ -74,7 +74,7 @@
         WHERE
         del_flag = '0'
         AND parent_id = #{agencyId}
-        AND month_id = date_format(CURDATE(), '%Y%m') - 1
+        AND month_id = left(replace(DATE_SUB( CURDATE(),INTERVAL 1 MONTH),'-',''),6)
         <if test="sort == 'asc'">
             ORDER BY index_total ASC
         </if>