提交reportDao冲突部分代码

src/main/resources/mappings/modules/report/ReportDao.xml

@@ -214,7 +214,7 @@
         <if test="dbName == 'mssql'">'%,'+#{id}+',%'</if>
         <if test="dbName == 'mysql'">CONCAT('%,', #{id}, ',%')</if>
     </update>
-    
+
     <select id="getReportStatus" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="java.util.HashMap">
         select report_status,COUNT(report_status)
         FROM report
@@ -278,7 +278,7 @@
         </if>
         GROUP BY supplement_type
     </select>
-    
+
     <select id="getRepList" parameterType="com.ejweb.modules.workbench.Bean.WorkbenchBean" resultType="ReportEntity">
         SELECT
         r.id AS "id",