Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into... 148/1 148/head
authorDXY <1731678236@qq.com>
Wed, 8 May 2024 11:12:10 +0000 (19:12 +0800)
committerDXY <1731678236@qq.com>
Wed, 8 May 2024 11:12:10 +0000 (19:12 +0800)
commit8abfe46d1e29f94e2e4ca9ac0878733066c6ec0d
tree9f5323a4d0fc6d04d5ca5638fcb28a7d8f1f738c
parent007dc218bb5eda4d0f3323d22cdc8766dcc8d7e3
parent558bb0692821599508bd93e55b613507e2a7da73
Merge branch 'xts_origin' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230 into xts_origin
code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
code/sdk/application/wearable/fd230app/nativeui/traing/src/TraingModel.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.cpp
code/sdk/application/wearable/service/ble_service/blemoder/bletest.h
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.c
code/sdk/application/wearable/service/ble_service/bleservice/bleEvent.h