Cookies_Github_mirror/AquaDX
4
0
Fork 1
mirror of https://github.com/MewoLab/AquaDX.git synced 2026-02-07 06:43:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

[F] Fix merge conflicts

Browse Source
This commit is contained in:
Azalea
2024-03-22 15:06:31 -04:00
parent 2a7ce54c28
commit e91029f66e
8 changed files with 15 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetGameMapAreaConditionHandler.java
View File

@@ -1,7 +1,7 @@
package icu.samnyan.aqua.sega.chusan.handler.impl;
package icu.samnyan.aqua.sega.chusan.handler;
import com.fasterxml.jackson.core.JsonProcessingException;
import icu.samnyan.aqua.sega.chusan.handler.BaseHandler;
import icu.samnyan.aqua.sega.general.BaseHandler;
import icu.samnyan.aqua.sega.util.jackson.StringMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserCMissionHandler.java
View File

@@ -1,12 +1,12 @@
package icu.samnyan.aqua.sega.chusan.handler.impl;
package icu.samnyan.aqua.sega.chusan.handler;
import com.fasterxml.jackson.core.JsonProcessingException;
import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCMissionProgressRepository;
import icu.samnyan.aqua.sega.chusan.dao.userdata.UserCMissionRepository;
import icu.samnyan.aqua.sega.chusan.handler.BaseHandler;
import icu.samnyan.aqua.sega.chusan.model.response.data.UserCMissionProgressResp;
import icu.samnyan.aqua.sega.chusan.model.response.data.UserCMissionResp;
import icu.samnyan.aqua.sega.chusan.model.userdata.UserCMission;
import icu.samnyan.aqua.sega.general.BaseHandler;
import icu.samnyan.aqua.sega.util.jackson.StringMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

4
src/main/java/icu/samnyan/aqua/sega/chusan/handler/GetUserNetBattleRankingInfoHandler.java
View File

@@ -1,7 +1,7 @@
package icu.samnyan.aqua.sega.chusan.handler.impl;
package icu.samnyan.aqua.sega.chusan.handler;
import com.fasterxml.jackson.core.JsonProcessingException;
import icu.samnyan.aqua.sega.chusan.handler.BaseHandler;
import icu.samnyan.aqua.sega.general.BaseHandler;
import icu.samnyan.aqua.sega.util.jackson.StringMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMission.java
View File

@@ -1,7 +1,7 @@
package icu.samnyan.aqua.sega.chusan.model.userdata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import javax.persistence.*;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

3
src/main/java/icu/samnyan/aqua/sega/chusan/model/userdata/UserCMissionProgress.java
View File

@@ -1,12 +1,11 @@
package icu.samnyan.aqua.sega.chusan.model.userdata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.*;
@Entity(name = "ChusanUserCMissionProgress")
@Table(name = "chusan_user_cmission_progress", uniqueConstraints = {@UniqueConstraint(columnNames = {"user_id", "mission_id", "order"})})
@Data