From 57639dfd35931021cdab41964f08297ae302ef0a Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期一, 26 二月 2024 18:37:47 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java index 0120b49..47b8bfd 100644 --- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java +++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/RetentionServiceImpl.java @@ -208,12 +208,8 @@ return PageData.from(retentionIPage); } - /** - * 瀵煎嚭 - * - * @param pageWrap 鍒嗛〉瀵硅薄 - * @return PageData<RetentionVo> - */ + + @Override public List<RetentionVo> findPageExcel(PageWrap<Retention> pageWrap) { IPage<Retention> retentionInfo = getDataInfo(pageWrap); List<RetentionVo> retentionVoList = new ArrayList<>(); @@ -235,6 +231,7 @@ vo.setName(obj.getName()); vo.setPhone(obj.getPhone()); vo.setIdcardNo(obj.getIdcardNo()); + vo.setDeviceName(obj.getDeviceName()); vo.setEventDate(obj.getEventDate()); retentionVoList.add(vo); } -- Gitblit v1.9.3