Resolve merge conflict

游雁

2024-01-14 8912e0696af069de47646fdb8a9d9c4e086e88b3

 runtime/websocket/bin/websocket-server.cpp

@@ -100,7 +100,14 @@
        jsonresult["timestamp"] = stamp_res;
      }
      if(stamp_sents != ""){
        jsonresult["stamp_sents"] = stamp_sents;
        try{
          nlohmann::json json_stamp = nlohmann::json::parse(stamp_sents);
          jsonresult["stamp_sents"] = json_stamp;
        }catch (std::exception const &e)
        {
          LOG(ERROR)<<e.what();
          jsonresult["stamp_sents"] = "";
        }
      }
      jsonresult["wav_name"] = wav_name;