Merge remote-tracking branch 'origin/master'

zengh

2021-04-06 d7dd6cbbad5213476bd1e98d65fee6056ad4c2fc

 blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -142,6 +142,18 @@
   }

   /**
    * 懒加载获取部门树形结构
    */
   @GetMapping("/lazy-trees")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "懒加载树形结构", notes = "树形结构")
   public R<List<DeptVO>> lazyTrees(String tenantId, Long parentId, BladeUser bladeUser) {
      List<DeptVO> tree = deptService.lazyTrees(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
      return R.data(tree);
   }


   /**
    * 新增或修改
    */
   @PostMapping("/submit")