Merge remote-tracking branch 'origin/master'

zengh

2021-03-18 d5a8a64768db15ff6917e150358a954582e384fd

 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());
   }

}