[feat]解决冲突

lib/di/get_it.config.dart

@@ -135,10 +135,10 @@ extension GetItInjectableX on _i174.GetIt {
     gh.factory<_i1060.ZodiacLoveIntimacyController>(
       () => _i1060.ZodiacLoveIntimacyController(),
     );
-    gh.factory<_i211.IntroController>(() => _i211.IntroController());
     gh.factory<_i507.KeyboardTutorialController>(
-          () => _i507.KeyboardTutorialController(),
+      () => _i507.KeyboardTutorialController(),
     );
+    gh.factory<_i211.IntroController>(() => _i211.IntroController());
     gh.lazySingleton<_i495.WechatLoginService>(
       () => _i495.WechatLoginService(),
     );

lib/resource/assets.gen.dart

@@ -26,14 +26,14 @@ class $AssetsAnimGen {
   /// File path: assets/anim/anim_intro_second_data.json
   String get animIntroSecondData => 'assets/anim/anim_intro_second_data.json';
 
-  /// File path: assets/anim/anim_keyboard_generating_data.json
-  String get animKeyboardGeneratingData =>
-      'assets/anim/anim_keyboard_generating_data.json';
-
   /// File path: assets/anim/anim_keyboard_floating_window_choose_keyboard.json
   String get animKeyboardFloatingWindowChooseKeyboard =>
       'assets/anim/anim_keyboard_floating_window_choose_keyboard.json';
 
+  /// File path: assets/anim/anim_keyboard_generating_data.json
+  String get animKeyboardGeneratingData =>
+      'assets/anim/anim_keyboard_generating_data.json';
+
   /// File path: assets/anim/anim_keyboard_tutorial_setting.json
   String get animKeyboardTutorialSetting =>
       'assets/anim/anim_keyboard_tutorial_setting.json';
@@ -66,8 +66,8 @@ class $AssetsAnimGen {
     animIntimacyAnalyseCreatingReportData,
     animIntroFirstData,
     animIntroSecondData,
-    animKeyboardGeneratingData,
     animKeyboardFloatingWindowChooseKeyboard,
+    animKeyboardGeneratingData,
     animKeyboardTutorialSetting,
     animNewUserData,
     animSurpriseDialogData,