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

gongchunyi

7 天以前 1414834d6aef22639f98299c489eca1d24cf9d59

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