Merge branch 'k-oshita' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-oshita

# Conflicts:
#	src/main/resources/templates/transaction_detail.html

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

@@ -57,7 +57,7 @@ public class GoalModel {
 				goalModel.getTargetAmount(),
 				goalModel.getDeadline(),
 				0,
-				userEntity, 0);
+				userEntity);
 	}
 	
 	public static GoalModel convertFrom(GoalForm goalForm) {

src/main/java/com/example/demo/app/infra/entity/GoalEntity.java

@@ -47,6 +47,4 @@ public class GoalEntity {
 	@JoinColumn(name = "user_id")
 	private UserEntity userEntity;
 	
-	private Integer deleteFlag;
-
 }

src/main/java/com/example/demo/app/presentation/controller/ProfileController.java

@@ -57,8 +57,7 @@ public class ProfileController {
 	                    profileModel.getBirthDate(),
 	                    profileModel.getSaving(),
 	                    profileModel.getAnnualIncome(),
-	                    profileModel.getMonthlyBudget(),
-	                    profileModel.getBirthDate());
+	                    profileModel.getMonthlyBudget());
 
 	    model.addAttribute(PageReturnAttributeKeyword.PROFILE_EDIT_FORM, profileEditForm);
 	    return TransitionTargetPageNameKeyword.PROFILE_EDIT_HTML;

src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java

@@ -16,5 +16,4 @@ public class ProfileEditForm {
 	private Integer saving;
 	private Integer annualIncome;
 	private Integer monthlyBudget;
-	private LocalDate birthDate;
 }