合并冲突

diff --cc code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
index 8e05cdb,b0d9c40..887572d
--- 1/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
--- 2/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
+++ b/code/sdk/application/wearable/fd230app/nativeui/config/include/ConfigModel.h
@@@ -87,21 -82,19 +82,11 @@@ namespace OHO
              CONFIFMOFEL_ITEM_DRINK_START,//提醒开始时间 int类型 前16位小时，后16位分钟
              CONFIFMOFEL_ITEM_DRINK_END,//提醒结束时间 int类型 前16位小时，后16位分钟
              CONFIGMODEL_ITEM_DRINK_FREQ,//提醒频率 0:30分钟1:1小时2:2小时 3:3小时
- 
--            //睡眠提醒相关
--            CONFIFMOFEL_ITEM_SLEEP, //开关
--            CONFIFMOFEL_ITEM_SLEEP_BEDTIME,//就寝时间
--            CONFIFMOFEL_ITEM_SLEEP_GET_UP,//起床时间
              CONFIFMOFEL_ITEM_SLEEP_REMIND,//提前20分钟提醒开关
- 
              CONFIGMODEL_ITEM_MAX,
          } ;
  
          struct configmodel_item{
--            ConfigDataType type;
--            const char* itemname;
--            char  *defaultValue;
--        };
  
    
          const char* get_config_name(ConfigItem item)

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