Merge remote-tracking branch 'origin/master'

tangzy

2021-03-23 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/district/controller/DistrictController.java

@@ -165,4 +165,5 @@
      response.setHeader("Access-Control-Allow-Credentials","true");
      return R.data(districtService.selectList());
   }

}