chore(merge): resolve conflict in InternshipInfoChangeBO.java by preserving local base and adding contact/agreement fields

backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/domain/bo/InternshipInfoChangeBO.java

@@ -152,5 +152,31 @@ public class InternshipInfoChangeBO implements Serializable {
     @Schema(description = "实习结束时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date endDate;
+
+    /**
+     * 联系人姓名
+     */
+    @Schema(description = "联系人姓名")
+    private String contactPersonName;
+
+    /**
+     * 联系人电话
+     */
+    @Schema(description = "联系人电话")
+    @Pattern(regexp = "^1[3-9]\\d{9}$", message = "联系人电话格式不正确")
+    private String contactPersonPhone;
+
+    /**
+     * 实习协议状态：1-已签署，2-未签署
+     */
+    @Schema(description = "实习协议状态：1-已签署，2-未签署")
+    @Pattern(regexp = "^[1-2]$", message = "实习协议状态只能是1-已签署，2-未签署")
+    private String agreementStatus;
+
+    /**
+     * 备注信息
+     */
+    @Schema(description = "备注信息")
+    private String remark;
 }