Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/system/controller/DeptController.java

@@ -175,8 +175,8 @@
    */
   @GetMapping("/security_lazy-tree")
   @ApiOperation(value = "懒加载树形结构", notes = "树形结构")
   public R<List<DeptVO>> securityLazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
      List<DeptVO> tree = deptService.securityLazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
   public R<List<DeptVO>> securityLazyTree(String jurisdiction, Long parentId) {
      List<DeptVO> tree = deptService.securityLazyTree(jurisdiction, parentId);
      return R.data(tree);
   }