From 058a4d1cdddcf2bf3a9f693a37f43ae499d02b82 Mon Sep 17 00:00:00 2001 From: wuzhen <52326163@qq.com> Date: Mon, 10 Nov 2025 15:39:33 +0800 Subject: [PATCH] chore(merge): resolve conflict in InternshipInfoChangeBO.java by preserving local base and adding contact/agreement fields --- .../domain/bo/InternshipInfoChangeBO.java | 26 ++ .../msgmanage/components/ChangeDialog.vue | 372 ++++++++++++++++++ 2 files changed, 398 insertions(+) create mode 100644 web/src/views/zsjy/internship/msgmanage/components/ChangeDialog.vue diff --git a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/domain/bo/InternshipInfoChangeBO.java b/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/domain/bo/InternshipInfoChangeBO.java index 7a49241b..f9c1b84c 100644 --- a/backend/ruoyi-modules/ruoyi-zsjy/src/main/java/org/dromara/zsjy/domain/bo/InternshipInfoChangeBO.java +++ b/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; } diff --git a/web/src/views/zsjy/internship/msgmanage/components/ChangeDialog.vue b/web/src/views/zsjy/internship/msgmanage/components/ChangeDialog.vue new file mode 100644 index 00000000..c4cf4007 --- /dev/null +++ b/web/src/views/zsjy/internship/msgmanage/components/ChangeDialog.vue @@ -0,0 +1,372 @@ + + + + + +