[M] Combine other pojos

src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/AvatarEquip.java

@@ -1,23 +0,0 @@
-package icu.samnyan.aqua.sega.chusan.model.response.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class AvatarEquip {
-
-    private int wearID;
-    private int headID;
-    private int faceID;
-    private int skinID;
-    private int itemID;
-    private int frontID;
-    private int backID;
-    
-}

src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/GenreGraph.java

@@ -1,18 +0,0 @@
-package icu.samnyan.aqua.sega.chusan.model.response.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GenreGraph {
-
-    private int genreId;
-    private int musicCount;
-    
-}

src/main/java/icu/samnyan/aqua/sega/chusan/model/response/data/MatchingWaitState.kt

@@ -1,9 +1,10 @@
 package icu.samnyan.aqua.sega.chusan.model.response.data
 
 import com.fasterxml.jackson.annotation.JsonProperty
+import icu.samnyan.aqua.sega.chusan.model.userdata.Chu3MatchingMemberReq
 
 class MatchingWaitState(
-    var matchingMemberInfoList: List<MatchingMemberInfo> = listOf(),
+    var matchingMemberInfoList: List<Chu3MatchingMemberReq> = listOf(),
 
     @JsonProperty("isFinish")
     var isFinish: Boolean = false,

src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/Chu3MatchingMember.kt

@@ -2,8 +2,6 @@ package icu.samnyan.aqua.sega.chusan.model.userdata
 
 import com.fasterxml.jackson.annotation.JsonProperty
 import icu.samnyan.aqua.net.games.BaseEntity
-import icu.samnyan.aqua.sega.chusan.model.response.data.AvatarEquip
-import icu.samnyan.aqua.sega.chusan.model.response.data.GenreGraph
 import jakarta.persistence.Entity
 import jakarta.persistence.Table
 
@@ -43,6 +41,21 @@ class Chu3MatchingMember : BaseEntity() {
     var joinTime = 0
 }
 
+class AvatarEquip {
+    var wearID = 0
+    var headID = 0
+    var faceID = 0
+    var skinID = 0
+    var itemID = 0
+    var frontID = 0
+    var backID = 0
+}
+
+class GenreGraph {
+    var genreId = 0
+    var musicCount = 0
+}
+
 class Chu3MatchingMemberReq : Chu3MatchingMember() {
     var avatarEquip: AvatarEquip? = null
     var genreGraphList: List<GenreGraph>? = null