From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemConfigAdminController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/SystemConfigAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemConfigAdminController.java
similarity index 98%
rename from fanli/src/main/java/com/yeshi/fanli/controller/admin/SystemConfigAdminController.java
rename to fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemConfigAdminController.java
index 83ded19..7b19c58 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/SystemConfigAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemConfigAdminController.java
@@ -1,4 +1,4 @@
-package com.yeshi.fanli.controller.admin;
+package com.yeshi.fanli.controller.admin.config;
 
 import java.io.PrintWriter;
 import java.util.HashMap;

--
Gitblit v1.8.0