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

云

4 天以前 31bb16817c3702b4515a05e010dffa8b490c83b6

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