6.24 合并冲突部分修复

src/main/java/com/example/demo/domain/vo/Page.java

@@ -1,5 +1,6 @@
 package com.example.demo.domain.vo;
 
+import com.example.demo.domain.entity.User;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -20,5 +21,6 @@ public class Page {
     private Integer pageSize;
     private GoldDetail goldDetail;
     private Consume consume;
+    private User user;
 
 }