diff --git a/src/main/java/jty/expressdistributionsystem/controller/UserController.java b/src/main/java/jty/expressdistributionsystem/controller/UserController.java
index 6af7f2b..ea25d23 100644
--- a/src/main/java/jty/expressdistributionsystem/controller/UserController.java
+++ b/src/main/java/jty/expressdistributionsystem/controller/UserController.java
@@ -80,20 +80,11 @@ public class UserController {
 
     // 用户查看别人发给自己的消息
     @GetMapping("/getFromMessage")
-    public Result<Page<Message>> getFromMessage(@RequestParam int page, @RequestParam int pageSize) {
-        if (page <= 0 || pageSize == 0) {
-            return new Result<>(400, "页码和每页大小必须大于0", null);
-        }
-        Long id = GetIdUtil.getId();
-        Page<Message> messagePage = new Page<>(page, pageSize);
+    public Result<List<Message>> getFromMessage(@RequestParam Long id) {
         LambdaQueryWrapper<Message> messageLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        // 添加查询条件
         messageLambdaQueryWrapper.eq(Message::getGetUserId, id);
-        // 排序条件：先按 mark 对应值排序，然后按时间排序
-        messageLambdaQueryWrapper.orderByDesc(Message::getMark) // mark 值大的排前面
-                .orderByDesc(Message::getCreateTime); // 时间新的排前面
-        messageService.page(messagePage, messageLambdaQueryWrapper);
-        return new Result<>(200, "获取成功", messagePage);
+        List<Message> list = messageService.list(messageLambdaQueryWrapper);
+        return new Result<>(200, "", list);
     }
 
     // 用户确认查看消息
@@ -144,7 +135,7 @@ public class UserController {
         return new Result<>(200, "", pageInfo);
     }
 
-    // 用户寄件
+    // 用户寄件(完成)
     @PostMapping("/shipment")
     public Result<String> shipmentExpress(@RequestBody @Validated @NotNull GoodsDTO goodsDTO) {
         // 判断用户是否存在