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