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

zss

2 天以前 40946ba6c24a0318f14cbed603f0ed9cad1da853

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