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

admin

2020-05-26 d343ae58950d1b311c904d9290fbbadfed6c585d

 fanli/src/main/java/com/yeshi/fanli/util/vipshop/VipShopApiUtil.java

@@ -18,7 +18,6 @@
import org.yeshi.utils.StringUtil;



import com.google.gson.Gson;

import com.google.gson.JsonObject;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.dto.vip.VIPSearchFilter;

import com.yeshi.fanli.dto.vip.VIPSearchResult;