Merge remote-tracking branch 'origin/dev_tide_sbjkxt' into dev_tide_sbjkxt_...

zouyu

4 天以前 8f98ff2e202e5d7a39be484753db63d0165d70d7

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