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

yuan

8 天以前 86b776e14070d7e00471b591a5325104772e7fc4

 src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java

@@ -12,4 +12,6 @@
public class SysUserDeptVo extends SysUserDept {

    private String deptName;

    private String userName;
}