diff --git a/src/main/java/com/ycwl/basic/integration/questionnaire/client/QuestionnaireClient.java b/src/main/java/com/ycwl/basic/integration/questionnaire/client/QuestionnaireClient.java
index 46b0c835..ff2586f1 100644
--- a/src/main/java/com/ycwl/basic/integration/questionnaire/client/QuestionnaireClient.java
+++ b/src/main/java/com/ycwl/basic/integration/questionnaire/client/QuestionnaireClient.java
@@ -1,11 +1,10 @@
 package com.ycwl.basic.integration.questionnaire.client;
 
 import com.ycwl.basic.integration.common.response.CommonResponse;
+import com.ycwl.basic.integration.common.response.PageResponse;
 import com.ycwl.basic.integration.questionnaire.dto.answer.ResponseDetailResponse;
-import com.ycwl.basic.integration.questionnaire.dto.answer.ResponseListResponse;
 import com.ycwl.basic.integration.questionnaire.dto.answer.SubmitAnswerRequest;
 import com.ycwl.basic.integration.questionnaire.dto.questionnaire.CreateQuestionnaireRequest;
-import com.ycwl.basic.integration.questionnaire.dto.questionnaire.QuestionnaireListResponse;
 import com.ycwl.basic.integration.questionnaire.dto.questionnaire.QuestionnaireResponse;
 import com.ycwl.basic.integration.questionnaire.dto.statistics.QuestionnaireStatistics;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -35,7 +34,7 @@ public interface QuestionnaireClient {
      * 获取问卷列表
      */
     @GetMapping("/questionnaires")
-    CommonResponse<QuestionnaireListResponse> getQuestionnaireList(
+    CommonResponse<PageResponse<QuestionnaireResponse>> getQuestionnaireList(
             @RequestParam(defaultValue = "1") Integer page,
             @RequestParam(defaultValue = "10") Integer pageSize,
             @RequestParam(required = false) String name,
@@ -100,7 +99,7 @@ public interface QuestionnaireClient {
      * 获取回答记录列表
      */
     @GetMapping("/responses")
-    CommonResponse<ResponseListResponse> getResponseList(
+    CommonResponse<PageResponse<ResponseDetailResponse>> getResponseList(
             @RequestParam(defaultValue = "1") Integer page,
             @RequestParam(defaultValue = "10") Integer pageSize,
             @RequestParam(required = false) Long questionnaireId,
diff --git a/src/main/java/com/ycwl/basic/integration/questionnaire/dto/answer/ResponseListResponse.java b/src/main/java/com/ycwl/basic/integration/questionnaire/dto/answer/ResponseListResponse.java
deleted file mode 100644
index 395e7995..00000000
--- a/src/main/java/com/ycwl/basic/integration/questionnaire/dto/answer/ResponseListResponse.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.ycwl.basic.integration.questionnaire.dto.answer;
-
-import com.ycwl.basic.integration.common.response.PageResponse;
-import lombok.Data;
-
-@Data
-public class ResponseListResponse extends PageResponse<ResponseDetailResponse> {
-    
-    public ResponseListResponse() {
-        super();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/ycwl/basic/integration/questionnaire/dto/questionnaire/QuestionnaireListResponse.java b/src/main/java/com/ycwl/basic/integration/questionnaire/dto/questionnaire/QuestionnaireListResponse.java
deleted file mode 100644
index e383583a..00000000
--- a/src/main/java/com/ycwl/basic/integration/questionnaire/dto/questionnaire/QuestionnaireListResponse.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.ycwl.basic.integration.questionnaire.dto.questionnaire;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ycwl.basic.integration.common.response.PageResponse;
-import lombok.Data;
-
-@Data
-public class QuestionnaireListResponse extends PageResponse<QuestionnaireResponse> {
-    
-    public QuestionnaireListResponse() {
-        super();
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/ycwl/basic/integration/questionnaire/example/QuestionnaireIntegrationExample.java b/src/main/java/com/ycwl/basic/integration/questionnaire/example/QuestionnaireIntegrationExample.java
index 0f1d4d33..69253681 100644
--- a/src/main/java/com/ycwl/basic/integration/questionnaire/example/QuestionnaireIntegrationExample.java
+++ b/src/main/java/com/ycwl/basic/integration/questionnaire/example/QuestionnaireIntegrationExample.java
@@ -1,5 +1,6 @@
 package com.ycwl.basic.integration.questionnaire.example;
 
+import com.ycwl.basic.integration.common.response.PageResponse;
 import com.ycwl.basic.integration.common.service.IntegrationFallbackService;
 import com.ycwl.basic.integration.questionnaire.dto.answer.AnswerRequest;
 import com.ycwl.basic.integration.questionnaire.dto.answer.ResponseDetailResponse;
@@ -7,7 +8,6 @@ import com.ycwl.basic.integration.questionnaire.dto.answer.SubmitAnswerRequest;
 import com.ycwl.basic.integration.questionnaire.dto.question.CreateQuestionOptionRequest;
 import com.ycwl.basic.integration.questionnaire.dto.question.CreateQuestionRequest;
 import com.ycwl.basic.integration.questionnaire.dto.questionnaire.CreateQuestionnaireRequest;
-import com.ycwl.basic.integration.questionnaire.dto.questionnaire.QuestionnaireListResponse;
 import com.ycwl.basic.integration.questionnaire.dto.questionnaire.QuestionnaireResponse;
 import com.ycwl.basic.integration.questionnaire.dto.statistics.QuestionnaireStatistics;
 import com.ycwl.basic.integration.questionnaire.service.QuestionnaireIntegrationService;
@@ -126,7 +126,7 @@ public class QuestionnaireIntegrationExample {
 
         try {
             // 获取问卷列表（支持 fallback）
-            QuestionnaireListResponse listResponse = questionnaireService.getQuestionnaireList(1, 10, null, null, null);
+            PageResponse<QuestionnaireResponse> listResponse = questionnaireService.getQuestionnaireList(1, 10, null, null, null);
             log.info("✅ 问卷列表查询成功，总数: {}, 当前页数据: {}", 
                     listResponse.getTotal(), listResponse.getList().size());
 
diff --git a/src/main/java/com/ycwl/basic/integration/questionnaire/service/QuestionnaireIntegrationService.java b/src/main/java/com/ycwl/basic/integration/questionnaire/service/QuestionnaireIntegrationService.java
index a858afe0..1d2c45d1 100644
--- a/src/main/java/com/ycwl/basic/integration/questionnaire/service/QuestionnaireIntegrationService.java
+++ b/src/main/java/com/ycwl/basic/integration/questionnaire/service/QuestionnaireIntegrationService.java
@@ -2,13 +2,12 @@ package com.ycwl.basic.integration.questionnaire.service;
 
 import com.ycwl.basic.integration.common.exception.IntegrationException;
 import com.ycwl.basic.integration.common.response.CommonResponse;
+import com.ycwl.basic.integration.common.response.PageResponse;
 import com.ycwl.basic.integration.common.service.IntegrationFallbackService;
 import com.ycwl.basic.integration.questionnaire.client.QuestionnaireClient;
 import com.ycwl.basic.integration.questionnaire.dto.answer.ResponseDetailResponse;
-import com.ycwl.basic.integration.questionnaire.dto.answer.ResponseListResponse;
 import com.ycwl.basic.integration.questionnaire.dto.answer.SubmitAnswerRequest;
 import com.ycwl.basic.integration.questionnaire.dto.questionnaire.CreateQuestionnaireRequest;
-import com.ycwl.basic.integration.questionnaire.dto.questionnaire.QuestionnaireListResponse;
 import com.ycwl.basic.integration.questionnaire.dto.questionnaire.QuestionnaireResponse;
 import com.ycwl.basic.integration.questionnaire.dto.statistics.QuestionnaireStatistics;
 import lombok.RequiredArgsConstructor;
@@ -40,20 +39,13 @@ public class QuestionnaireIntegrationService {
         );
     }
 
-    public QuestionnaireListResponse getQuestionnaireList(Integer page, Integer pageSize, 
-                                                         String name, Integer status, String createdBy) {
+    public PageResponse<QuestionnaireResponse> getQuestionnaireList(Integer page, Integer pageSize,
+                                                                    String name, Integer status, String createdBy) {
         log.info("获取问卷列表, page: {}, pageSize: {}, name: {}, status: {}, createdBy: {}", 
                  page, pageSize, name, status, createdBy);
-        return fallbackService.executeWithFallback(
-            SERVICE_NAME,
-            "questionnaire:list:" + page + ":" + pageSize + ":" + name + ":" + status + ":" + createdBy,
-            () -> {
-                CommonResponse<QuestionnaireListResponse> response = 
-                    questionnaireClient.getQuestionnaireList(page, pageSize, name, status, createdBy);
-                return handleResponse(response, "获取问卷列表失败");
-            },
-            QuestionnaireListResponse.class
-        );
+        CommonResponse<PageResponse<QuestionnaireResponse>> response =
+                        questionnaireClient.getQuestionnaireList(page, pageSize, name, status, createdBy);
+        return handleResponse(response, "获取问卷列表失败");
     }
 
     public QuestionnaireStatistics getStatistics(Long id) {
@@ -69,20 +61,13 @@ public class QuestionnaireIntegrationService {
         );
     }
 
-    public ResponseListResponse getResponseList(Integer page, Integer pageSize, Long questionnaireId,
+    public PageResponse<ResponseDetailResponse> getResponseList(Integer page, Integer pageSize, Long questionnaireId,
                                               String userId, String startTime, String endTime) {
         log.info("获取回答记录列表, page: {}, pageSize: {}, questionnaireId: {}, userId: {}", 
                  page, pageSize, questionnaireId, userId);
-        return fallbackService.executeWithFallback(
-            SERVICE_NAME,
-            "responses:list:" + page + ":" + pageSize + ":" + questionnaireId + ":" + userId,
-            () -> {
-                CommonResponse<ResponseListResponse> response = 
-                    questionnaireClient.getResponseList(page, pageSize, questionnaireId, userId, startTime, endTime);
-                return handleResponse(response, "获取回答记录列表失败");
-            },
-            ResponseListResponse.class
-        );
+        CommonResponse<PageResponse<ResponseDetailResponse>> response =
+                questionnaireClient.getResponseList(page, pageSize, questionnaireId, userId, startTime, endTime);
+        return handleResponse(response, "获取回答记录列表失败");
     }
 
     public ResponseDetailResponse getResponseDetail(Long id) {