Merge branch 'sdk602patch0521' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0...

diff --cc code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp
index 87457c4,3623d49..7e79b1a
--- 1/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp
@@@ -2,7 -2,7 +2,7 @@@
   * @Author: luozheng 1732036298@qq.com
   * @Date: 2024-06-12 11:44:04
   * @LastEditors: luozheng 1732036298@qq.com
-  * @LastEditTime: 2024-06-19 09:51:05
 - * @LastEditTime: 2024-06-18 20:04:39
++ * @LastEditTime: 2024-06-19 10:51:02
   * @FilePath: /FD230/code/sdk/application/wearable/fd230app/nativeui/weather/src/WeatherView.cpp
   */
  #include "weather/include/WeatherView.h"

diff --cc code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
Simple merge