修改了冲突和错误

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/apache/WxMpServiceImpl.java

@@ -1,6 +1,5 @@
 package me.chanjar.weixin.mp.api.impl.apache;
 
-
 import java.io.IOException;
 import java.util.concurrent.locks.Lock;
 
@@ -72,13 +71,11 @@ public class WxMpServiceImpl extends AbstractWxMpService<CloseableHttpClient,Htt
           + this.getWxMpConfigStorage().getSecret();
         try {
           HttpGet httpGet = new HttpGet(url);
-
           if (this.getRequestHttpProxy() != null) {
             RequestConfig config = RequestConfig.custom().setProxy(this.getRequestHttpProxy()).build();
             httpGet.setConfig(config);
           }
           try (CloseableHttpResponse response = getRequestHttpClient().execute(httpGet)) {
-
             String resultContent = new BasicResponseHandler().handleResponse(response);
             WxError error = WxError.fromJson(resultContent);
             if (error.getErrorCode() != 0) {
@@ -99,5 +96,4 @@ public class WxMpServiceImpl extends AbstractWxMpService<CloseableHttpClient,Htt
     }
     return this.getWxMpConfigStorage().getAccessToken();
   }
-
 }