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

maven

9 天以前 7a4a00136ff933197318de096b0d318b6331484f

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