Merge remote-tracking branch 'origin/master' into hckx

maven

2 天以前 3fd5bd656683c482141b13cfdb953d17ba377f1f

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