Merge branch 'dev1'

Administrator

2018-12-12 4e6b74661dd3e622e5d4ef5e244efd306408c983

 fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java

@@ -17,12 +17,12 @@
import org.springframework.stereotype.Component;

import org.springframework.web.context.request.RequestContextHolder;

import org.springframework.web.context.request.ServletRequestAttributes;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import org.yeshi.utils.JsonUtil;



import net.sf.json.JSONObject;