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

admin

2019-12-03 8d38972b593b5ba698b0e605039ed8c795eaaef5

 fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/FloatADAdminController.java

@@ -16,7 +16,7 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.entity.bus.homemodule.FloatAD;

import com.yeshi.fanli.exception.FloatADException;

import com.yeshi.fanli.exception.homemodule.FloatADException;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

import com.yeshi.fanli.service.inter.homemodule.FloatADService;

import com.yeshi.fanli.tag.PageEntity;