From 097ab4310a92f9ccd4b500201819eaa8c6aafcda Mon Sep 17 00:00:00 2001
From: guozhigq <guozhigq@outlook.com>
Date: Mon, 11 Sep 2023 17:49:46 +0800
Subject: [PATCH] merge fix

---
 pubspec.lock | 16 ++++++++++++++++
 pubspec.yaml |  1 +
 2 files changed, 17 insertions(+)

diff --git a/pubspec.lock b/pubspec.lock
index 834bb054a..ee904a632 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -337,6 +337,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
+  dio_http2_adapter:
+    dependency: "direct main"
+    description:
+      name: dio_http2_adapter
+      sha256: "3d81128cf389649ae6ac5cce23bcf5f9b254882b7f27185ca3b0d443ee9b825c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.1+1"
   dismissible_page:
     dependency: "direct main"
     description:
@@ -621,6 +629,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  http2:
+    dependency: transitive
+    description:
+      name: http2
+      sha256: "38db0c4aa9f1cd238a5d2e86aa0cc7cc91c77e0c6c94ba64bbe85e4ff732a952"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.0"
   http_client_helper:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 2672cf635..2add035fb 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -45,6 +45,7 @@ dependencies:
   cookie_jar: ^4.0.8
   dio_cookie_manager: ^3.1.0
   connectivity_plus: ^4.0.1
+  dio_http2_adapter: ^2.3.1+1
 
   # 图片
   cached_network_image: ^3.2.3