删除merge log

model/server_data_statistics.js

@@ -681,12 +681,7 @@ async function report2FeishuTable() {
         var data = await getStatisticsInfo();
         logger.info('getStatisticsInfo', data)
         var ret = await exec(data)
-<<<<<<< HEAD
-        // logger.error('数据统计 end', JSON.stringify(data))
-        return ret
-=======
         logger.error('数据统计 end','https://st94nif1cq.feishu.cn/sheets/shtcnp6zbrsep1Sz3Cvk7NXRpDg?sheet=BMjMDr',JSON.stringify(data),JSON.stringify(ret))
->>>>>>> opt-code-2
     } catch (error) {
         logger.error('report2FeishuTable', error.toString())
     }