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

maven

2 天以前 9f99167aba3720cb731298511f8423b18c08e5a2

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

@@ -69,6 +69,11 @@
    private Long sysDeptId;

    /**
     * 角色
     */
    private Long roleId;

    /**
     * 家庭住址
     */
    @Excel(name = "家庭住址", sort = 6)