Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-04-21 2683793796366a4b6361baf4a16e5c65c8dce068

 src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java

@@ -247,4 +247,7 @@
    private List<StaffEmergencyContact> staffEmergencyContactList;



    @TableField(fill = FieldFill.INSERT)
    private Long deptId;
}