-
xx feat(ui):修复ohos目标写法 xx (cherry picked from commit 3e164451) # Conflicts: # lib/core/services/raw_data_service/platform_ohos/ohos_harmony_health_raw_data_sync_service_factory.dart xx feat(ui):首页提供的数据也从本地数据库取 (cherry picked from commit e64a4559) # Conflicts: # lib/core/services/raw_data_service/platform_ohos/ohos_harmony_health_raw_data_sync_service_factory.dart
-
xx feat(ui):修复ohos目标写法 xx
-
(cherry picked from commit 57c728d2) # Conflicts: # pubspec.lock
-
(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
-
This reverts commit cfbfc73f.