Merge remote-tracking branch 'origin/master'

zengh

2021-03-20 9d4e322f4d4d8c1b941185c7c95d6df08937aff1

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

}