src/main/java/com/campus/water/entity/Area.java

@@ -27,7 +27,7 @@ public class Area {
     @Column(name = "area_type", length = 50)
     private AreaType areaType;
 
-    @Column(name = "parent_area_id", length = 20)
+    @Column(name = "parent_area_id", length = 36)
     private String parentAreaId;
 
     @Column(length = 200)

src/main/java/com/campus/water/entity/Device.java

@@ -41,7 +41,7 @@ public class Device {
     private LocalDateTime createTime = LocalDateTime.now();
 
     // 新增：关联的制水机ID（仅供水机有值）
-    @Column(name = "parent_maker_id", length = 36)
+    @Column(name = "parent_maker_id", length = 20)
     private String parentMakerId;
 
     // 保留原有的remark方法（若表中有该字段可直接映射，无则忽略）