guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/pet' into dev 

# Conflicts:
#	src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
hyx_2024-10-12_xgfPerson
water_xu 2024-09-14 16:34:08 +08:00
parent b8dec5280c bc8002876b
commit 9169d4c15e
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/mapper/datasource/firemanager/FireRecordMapper.java
View File

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

2
src/main/java/com/zcloud/service/firemanager/FireRecordService.java
View File

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

5
src/main/java/com/zcloud/service/firemanager/impl/FireRecordServiceImpl.java
View File

@ -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);
}
}