Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

yanghui

2022-12-08 a9359a28a02e3d63487a3184587da10fbaedc904

 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;