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

maven

4 天以前 d3ee63dc365fbcb964a469150c9a84717f171eda

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