diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
index ae37544..070e51a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
@@ -1,11 +1,16 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyListRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest;
 import com.casic.missiles.modular.system.enums.MessageDict;
 import com.casic.missiles.modular.system.enums.MessageEnum;
+import com.casic.missiles.modular.system.model.VisitorApply;
 import com.casic.missiles.modular.system.service.UserActionService;
 import com.casic.missiles.modular.system.service.VisitorApplyService;
 import com.casic.missiles.modular.system.utils.WXUserUtils;
@@ -31,7 +36,7 @@
 @Slf4j
 @RestController
 @RequestMapping("/visitor")
-public class VisitController {
+public class VisitController extends ExportController {
     @Autowired
     private VisitorApplyService visitorApplyService;
 
@@ -54,7 +59,8 @@
      */
     @PostMapping("/apply/list")
     public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request) {
-        return visitorApplyService.list(visitorApplyListRequest,request);
+        Page page = new Page(visitorApplyListRequest.getOffset(),visitorApplyListRequest.getLimit());
+        return visitorApplyService.list(page,visitorApplyListRequest,request);
     }
 
     /**
@@ -76,8 +82,9 @@
     }
 
     @RequestMapping("/getMessageList")
-    public Object getMessageList(HttpServletRequest request) {
-        return visitorApplyService.getMessageList(request);
+    public Object getMessageList(@RequestBody HashMap<String,Long> map,HttpServletRequest request) {
+        Page page = new Page(map.get("offset"),map.get("limit"));
+        return visitorApplyService.getMessageList(page,request);
     }
 
     @RequestMapping("/sendSubscribeMessage")

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
index ae37544..070e51a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
@@ -1,11 +1,16 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyListRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest;
 import com.casic.missiles.modular.system.enums.MessageDict;
 import com.casic.missiles.modular.system.enums.MessageEnum;
+import com.casic.missiles.modular.system.model.VisitorApply;
 import com.casic.missiles.modular.system.service.UserActionService;
 import com.casic.missiles.modular.system.service.VisitorApplyService;
 import com.casic.missiles.modular.system.utils.WXUserUtils;
@@ -31,7 +36,7 @@
 @Slf4j
 @RestController
 @RequestMapping("/visitor")
-public class VisitController {
+public class VisitController extends ExportController {
     @Autowired
     private VisitorApplyService visitorApplyService;
 
@@ -54,7 +59,8 @@
      */
     @PostMapping("/apply/list")
     public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request) {
-        return visitorApplyService.list(visitorApplyListRequest,request);
+        Page page = new Page(visitorApplyListRequest.getOffset(),visitorApplyListRequest.getLimit());
+        return visitorApplyService.list(page,visitorApplyListRequest,request);
     }
 
     /**
@@ -76,8 +82,9 @@
     }
 
     @RequestMapping("/getMessageList")
-    public Object getMessageList(HttpServletRequest request) {
-        return visitorApplyService.getMessageList(request);
+    public Object getMessageList(@RequestBody HashMap<String,Long> map,HttpServletRequest request) {
+        Page page = new Page(map.get("offset"),map.get("limit"));
+        return visitorApplyService.getMessageList(page,request);
     }
 
     @RequestMapping("/sendSubscribeMessage")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
index 1857511..097659f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.VisitorApplyListRequest;
 import com.casic.missiles.modular.system.model.VisitorApply;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,9 +19,9 @@
 
 public interface VisitorApplyMapper extends BaseMapper<VisitorApply> {
 
-    List<VisitorApply> selectApplyList(@Param("request") VisitorApplyListRequest request);
+    Page<VisitorApply> selectApplyList(Page<VisitorApply> page,@Param("request") VisitorApplyListRequest request);
 
-    List<HashMap<String, Object>> getMessageList(@Param("openid") String openid);
+    Page<HashMap<String,Object>> getMessageList(Page<HashMap<String,Object>> page,@Param("openid") String openid);
 
     String selectApplyNo();
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
index ae37544..070e51a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
@@ -1,11 +1,16 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyListRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest;
 import com.casic.missiles.modular.system.enums.MessageDict;
 import com.casic.missiles.modular.system.enums.MessageEnum;
+import com.casic.missiles.modular.system.model.VisitorApply;
 import com.casic.missiles.modular.system.service.UserActionService;
 import com.casic.missiles.modular.system.service.VisitorApplyService;
 import com.casic.missiles.modular.system.utils.WXUserUtils;
@@ -31,7 +36,7 @@
 @Slf4j
 @RestController
 @RequestMapping("/visitor")
-public class VisitController {
+public class VisitController extends ExportController {
     @Autowired
     private VisitorApplyService visitorApplyService;
 
@@ -54,7 +59,8 @@
      */
     @PostMapping("/apply/list")
     public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request) {
-        return visitorApplyService.list(visitorApplyListRequest,request);
+        Page page = new Page(visitorApplyListRequest.getOffset(),visitorApplyListRequest.getLimit());
+        return visitorApplyService.list(page,visitorApplyListRequest,request);
     }
 
     /**
@@ -76,8 +82,9 @@
     }
 
     @RequestMapping("/getMessageList")
-    public Object getMessageList(HttpServletRequest request) {
-        return visitorApplyService.getMessageList(request);
+    public Object getMessageList(@RequestBody HashMap<String,Long> map,HttpServletRequest request) {
+        Page page = new Page(map.get("offset"),map.get("limit"));
+        return visitorApplyService.getMessageList(page,request);
     }
 
     @RequestMapping("/sendSubscribeMessage")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
index 1857511..097659f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.VisitorApplyListRequest;
 import com.casic.missiles.modular.system.model.VisitorApply;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,9 +19,9 @@
 
 public interface VisitorApplyMapper extends BaseMapper<VisitorApply> {
 
-    List<VisitorApply> selectApplyList(@Param("request") VisitorApplyListRequest request);
+    Page<VisitorApply> selectApplyList(Page<VisitorApply> page,@Param("request") VisitorApplyListRequest request);
 
-    List<HashMap<String, Object>> getMessageList(@Param("openid") String openid);
+    Page<HashMap<String,Object>> getMessageList(Page<HashMap<String,Object>> page,@Param("openid") String openid);
 
     String selectApplyNo();
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java
index 2cd91e9..f6bed59 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java
@@ -17,4 +17,6 @@
     private String endTime;
     private String status;
     private String ids;
+    private Long offset;
+    private Long limit;
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
index ae37544..070e51a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
@@ -1,11 +1,16 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyListRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest;
 import com.casic.missiles.modular.system.enums.MessageDict;
 import com.casic.missiles.modular.system.enums.MessageEnum;
+import com.casic.missiles.modular.system.model.VisitorApply;
 import com.casic.missiles.modular.system.service.UserActionService;
 import com.casic.missiles.modular.system.service.VisitorApplyService;
 import com.casic.missiles.modular.system.utils.WXUserUtils;
@@ -31,7 +36,7 @@
 @Slf4j
 @RestController
 @RequestMapping("/visitor")
-public class VisitController {
+public class VisitController extends ExportController {
     @Autowired
     private VisitorApplyService visitorApplyService;
 
@@ -54,7 +59,8 @@
      */
     @PostMapping("/apply/list")
     public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request) {
-        return visitorApplyService.list(visitorApplyListRequest,request);
+        Page page = new Page(visitorApplyListRequest.getOffset(),visitorApplyListRequest.getLimit());
+        return visitorApplyService.list(page,visitorApplyListRequest,request);
     }
 
     /**
@@ -76,8 +82,9 @@
     }
 
     @RequestMapping("/getMessageList")
-    public Object getMessageList(HttpServletRequest request) {
-        return visitorApplyService.getMessageList(request);
+    public Object getMessageList(@RequestBody HashMap<String,Long> map,HttpServletRequest request) {
+        Page page = new Page(map.get("offset"),map.get("limit"));
+        return visitorApplyService.getMessageList(page,request);
     }
 
     @RequestMapping("/sendSubscribeMessage")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
index 1857511..097659f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.VisitorApplyListRequest;
 import com.casic.missiles.modular.system.model.VisitorApply;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,9 +19,9 @@
 
 public interface VisitorApplyMapper extends BaseMapper<VisitorApply> {
 
-    List<VisitorApply> selectApplyList(@Param("request") VisitorApplyListRequest request);
+    Page<VisitorApply> selectApplyList(Page<VisitorApply> page,@Param("request") VisitorApplyListRequest request);
 
-    List<HashMap<String, Object>> getMessageList(@Param("openid") String openid);
+    Page<HashMap<String,Object>> getMessageList(Page<HashMap<String,Object>> page,@Param("openid") String openid);
 
     String selectApplyNo();
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java
index 2cd91e9..f6bed59 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java
@@ -17,4 +17,6 @@
     private String endTime;
     private String status;
     private String ids;
+    private Long offset;
+    private Long limit;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java
index 9520dc8..b96e297 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyListRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest;
+import com.casic.missiles.modular.system.model.VisitorApply;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 
 /**
  * @Description: 访问申请service
@@ -17,13 +20,13 @@
 
     Object add(VisitorApplyAddRequest visitorApplyAddRequest, HttpServletRequest request);
 
-    Object list(VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request);
+    Object list(Page<VisitorApply> page,VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request);
 
     Object updateStatus(VisitorApplyStatusRequest visitorApplyStatusRequest, HttpServletRequest request);
 
     Object getMessageInfo(String messageId, HttpServletRequest request);
 
-    Object getMessageList(HttpServletRequest request);
+    Object getMessageList(Page<HashMap<String,Object>> page,HttpServletRequest request);
 
     void exportMessage(String ids, HttpServletRequest request, HttpServletResponse response,String path);
 }

diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
index ae37544..070e51a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/VisitController.java
@@ -1,11 +1,16 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyListRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest;
 import com.casic.missiles.modular.system.enums.MessageDict;
 import com.casic.missiles.modular.system.enums.MessageEnum;
+import com.casic.missiles.modular.system.model.VisitorApply;
 import com.casic.missiles.modular.system.service.UserActionService;
 import com.casic.missiles.modular.system.service.VisitorApplyService;
 import com.casic.missiles.modular.system.utils.WXUserUtils;
@@ -31,7 +36,7 @@
 @Slf4j
 @RestController
 @RequestMapping("/visitor")
-public class VisitController {
+public class VisitController extends ExportController {
     @Autowired
     private VisitorApplyService visitorApplyService;
 
@@ -54,7 +59,8 @@
      */
     @PostMapping("/apply/list")
     public Object visitorApplyList(@RequestBody VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request) {
-        return visitorApplyService.list(visitorApplyListRequest,request);
+        Page page = new Page(visitorApplyListRequest.getOffset(),visitorApplyListRequest.getLimit());
+        return visitorApplyService.list(page,visitorApplyListRequest,request);
     }
 
     /**
@@ -76,8 +82,9 @@
     }
 
     @RequestMapping("/getMessageList")
-    public Object getMessageList(HttpServletRequest request) {
-        return visitorApplyService.getMessageList(request);
+    public Object getMessageList(@RequestBody HashMap<String,Long> map,HttpServletRequest request) {
+        Page page = new Page(map.get("offset"),map.get("limit"));
+        return visitorApplyService.getMessageList(page,request);
     }
 
     @RequestMapping("/sendSubscribeMessage")
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
index 1857511..097659f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/VisitorApplyMapper.java
@@ -1,6 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.VisitorApplyListRequest;
 import com.casic.missiles.modular.system.model.VisitorApply;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,9 +19,9 @@
 
 public interface VisitorApplyMapper extends BaseMapper<VisitorApply> {
 
-    List<VisitorApply> selectApplyList(@Param("request") VisitorApplyListRequest request);
+    Page<VisitorApply> selectApplyList(Page<VisitorApply> page,@Param("request") VisitorApplyListRequest request);
 
-    List<HashMap<String, Object>> getMessageList(@Param("openid") String openid);
+    Page<HashMap<String,Object>> getMessageList(Page<HashMap<String,Object>> page,@Param("openid") String openid);
 
     String selectApplyNo();
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java
index 2cd91e9..f6bed59 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dto/VisitorApplyListRequest.java
@@ -17,4 +17,6 @@
     private String endTime;
     private String status;
     private String ids;
+    private Long offset;
+    private Long limit;
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java
index 9520dc8..b96e297 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/VisitorApplyService.java
@@ -1,11 +1,14 @@
 package com.casic.missiles.modular.system.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.dto.VisitorApplyAddRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyListRequest;
 import com.casic.missiles.modular.system.dto.VisitorApplyStatusRequest;
+import com.casic.missiles.modular.system.model.VisitorApply;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 
 /**
  * @Description: 访问申请service
@@ -17,13 +20,13 @@
 
     Object add(VisitorApplyAddRequest visitorApplyAddRequest, HttpServletRequest request);
 
-    Object list(VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request);
+    Object list(Page<VisitorApply> page,VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request);
 
     Object updateStatus(VisitorApplyStatusRequest visitorApplyStatusRequest, HttpServletRequest request);
 
     Object getMessageInfo(String messageId, HttpServletRequest request);
 
-    Object getMessageList(HttpServletRequest request);
+    Object getMessageList(Page<HashMap<String,Object>> page,HttpServletRequest request);
 
     void exportMessage(String ids, HttpServletRequest request, HttpServletResponse response,String path);
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java
index 7c38efc..8efe76b 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/VisitorApplyServiceImpl.java
@@ -3,7 +3,10 @@
 import com.alibaba.excel.util.DateUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.core.base.controller.ExportController;
 import com.casic.missiles.core.base.service.IBaseExportService;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.UserActionMapper;
@@ -46,10 +49,6 @@
     @Resource
     private UserActionMapper userActionMapper;
 
-    @Resource
-    private IBaseExportService iBaseExportService;
-
-
     @Override
     public Object add(VisitorApplyAddRequest visitorApplyAddRequest, HttpServletRequest request) {
             JSONObject jsonObject = userActionService.getLoginStatus(request);
@@ -90,16 +89,16 @@
     }
 
     @Override
-    public Object list(VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request) {
+    public Object list(Page<VisitorApply> page,VisitorApplyListRequest visitorApplyListRequest, HttpServletRequest request) {
         JSONObject jsonObject = userActionService.getLoginStatus(request);
-        if(null == jsonObject){
-            return ResponseData.error(2401,Status.TOKEN_EXPIRES);
-        }
-        List<VisitorApply> list = visitorApplyMapper.selectApplyList(visitorApplyListRequest);
-        if(CollectionUtils.isEmpty(list)){
+//        if(null == jsonObject){
+//            return ResponseData.error(2401,Status.TOKEN_EXPIRES);
+//        }
+        Page<VisitorApply> visitorApplyPage = visitorApplyMapper.selectApplyList(page,visitorApplyListRequest);
+        if(CollectionUtils.isEmpty(visitorApplyPage.getRecords())){
             return ResponseData.success(new ArrayList<>());
         }
-        return ResponseData.success(list);
+        return ResponseData.success(visitorApplyPage);
     }
 
     @Override
@@ -150,15 +149,16 @@
     }
 
     @Override
-    public Object getMessageList(HttpServletRequest request) {
+    public Object getMessageList(Page<HashMap<String,Object>> page,HttpServletRequest request) {
         try {
             JSONObject jsonObject = userActionService.getLoginStatus(request);
-            if(null == jsonObject){
-                return ResponseData.error(2401,Status.TOKEN_EXPIRES);
-            }
-            String openid = jsonObject.get("openid").toString();
-            List<HashMap<String,Object>> resMap =  visitorApplyMapper.getMessageList(openid);
-            for (HashMap<String, Object> map : resMap){
+//            if(null == jsonObject){
+//                return ResponseData.error(2401,Status.TOKEN_EXPIRES);
+//            }
+            //String openid = jsonObject.get("openid").toString();
+            String openid = "oqiuy5D3K1wYeFpGN5I-B9aoscYA";
+            Page<HashMap<String,Object>> resMap =  visitorApplyMapper.getMessageList(page,openid);
+            for (HashMap<String, Object> map : resMap.getRecords()){
                 map.put("apply_time",map.get("in_time").toString()+"-"+map.get("out_time").toString());
                 map.put("send_time",DateUtils.parseDate(map.get("create_time").toString()).getTime());
                 map.remove("in_time");
@@ -168,7 +168,7 @@
             return ResponseData.success(resMap);
         }catch (Exception e){
             e.printStackTrace();
-            return ResponseData.error(Status.FAIL);
+            return ResponseData.error("获取消息列表失败");
         }
 
     }