Merge branch 'mj' into dev

netflix-dao/src/main/java/com/cyksj/model/views/MidjourneyUserView.java

@@ -19,7 +19,7 @@ public class MidjourneyUserView {
     private Long id;
 
     @DbField("mu.relation_id")
-    private String relationId;
+    private Long relationId;
 
     @DbField("gr.user_id")
     private Long userId;