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

admin

2019-12-16 54402107ca335c2896fc9c61864f6054ad5bfabb

 fanli/src/main/java/com/yeshi/fanli/service/inter/dynamic/DynamicInfoService.java

@@ -3,7 +3,6 @@
import java.util.Date;

import java.util.List;



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

import com.yeshi.fanli.entity.bus.activity.RecommendActivity;

import com.yeshi.fanli.entity.dynamic.DynamicInfo;