Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_山西长治

yuan

2026-07-13 bb078cde6d9641ec84ee3c52b544153845795c0e

 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;
}