合并

diff --cc code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp
index 4946d55,ea88e66..6601e97
--- 1/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp
--- 2/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp
+++ b/code/sdk/application/wearable/fd230app/nativeui/alarm/src/AlarmClockModel.cpp
@@@ -18,7 -18,8 +18,9 @@@
  #include "PlayersModel.h"
  #include "PhoneService.h"
  #include "ui_service.h"
 +#include "notification_manager.h"
+ #include "../../../../../../../drivers/peripheral/config/include/ConfigModel.h"
+ 
  #ifdef __cplusplus
  extern "C" {
  #endif

diff --cc code/sdk/application/wearable/service/msg_center/src/msg_center_customer.cpp
Simple merge