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

liding

4 天以前 1d915922d8197aa5d5dc3e40e3088d983dd6e141

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

@@ -66,7 +66,7 @@
     /**
     * 部门
     */
    private Integer sysDeptId;
    private Long sysDeptId;

    /**
     * 家庭住址