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

云

2026-04-17 ac11e0a1320b469a2a111ba3d6a4a54f424845b7

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

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



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