Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-15 829392f5e6ff4492fb40769d2ea09552a07aa2ad

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

@@ -1,8 +1,8 @@
package com.dg.core.db.manual.mapper.util;

import com.dg.core.util.StringUtils;
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;