Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb

liyong

10 天以前 ca0565e53494417b3779759f8d3898e07bfd5929

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