Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-20 f649287ccf7af57f1966982c0b8a1967cec01e34

 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;