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

gongchunyi

8 天以前 a10faaa8d2a80f0302c35a5d73dcb7b3fb069133

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

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

    /**
     * 家庭住址