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

云

5 天以前 b701cf0331e91900bf8055009a745d4953a6c510

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