Merge branch 'div1'

yujian

2019-01-08 a79be5c75d4409bd14a36b648c1a398b409cad65

 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")