Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

2026-05-22 0e0ef19a7bd74b2fde0089c28ad3d61d0bc2d911

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

@@ -116,4 +116,7 @@
     */
    @TableField(value = "tenant_id",fill = FieldFill.INSERT)
    private Long tenantId;

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