Merge remote-tracking branch 'origin/master'

Administrator

2021-03-12 a5b6b004f1737bf06aaaeb8d06e40b9702de25e5

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

}