From: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Date: Tue, 2 Jul 2024 15:18:38 +0000 (+0800)
Subject: Merge branch sdk602patch0626 into sdk602patch0521 (Conflict resolved online)
X-Git-Tag: release_V1.2.70_20241020_135402~889
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=a6a0d5b6c64a0aa733d1763024258cb5cdf2f1e8;p=mirrors%2FFD230.git

Merge branch sdk602patch0626 into sdk602patch0521 (Conflict resolved online)


# Conflicts:
#      code/sdk/application/wearable/fd230app/nativeui/alarmclocktimerconfig/src/AlarmClockTimerConfig.cpp
#      code/sdk/application/wearable/fd230app/nativeui/heart_blood/health_service/health_service.cpp
---

a6a0d5b6c64a0aa733d1763024258cb5cdf2f1e8