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

maven

8 天以前 9e5c392acb19838c263a569b09bb56da94bdbbf6

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