merge(feat/person-birth-death-years): resolve conflicts with main, bump migration to V6

Resolves merge conflicts with main (feat/person-notes merged first).
Combines both features: birth/death years and notes field on person detail.
Renames migration V5__add_birth_death_years to V6 to avoid Flyway conflict.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

backend/src/main/java/org/raddatz/familienarchiv/controller/PersonController.java

@@ -59,7 +59,7 @@ public class PersonController {
                 ? Integer.parseInt(body.get("birthYear")) : null;
         Integer deathYear = body.get("deathYear") != null && !body.get("deathYear").isBlank()
                 ? Integer.parseInt(body.get("deathYear")) : null;
-        return ResponseEntity.ok(personService.updatePerson(id, firstName.trim(), lastName.trim(), body.get("alias"), birthYear, deathYear));
+        return ResponseEntity.ok(personService.updatePerson(id, firstName.trim(), lastName.trim(), body.get("alias"), body.get("notes"), birthYear, deathYear));
     }
 
     @PostMapping("/{id}/merge")

backend/src/main/java/org/raddatz/familienarchiv/model/Person.java

@@ -29,6 +29,10 @@ public class Person {
     // Optional: Aliasse für die Suche (z.B. "Opa Hans")
     private String alias;
 
+    // Optional: Free-text biographical notes
+    @Column(columnDefinition = "TEXT")
+    private String notes;
+
     private Integer birthYear;
     private Integer deathYear;
 }

backend/src/main/java/org/raddatz/familienarchiv/service/PersonService.java

@@ -58,7 +58,7 @@ public class PersonService {
     }
 
     @Transactional
-    public Person updatePerson(UUID id, String firstName, String lastName, String alias, Integer birthYear, Integer deathYear) {
+    public Person updatePerson(UUID id, String firstName, String lastName, String alias, String notes, Integer birthYear, Integer deathYear) {
         if (birthYear != null && deathYear != null && birthYear > deathYear) {
             throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Geburtsjahr darf nicht nach dem Todesjahr liegen");
         }
@@ -67,6 +67,7 @@ public class PersonService {
         person.setFirstName(firstName);
         person.setLastName(lastName);
         person.setAlias(alias == null || alias.isBlank() ? null : alias.trim());
+        person.setNotes(notes == null || notes.isBlank() ? null : notes.trim());
         person.setBirthYear(birthYear);
         person.setDeathYear(deathYear);
         return personRepository.save(person);

backend/src/main/resources/db/migration/V5__add_notes_to_persons.sql

@@ -0,0 +1 @@
+ALTER TABLE persons ADD COLUMN notes TEXT;