Merge remote-tracking branch 'origin/div' into div

admin

2019-09-03 81f4d5a0074dcc0da71ef453e4e02a4d1d7decf5

 fanli/src/main/java/com/yeshi/fanli/job/IntegralTaskJob.java

@@ -10,8 +10,8 @@


import com.yeshi.fanli.entity.integral.IntegralTaskClass;

import com.yeshi.fanli.entity.integral.IntegralTaskClass.UniqueKeyEnum;

import com.yeshi.fanli.exception.push.PushException;

import com.yeshi.fanli.entity.integral.IntegralTaskRecord;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.service.inter.integral.IntegralTaskClassService;

import com.yeshi.fanli.service.inter.integral.IntegralTaskRecordService;

import com.yeshi.fanli.service.inter.push.PushService;