Merge remote-tracking branch 'origin/master'

zengh

2021-04-29 958ddfcec71043b6b800feaac521e7b22bb15e97

 blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java

@@ -156,7 +156,7 @@
   }

   @Override
   public List selectInfo() {
   public List<DeptVO> selectInfo() {
      return baseMapper.selectInfo();
   }