From 6bb0a8ae64fbaf7b7f0b8a0cc6bd0ee07f2068e9 Mon Sep 17 00:00:00 2001
From: w-R <953969641@qq.com>
Date: Fri, 1 Apr 2022 11:07:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/generated/intl/messages_en.dart         | 2 +-
 lib/generated/intl/messages_zh_CN.dart      | 2 +-
 lib/generated/intl/messages_zh_Hans_CN.dart | 2 +-
 lib/generated/intl/messages_zh_Hant_CN.dart | 2 +-
 lib/generated/intl/messages_zh_TW.dart      | 2 +-
 lib/generated/l10n.dart                     | 4 ++--
 lib/l10n/intl_en.arb                        | 2 +-
 lib/l10n/intl_zh_CN.arb                     | 2 +-
 lib/l10n/intl_zh_Hans_CN.arb                | 2 +-
 lib/l10n/intl_zh_Hant_CN.arb                | 2 +-
 lib/l10n/intl_zh_TW.arb                     | 2 +-
 lib/retrofit/data/shoppingCart.dart         | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
index bea5e68f..ad53543b 100644
--- a/lib/generated/intl/messages_en.dart
+++ b/lib/generated/intl/messages_en.dart
@@ -337,7 +337,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
     "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
     "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
     "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
     "manlijiandaijinquan" : m17,
     "manyuankeyong" : m18,
diff --git a/lib/generated/intl/messages_zh_CN.dart b/lib/generated/intl/messages_zh_CN.dart
index 79496754..685dd8df 100644
--- a/lib/generated/intl/messages_zh_CN.dart
+++ b/lib/generated/intl/messages_zh_CN.dart
@@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
     "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
     "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
     "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
     "manlijiandaijinquan" : m17,
     "manyuankeyong" : m18,
