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

lidongdong

2022-10-18 7f6fddcdfd61f3b0c9143d6d7ddd607511f22734

 flower_city/src/main/java/com/dg/core/db/manual/mapper/util/HttpClientUtils.java

@@ -2,6 +2,7 @@

import io.netty.channel.ConnectTimeoutException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.Consts;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;