338 Commits (1b97d33d320ddcdc385f6054619f47aefb769e4b)
 

Author SHA1 Message Date
  xuziqing 1b97d33d32 Merge branch 'release' of gitadmin/tuoheng_air_monitor into master 10 months ago
  xuziqing d4de237bda Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  xiaoying 25fdb29583 更新word图片样式 10 months ago
  xuziqing 298b7e57af Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  xiaoying b31cec59f5 更新 10 months ago
  suqin 5664c220b2 Merge branch 'release' 10 months ago
  xuziqing c7aaa0d501 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  xiaoying ec348cce19 更新 10 months ago
  xuziqing 1f4048d8ea Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  xiaoying 5bd3fa67b2 更新类名 10 months ago
  xuziqing dc4247dcba Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  xiaoying 0459c15463 更新word图片插入 10 months ago
  xuziqing 24d36de5d6 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  xiaoying 9b13b04056 更新 10 months ago
  suqin ab2a51e1a8 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  suqin 2689424ec0 Merge remote-tracking branch 'origin/develop' into develop 10 months ago
  suqin b6a915701a 改:导出word图片尺寸比例 10 months ago
  wanjing cecfee70d1 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing c57b61f64b 修改任务回放地址 10 months ago
  suqin 0d1249c1fb Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  suqin a6dee6a327 改:导出word 10 months ago
  suqin 16b63d1314 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  suqin 4e9c1f5f07 Merge remote-tracking branch 'origin/develop' into develop 10 months ago
  suqin 3c8fa3b025 任务详情的vo展示航线名称和机场名称 10 months ago
  wanjing 19b52765f2 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing f787c76c3d 修改dsp推送录制视频地址,去掉前缀 10 months ago
  wanjing 3bfd993ad3 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing 5188fd3541 调用dsp传pushurl为空 10 months ago
  wanjing 52445c547f Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing eefd698b56 新增根据航线ID获取航线信息接口 10 months ago
  wanjing c6451efdce Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing 5060ba12c0 修改根据机场任务ID获取航线 10 months ago
  wanjing 07c84685e2 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing 26ad90f030 1、修改添加任务代码;2、修改编辑任务代码; 10 months ago
  wanjing b4637cfe7c Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing 619ad01771 修改dsp回调代码 10 months ago
  wanjing 0a0e3ae5b9 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing 937e130190 修改调用dspdiam 10 months ago
  wanjing f74da69943 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing 57d6480ec8 修改停止录制代码 10 months ago
  wanjing eaeadb595c Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing 42d5410e20 修改停止录制代码 10 months ago
  wanjing 6430a8eb21 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing ba6e38de0b 修改dsp录制代码 10 months ago
  wanjing 5ca61981ac Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing 301b8972b6 修改dsp分析代码 10 months ago
  wanjing cf2b7d13fc Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing 977e4310f9 机场回调,播放地址存入通道表 10 months ago
  wanjing 4cf06d9833 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release 10 months ago
  wanjing 694db9626a 修改调用dsp开始录制、停止录制、查询录制接口地址 10 months ago