Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-22 11c098089f8c4714188e91032e5a19e8fe94bf96

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -55,7 +55,6 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

import com.yeshi.fanli.vo.integral.DailySignVO;

import com.yeshi.fanli.vo.integral.ExchangeTipVO;

import com.yeshi.fanli.vo.integral.IntegralDetailVO;