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

yaowanxin

4 天以前 93ccb6e153b5523a46738bbf6713cd4df25a49e4

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