Merge remote-tracking branch 'origin/master'

admin

2019-07-18 2a671d23fa0e5c979a8b6459b4914481cd10c353

 fanli/src/main/java/com/yeshi/fanli/util/pinduoduo/PinDuoDuoUtil.java

@@ -1,6 +1,5 @@
package com.yeshi.fanli.util.pinduoduo;



import java.io.IOException;

import java.io.UnsupportedEncodingException;

import java.net.URLEncoder;

import java.util.ArrayList;