From 3f5d52e4e78b7a6b9f8425287236c6f5ea0fb81e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 23 Mar 2021 13:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/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