diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/FeedbackController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/FeedbackController.java
index d68f0c0..8a0d1a4 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/FeedbackController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/FeedbackController.java
@@ -78,8 +78,8 @@ public class FeedbackController {
     @Operation(summary = "获得用户反馈分页")
     @PreAuthorize("@ss.hasPermission('member:feedback:query')")
     public CommonResult<PageResult<FeedbackRespVO>> getFeedbackPage(@Valid FeedbackPageReqVO pageReqVO) {
-        PageResult<FeedbackDO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, FeedbackRespVO.class));
+        PageResult<FeedbackRespVO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
+        return success(pageResult);
     }
 
     @GetMapping("/export-excel")
@@ -88,9 +88,9 @@ public class FeedbackController {
     @ApiAccessLog(operateType = EXPORT)
     public void exportFeedbackExcel(@Valid FeedbackPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
-        List<FeedbackDO> list = feedbackService.getFeedbackPage(pageReqVO).getList();
+        List<FeedbackRespVO> list = feedbackService.getFeedbackPage(pageReqVO).getList();
         // 导出 Excel
-        ExcelUtils.write(response, "用户反馈.xls", "数据", FeedbackRespVO.class, BeanUtils.toBean(list, FeedbackRespVO.class));
+        ExcelUtils.write(response, "用户反馈.xls", "数据", FeedbackRespVO.class, list);
     }
 
 }
\ No newline at end of file
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/vo/FeedbackPageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/vo/FeedbackPageReqVO.java
index 246bfc7..069316d 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/vo/FeedbackPageReqVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/vo/FeedbackPageReqVO.java
@@ -1,10 +1,13 @@
 package cn.iocoder.yudao.module.member.controller.admin.feedback.vo;
 
 import lombok.*;
+
 import java.util.*;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -18,6 +21,9 @@ public class FeedbackPageReqVO extends PageParam {
     @Schema(description = "用户编号", example = "15139")
     private Long memberId;
 
+    @Schema(description = "用户名称")
+    private String memberName;
+
     @Schema(description = "反馈内容")
     private String content;
 
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/vo/FeedbackRespVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/vo/FeedbackRespVO.java
index 4a58084..5c3a5ef 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/vo/FeedbackRespVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/feedback/vo/FeedbackRespVO.java
@@ -20,6 +20,10 @@ public class FeedbackRespVO {
     @ExcelProperty("用户编号")
     private Long memberId;
 
+    @Schema(description = "用户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
+    @ExcelProperty("用户名称")
+    private String memberName;
+
     @Schema(description = "反馈内容")
     @ExcelProperty("反馈内容")
     private String content;
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/feedback/AppFeedbackController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/feedback/AppFeedbackController.java
index 39f72d5..c42c5bf 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/feedback/AppFeedbackController.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/feedback/AppFeedbackController.java
@@ -48,8 +48,8 @@ public class AppFeedbackController {
     @Operation(summary = "获得用户反馈分页")
     public CommonResult<PageResult<FeedbackRespVO>> getFeedbackPage(@Valid FeedbackPageReqVO pageReqVO) {
         pageReqVO.setMemberId(getLoginUserId());
-        PageResult<FeedbackDO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, FeedbackRespVO.class));
+        PageResult<FeedbackRespVO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
+        return success(pageResult);
     }
 
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/feedback/FeedbackMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/feedback/FeedbackMapper.java
index 96668b6..07e0df4 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/feedback/FeedbackMapper.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/feedback/FeedbackMapper.java
@@ -2,10 +2,13 @@ package cn.iocoder.yudao.module.member.dal.mysql.feedback;
 
 import java.util.*;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
 import cn.iocoder.yudao.module.member.dal.dataobject.feedback.FeedbackDO;
+import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.member.controller.admin.feedback.vo.*;
 
@@ -15,11 +18,14 @@ import cn.iocoder.yudao.module.member.controller.admin.feedback.vo.*;
 @Mapper
 public interface FeedbackMapper extends BaseMapperX<FeedbackDO> {
 
-    default PageResult<FeedbackDO> selectPage(FeedbackPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<FeedbackDO>()
-                .eqIfPresent(FeedbackDO::getMemberId, reqVO.getMemberId())
-                .likeIfPresent(FeedbackDO::getContent, reqVO.getContent())
-                .betweenIfPresent(FeedbackDO::getCreateTime, reqVO.getCreateTime())
+    default PageResult<FeedbackRespVO> selectPage(FeedbackPageReqVO reqVO) {
+        return selectJoinPage(reqVO, FeedbackRespVO.class, new MPJLambdaWrapperX<FeedbackDO>()
+                .selectAll(FeedbackDO.class)
+                .selectAs(MemberUserDO::getNickname, FeedbackPageReqVO::getMemberName)
+                .leftJoin(MemberUserDO.class, MemberUserDO::getId, FeedbackDO::getMemberId)
+                .eqIfExists(FeedbackDO::getMemberId, reqVO.getMemberId())
+                .likeIfExists(FeedbackDO::getContent, reqVO.getContent())
+                .between(ObjectUtil.isNotEmpty(reqVO.getCreateTime()), FeedbackDO::getCreateTime, reqVO.getCreateTime()[0], reqVO.getCreateTime()[1])
                 .orderByDesc(FeedbackDO::getId));
     }
 
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/feedback/FeedbackService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/feedback/FeedbackService.java
index f61d5ba..50b185c 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/feedback/FeedbackService.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/feedback/FeedbackService.java
@@ -48,6 +48,6 @@ public interface FeedbackService {
      * @param pageReqVO 分页查询
      * @return 用户反馈分页
      */
-    PageResult<FeedbackDO> getFeedbackPage(FeedbackPageReqVO pageReqVO);
+    PageResult<FeedbackRespVO> getFeedbackPage(FeedbackPageReqVO pageReqVO);
 
 }
\ No newline at end of file
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/feedback/FeedbackServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/feedback/FeedbackServiceImpl.java
index 2099c95..1150e73 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/feedback/FeedbackServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/feedback/FeedbackServiceImpl.java
@@ -64,7 +64,7 @@ public class FeedbackServiceImpl implements FeedbackService {
     }
 
     @Override
-    public PageResult<FeedbackDO> getFeedbackPage(FeedbackPageReqVO pageReqVO) {
+    public PageResult<FeedbackRespVO> getFeedbackPage(FeedbackPageReqVO pageReqVO) {
         return feedbackMapper.selectPage(pageReqVO);
     }
 
diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml
index e0b8bfa..d646c0f 100644
--- a/yudao-server/src/main/resources/application-prod.yaml
+++ b/yudao-server/src/main/resources/application-prod.yaml
@@ -58,7 +58,7 @@ spring:
     host: 127.0.0.1 # 地址
     port: 6379 # 端口
     database: 7 # 数据库索引
-    password: 8mbsc1fRj # 密码，建议生产环境开启
+    password: 179965 # 密码，建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################
 
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index 325c183..70ecf1f 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -3,8 +3,8 @@ spring:
     name: yudao-server
 
   profiles:
-    #    active: prod
-    active: local
+    active: prod
+  #    active: local
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。