From 3c60db6d87fa5fbcc71038d49172fe3685c51418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AB=A0=E6=96=87=E8=BD=A9?= <12812285557@qq.com>
Date: Tue, 2 Aug 2022 16:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=9C=E5=8E=86=E8=8A=82=E6=97=A5=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E7=BA=A7=E6=AF=94=E5=85=AC=E5=8E=86=E8=8A=82=E6=97=A5?=
 =?UTF-8?q?=E4=BC=98=E5=85=88=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml       | 5 ++---
 lib/model/date_model.dart | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index eecc629..7d5ca07 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,9 +10,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="18463f0e-cf10-4ee2-975b-376476396e12" name="Default Changelist" comment="Default Changelist">
-      <change beforePath="$PROJECT_DIR$/example/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/example/pubspec.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/model/date_model.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/model/date_model.dart" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/lib/model/date_model.dart b/lib/model/date_model.dart
index 10665db..bb76933 100644
--- a/lib/model/date_model.dart
+++ b/lib/model/date_model.dart
@@ -22,10 +22,10 @@ class DateModel {
   String get lunarString {
     if (solarTerm.isNotEmpty) {
       return solarTerm;
-    } else if (gregorianFestival.isNotEmpty) {
-      return gregorianFestival;
     } else if (traditionFestival.isNotEmpty) {
       return traditionFestival;
+    } else if (gregorianFestival.isNotEmpty) {
+      return gregorianFestival;
     } else {
       return LunarUtil.numToChinese(lunar[1], lunar[2], lunar[3]);
     }