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

admin

2020-04-15 d4588f4e43336b26b356b869c29d0c76390167d5

 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;