From d80ca95c3c0cf4b1a14f335feb13cdf30820839c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 28 Jan 2021 14:31:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/district/controller/DistrictController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/district/controller/DistrictController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/district/controller/DistrictController.java
index 8db632c..224989b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/district/controller/DistrictController.java
+++ b/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());
 	}
+
 }

--
Gitblit v1.9.3