Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/jurisdiction/controller/JurisdictionController.java

@@ -104,8 +104,8 @@
   @GetMapping("/tree")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "树形结构", notes = "树形结构")
   public R<List<JurisdictionVO>> tree(String tenantId, BladeUser bladeUser) {
      List<JurisdictionVO> tree = jurisdictionService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()));
   public R<List<JurisdictionVO>> tree(String tenantId) {
      List<JurisdictionVO> tree = jurisdictionService.tree(tenantId);
      return R.data(tree);
   }