From dc73adfa9d92d11d1a8512778deacc34fa877eef Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 十二月 2018 14:41:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
index c07828c..584aeed 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/config/SystemClientParamsAdminController.java
@@ -2,23 +2,23 @@
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
+import net.sf.json.JSONObject;
+
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.admin.SystemClientParamsAdmin;
-import com.yeshi.fanli.entity.bus.help.AppPageNotification;
-import com.yeshi.fanli.entity.bus.help.AppPageNotification.AppPageNotificationTypeEnum;
import com.yeshi.fanli.entity.system.CustomerContent;
import com.yeshi.fanli.entity.system.CustomerName;
import com.yeshi.fanli.entity.system.System;
@@ -30,10 +30,6 @@
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.Utils;
-
-import org.yeshi.utils.JsonUtil;
-
-import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/clientParams")
--
Gitblit v1.8.0