Merge branch 'sdk650pathc0423' of codeup.aliyun.com:64191456b9581d62e8f81ac0/FD230...

diff --cc code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c
index 8cf9261,583cee0..1b2c3af
--- 1/code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c
--- 2/code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c
+++ b/code/sdk/zhihui/leiniao/imsl_ln/leiniao_api_at.c
@@@ -1232,9 -1232,7 +1232,13 @@@ static uint32_t ln_folder_size_at(uint8
             folder_size, folder_size / 1024, folder_size / (1024 * 1024));
      
      printf("Folder size check completed.\r\n");
++<<<<<<< HEAD
 +    return ERRCODE_SUCC;
 +}
 +
++=======
+ }
++>>>>>>> ab5d1e37014f6c28af153d77b587df4a4ba85f0e
  /* AT^LN_CHARACTER_CFG[=characterName,eyesShape,hairColor,eyesColor,hairStyle,screenImageAsEmoji] */
  static uint32_t ln_character_config_change_at(uint8_t *para, uint32_t paraLen, char *strCommonCmd)
  {
@@@ -1361,6 -1358,8 +1365,11 @@@ static const at_cmd_table_t g_ln_api_cm
      /* 内存查看相关AT命令 */
      {(char *)"AT^LN_MEMORY_INFO", ln_memory_info_at, (char *)"查看系统内存信息: AT^LN_MEMORY_INFO"},
      {(char *)"AT^LN_FOLDER_SIZE", ln_folder_size_at, (char *)"查看文件夹大小: AT^LN_FOLDER_SIZE[=/path/to/folder]"},
++<<<<<<< HEAD
++=======
+ 
+     {(char *)"AT^LN_CHARACTER_CFG", ln_character_config_change_at, (char *)"角色配置更改: AT^LN_CHARACTER_CFG[=name,eyesShape,hairColor,eyesColor,hairStyle,screenImageAsEmoji]"},
++>>>>>>> ab5d1e37014f6c28af153d77b587df4a4ba85f0e
  };