2026_09_5H_Spring_KIZAKI/Monegement
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX]ゴールモデルのバグ修正

Browse Source
This commit is contained in:
[IIJ] Koki Oshita
2026-09-18 11:02:42 +09:00
parent 44ceb0ca07
commit d71194659b
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/example/demo/app/domain/model/GoalModel.java
View File

@@ -2,12 +2,9 @@ package com.example.demo.app.domain.model;
import java.time.LocalDate; import java.time.LocalDate;
<<<<<<< HEAD
import com.example.demo.app.infra.entity.GoalEntity; import com.example.demo.app.infra.entity.GoalEntity;
import com.example.demo.app.presentation.form.GoalForm; import com.example.demo.app.presentation.form.GoalForm;
=======
>>>>>>> f955667682040961a972b0107053018dccd41543
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
@@ -27,7 +24,6 @@ public class GoalModel {
private Integer goalComplete; private Integer goalComplete;
<<<<<<< HEAD
public static GoalModel convertFrom(GoalEntity goalEntity) { public static GoalModel convertFrom(GoalEntity goalEntity) {
return new GoalModel( return new GoalModel(
goalEntity.getGoalId(), goalEntity.getGoalId(),
@@ -59,6 +55,4 @@ public class GoalModel {
goalForm.getGoalComplete()); goalForm.getGoalComplete());
} }
=======
>>>>>>> f955667682040961a972b0107053018dccd41543
} }