Merge branch 'refs/heads/dev_New' into dev_New_kthg

liding

7 小时以前 1a3f5db043fd381b60a0a5f40687136274a2cbd1

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

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

    /**
     * 家庭住址