农历节日优先级比公历节日优先显示

.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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/model/date_model.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/model/date_model.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

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]);
     }