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

yuan

6 天以前 a452e01cf489b546ebe65e08fcb1213b30e60cfa

 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;
}