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

maven

4 天以前 2a9c3934bb093c978a54a1c3e220e6a120855e77

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