-
(cherry picked from commit d6f4e780) # Conflicts: # lib/app/bootstrap/app_bootstrap.dart # lib/app/modules/login/controllers/login_controller.dart # lib/app/modules/login/views/login_view.dart # lib/data/local/user_preferences_storage.dart # lib/pigeon/wechat_api.g.dart # pigeon/wechat_api.dart
-
(cherry picked from commit 85d12a8b) # Conflicts: # test/core/services/health_raw_data_core_service_test.dart
-
(cherry picked from commit 85d12a8b) # Conflicts: # lib/core/services/raw_data_service/platform_ios/apple_health_raw_local_notification.dart # test/core/services/health_raw_data_core_service_test.dart # test/core/services/health_raw_local_notification_test.dart