Merge remote-tracking branch 'origin/dev_bugfix_ljj'

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

@@ -68,8 +68,7 @@
 
     <update id="batchDel" parameterType="map">
         update ic_trip_report_record set del_flag='1',UPDATED_BY=#{userId},UPDATED_TIME=NOW()
-        WHERE USER_TYPE !='resi'
-        AND AGENCY_ID=#{agencyId}
+        WHERE  AGENCY_ID=#{agencyId}
         AND (
         <foreach collection="ids" item="id" separator=" OR ">
             id=#{id}