322 Commits (d4de237bda3f8f565fca189ec8181e8d8a3fb2f8)

 

Alle Branches   

Suchen

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