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

maven

9 天以前 b00f8a0bdccf0b0eed36f550e2c00176bfafe23f

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