diff --git a/lib/generated/intl/messages_zh_Hans_CN.dart b/lib/generated/intl/messages_zh_Hans_CN.dart
index 00a9d7b9..66eac123 100644
--- a/lib/generated/intl/messages_zh_Hans_CN.dart
+++ b/lib/generated/intl/messages_zh_Hans_CN.dart
@@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "login_splash" : MessageLookupByLibrary.simpleMessage("欢迎来到一心回乡"),
     "main_menu1" : MessageLookupByLibrary.simpleMessage("净弼"),
     "main_menu2" : MessageLookupByLibrary.simpleMessage("联盟"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("发现"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("有机生活"),
     "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
     "manlijiandaijinquan" : m17,
     "manyuankeyong" : m18,
diff --git a/lib/generated/intl/messages_zh_Hant_CN.dart b/lib/generated/intl/messages_zh_Hant_CN.dart
index 8d008daa..613aded4 100644
--- a/lib/generated/intl/messages_zh_Hant_CN.dart
+++ b/lib/generated/intl/messages_zh_Hant_CN.dart
@@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"),
     "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
     "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("發現"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"),
     "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
     "manlijiandaijinquan" : m17,
     "manyuankeyong" : m18,
diff --git a/lib/generated/intl/messages_zh_TW.dart b/lib/generated/intl/messages_zh_TW.dart
index 9a6a6178..339049cc 100644
--- a/lib/generated/intl/messages_zh_TW.dart
+++ b/lib/generated/intl/messages_zh_TW.dart
@@ -335,7 +335,7 @@ class MessageLookup extends MessageLookupByLibrary {
     "login_splash" : MessageLookupByLibrary.simpleMessage("歡迎來到一心回鄉"),
     "main_menu1" : MessageLookupByLibrary.simpleMessage("淨弼"),
     "main_menu2" : MessageLookupByLibrary.simpleMessage("聯盟"),
-    "main_menu3" : MessageLookupByLibrary.simpleMessage("發現"),
+    "main_menu3" : MessageLookupByLibrary.simpleMessage("有機生活"),
     "main_menu4" : MessageLookupByLibrary.simpleMessage("我的"),
     "manlijiandaijinquan" : m17,
     "manyuankeyong" : m18,
diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart
index b1cebb45..1b39c569 100644
--- a/lib/generated/l10n.dart
+++ b/lib/generated/l10n.dart
@@ -185,10 +185,10 @@ class S {
     );
   }
 
-  /// `发现`
+  /// `有机生活`
   String get main_menu3 {
     return Intl.message(
-      '发现',
+      '有机生活',
       name: 'main_menu3',
       desc: '',
       args: [],
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index c30c507e..2ad8a3de 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -14,7 +14,7 @@
   "privacy_policy3": "《隐私服务》",
   "main_menu1": "净弼",
   "main_menu2": "联盟",
-  "main_menu3": "发现",
+  "main_menu3": "有机生活",
   "main_menu4": "我的",
   "shouye": "首页",
   "huodongliebiao": "活动列表",
diff --git a/lib/l10n/intl_zh_CN.arb b/lib/l10n/intl_zh_CN.arb
index 3c3be7a3..126ba85d 100644
--- a/lib/l10n/intl_zh_CN.arb
+++ b/lib/l10n/intl_zh_CN.arb
@@ -14,7 +14,7 @@
   "privacy_policy3": "《隐私服务》",
   "main_menu1": "净弼",
   "main_menu2": "联盟",
-  "main_menu3": "发现",
+  "main_menu3": "有机生活",
   "main_menu4": "我的",
   "shouye": "首页",
   "huodongliebiao": "活动列表",
diff --git a/lib/l10n/intl_zh_Hans_CN.arb b/lib/l10n/intl_zh_Hans_CN.arb
index 4d487b71..2291d020 100644
--- a/lib/l10n/intl_zh_Hans_CN.arb
+++ b/lib/l10n/intl_zh_Hans_CN.arb
@@ -14,7 +14,7 @@
   "privacy_policy3": "《隐私服务》",
   "main_menu1": "净弼",
   "main_menu2": "联盟",
-  "main_menu3": "发现",
+  "main_menu3": "有机生活",
   "main_menu4": "我的",
   "shouye": "首页",
   "huodongliebiao": "活动列表",
diff --git a/lib/l10n/intl_zh_Hant_CN.arb b/lib/l10n/intl_zh_Hant_CN.arb
index c617d74b..cc76959c 100644
--- a/lib/l10n/intl_zh_Hant_CN.arb
+++ b/lib/l10n/intl_zh_Hant_CN.arb
@@ -14,7 +14,7 @@
   "privacy_policy3": "《隱私服務》",
   "main_menu1": "淨弼",
   "main_menu2": "聯盟",
-  "main_menu3": "發現",
+  "main_menu3": "有機生活",
   "main_menu4": "我的",
   "shouye": "首頁",
   "huodongliebiao": "活動列表",
diff --git a/lib/l10n/intl_zh_TW.arb b/lib/l10n/intl_zh_TW.arb
index bd0f38a7..8adccbad 100644
--- a/lib/l10n/intl_zh_TW.arb
+++ b/lib/l10n/intl_zh_TW.arb
@@ -14,7 +14,7 @@
   "privacy_policy3": "《隱私服務》",
   "main_menu1": "淨弼",
   "main_menu2": "聯盟",
-  "main_menu3": "發現",
+  "main_menu3": "有機生活",
   "main_menu4": "我的",
   "shouye": "首頁",
   "huodongliebiao": "活動列表",
diff --git a/lib/retrofit/data/shoppingCart.dart b/lib/retrofit/data/shoppingCart.dart
index 2126eb88..efac9390 100644
--- a/lib/retrofit/data/shoppingCart.dart
+++ b/lib/retrofit/data/shoppingCart.dart
@@ -336,7 +336,7 @@ class CouponListBean {
   String useStartTime;
   String useEndTime;
   String promotionId;
-  String mid;
+  dynamic mid;
   String couponId;
   String receiveTime;
   dynamic useTime;