Merge branch 'refs/heads/pet' into dev

# Conflicts:
#	src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java

src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java

@@ -122,4 +122,6 @@ public interface FireRecordMapper {
     void doRemoveRecordPointHiddenByCidRidDid(PageData checkInfo);
 
     PageData getPhotoUploadMethod(PageData pageData);
+
+    List<PageData> datalistPageV3(Page page);
 }

src/main/java/com/zcloud/service/firemanager/FireRecordService.java

@@ -143,4 +143,6 @@ public interface FireRecordService {
     void doRemoveRecordPointHiddenByCidRidDid(PageData checkInfo);
 
     PageData getPhotoUploadMethod(PageData pageData);
+
+    List<PageData> getCheckListByAppV3(Page page);
 }

src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java

@@ -804,4 +804,9 @@ public class FireRecordServiceImpl implements FireRecordService {
     public PageData getPhotoUploadMethod(PageData pageData) {
         return fireRecordMapper.getPhotoUploadMethod(pageData);
     }
+
+    @Override
+    public List<PageData> getCheckListByAppV3(Page page) {
+        return fireRecordMapper.datalistPageV3(page);
+    }
 }