Merge remote-tracking branch 'origin/master'

Administrator

2018-11-28 6bb5a38680f204f12a0594c8c7b4ea3901894006

 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;