6b92b3c
(release)
Merge branch 'develop' into release by
2024-02-20 10:30:20 +0800
36b5b77
(develop)
提交操控无人机接口代码 by
2024-01-31 09:08:35 +0800
2530949
机场信息新增舱内湿度,舱内温度字段 by
2024-01-30 13:45:02 +0800
e5c0448
新增查询机场调度列表接口 by
2024-01-29 16:16:55 +0800
401c31c
新增查询机场调度列表接口 by
2024-01-29 16:16:00 +0800
6e5a7be
修改获取事件卡片列表代码 by
2024-01-29 11:22:44 +0800
17a83fe
修统计代码 by
2024-01-29 10:03:54 +0800
a834163
修改事件实时信息代码 by
2024-01-29 10:00:01 +0800
40e64d2
修改添加应急事件代码 by
2024-01-29 09:55:23 +0800
50cc419
修改获取事件实时信息,返回图片地址 by
2024-01-29 09:48:35 +0800
4a9775f
修改获取事件实时信息,返回图片地址 by
2024-01-29 09:43:10 +0800
3f217ed
修改获取事件实时信息数据 by
2024-01-29 09:36:32 +0800
d59a801
提交应急事件忽略代码 by
2024-01-29 09:10:10 +0800
d0d02bf
应急事件添加图片字段 by
2024-01-27 16:10:25 +0800
b21c468
提交查询事件卡片列表 by
2024-01-27 14:46:26 +0800
61346fb
自动上报设置事件名称自动 by
2024-01-27 14:04:16 +0800
a2d4604
应急事件分页列表 by
2024-01-25 16:21:47 +0800
2107a97
提交高速应急事件代码 by
2024-01-25 15:53:39 +0800
5458400
提交日期工具类 by
2024-01-23 11:15:03 +0800
c264fa5
提交日期工具类 by
2024-01-23 11:05:52 +0800
f748a45
1、新增手动上报应急事件;2、新增按月统计应急事件; by
2024-01-23 10:53:53 +0800
57410ae
1、事件增加上报类型自动;2、dsp推送的问题,事件类型增加自动上报字段; by
2024-01-19 11:29:01 +0800
f6a5cb7
(HEAD -> master)
Merge branch 'release' of gitadmin/tuoheng_freeway into master by
2024-01-10 19:23:31 +0800
74ae1a6
(refs/pull/393/head)
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-10 18:52:47 +0800
509bb22
(refs/pull/392/head)
修改小程序推送代码 by
2024-01-10 18:52:17 +0800
49e6a24
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-10 15:34:11 +0800
972b9e1
(refs/pull/391/head)
修改小程序代码 by
2024-01-10 15:33:42 +0800
573b910
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-10 15:06:00 +0800
779138c
(refs/pull/390/head)
修改小程序绑定代码 by
2024-01-10 15:05:39 +0800
234a213
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-10 14:52:01 +0800
e2ebba8
(refs/pull/389/head)
修改小程序绑定代码 by
2024-01-10 14:51:36 +0800
a5a33a4
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-10 14:29:59 +0800
9f8ca00
(refs/pull/388/head)
小程序发送消息,跳转小程序类型该为配置 by
2024-01-10 14:29:35 +0800
05496db
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-10 11:27:43 +0800
51fa4d0
(refs/pull/387/head)
微信授权修改日志 by
2024-01-10 11:27:15 +0800
bc7b4f1
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-10 11:12:02 +0800
acc4d1f
(refs/pull/386/head)
修改微信授权接口 by
2024-01-10 11:11:40 +0800
736bb21
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-10 10:39:53 +0800
85926a8
(refs/pull/385/head)
修改微信授权接口 by
2024-01-10 10:37:49 +0800
c6fa154
小程序授权改为一一对应 by
2024-01-10 10:19:00 +0800
f80dfa2
小程序授权改为一一对应 by
2024-01-10 10:14:25 +0800
85278c0
解決:微信和用户账号绑定关系不是一对一 by
2024-01-10 08:53:14 +0800
9fe753a
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-09 13:35:34 +0800
f4c61db
(refs/pull/384/head)
解決:分页查询的总条数和总页数值为0 by
2024-01-09 13:33:54 +0800
8acc682
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-08 17:11:11 +0800
32f9ec9
(refs/pull/383/head)
修改小程序查询任务分页列表中传状态字段参数 by
2024-01-08 17:10:10 +0800
1960264
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-08 16:43:48 +0800
14b002f
(refs/pull/382/head)
修改发现推送问题代码 by
2024-01-08 16:43:18 +0800
5d151f4
修改存坐标数据代码 by
2024-01-08 16:07:26 +0800
ddfd27a
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-08 10:03:22 +0800
540aa9c
(refs/pull/381/head)
优化代码 by
2024-01-08 10:02:34 +0800
a5f4ce7
查看正在执行任务的直播-添加vo返回字段 by
2024-01-05 11:00:43 +0800
9d2afad
1、web端新增 修改密码接口 2、app端新增 直播接口 by
2024-01-05 10:15:22 +0800
d85f482
Merge remote-tracking branch 'origin/develop' into develop by
2024-01-05 09:50:11 +0800
d4eb275
1、web端新增 修改密码接口 2、app端新增 直播接口 by
2024-01-05 09:47:24 +0800
9e75556
更新oidc创建租户相关逻辑 by
2024-01-05 09:34:12 +0800
a1fda98
新增任务发现第一条问题,推送微信通知代码 by
2024-01-04 16:15:24 +0800
8bc810c
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2024-01-03 15:06:32 +0800
b04da3a
提交微信小程序授权代码 by
2024-01-03 15:06:28 +0800
5c55694
Merge branch 'release' of gitadmin/tuoheng_freeway into master by
2024-01-02 14:03:48 +0800
6e281d5
(refs/pull/380/head)
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2024-01-02 13:41:39 +0800
99e38ee
(refs/pull/379/head)
重新提交代码:删除注释 by
2024-01-02 13:41:19 +0800
cd5a150
1、解决高速飞手任务在智飞平台上传文件和视频时报系统访问异常 2、优化定时任务代码 by
2024-01-02 13:38:38 +0800
7f523fb
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-29 16:30:59 +0800
417b25a
(refs/pull/378/head)
解决:1、问题列表中任务类型展示错误 2、问题列表加载数据不全 by
2023-12-29 16:29:28 +0800
cd95a43
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-29 14:09:48 +0800
de57807
(refs/pull/377/head)
解决:执行记录中已取消的周期子任务重新提交后任务类型错误 by
2023-12-29 14:08:14 +0800
0866adf
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-28 15:11:40 +0800
04be0b5
(refs/pull/376/head)
解决:查询应急任务类型 by
2023-12-28 15:11:03 +0800
cc43add
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-28 13:39:40 +0800
6a455f8
(refs/pull/375/head)
解决:所有报告列表中巡检处理报告缺少设备和公路信息 by
2023-12-28 13:38:43 +0800
92d84cb
解决:所有报告列表中巡检报告缺少设备和公路信息 by
2023-12-28 13:24:58 +0800
0e92264
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-28 11:26:46 +0800
fe9f85a
(refs/pull/374/head)
解决:所有报告列表中查询类型为周期任务却查出了单次任务类型 by
2023-12-28 11:24:42 +0800
e9a9337
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-28 10:47:40 +0800
88dfcca
(refs/pull/373/head, refs/pull/372/head)
Merge remote-tracking branch 'origin/develop' into develop by
2023-12-28 10:45:31 +0800
7845138
修改定时任务代码 by
2023-12-28 10:44:24 +0800
0327543
修改local配置环境文件 by
2023-12-26 15:42:22 +0800
824ff9b
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-25 16:21:13 +0800
a8d23e5
(refs/pull/371/head)
回滚:被删除的类DeptService by
2023-12-25 16:20:27 +0800
69d4d38
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-25 15:40:57 +0800
01ea473
(refs/pull/370/head)
回滚:被删除的类DeptController by
2023-12-25 15:40:21 +0800
626e381
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-25 14:39:07 +0800
57656be
(refs/pull/369/head)
解决·失败和已取消状态都能进行重新提交 by
2023-12-25 14:38:23 +0800
57da80b
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-25 11:51:04 +0800
3197d0a
(refs/pull/368/head)
修改CurrentUserUtil by
2023-12-25 11:33:17 +0800
8e629bb
解决: 1、待执行任务中重新提交的务码不正确 2、执行记录列表重新提交已取消的任务报错 by
2023-12-25 11:02:17 +0800
6ff0fa8
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-22 15:15:49 +0800
3b16579
(refs/pull/367/head)
去掉修改、编辑的用户部门权限限制[只要有菜单权限的都可以操作] by
2023-12-22 15:14:18 +0800
b471d02
解决:定时任务InspectionTimeOutTask 任务失败后未保存到历史记录表里 by
2023-12-22 11:12:46 +0800
59fbbd3
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-22 10:01:41 +0800
632dcfc
(refs/pull/366/head)
解决:待执行任务列表中周期子任务缺少创建人信息 by
2023-12-22 10:00:43 +0800
107b62c
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-21 14:44:28 +0800
2089e02
(refs/pull/365/head)
解决:待执行任务分页列表查询不出周期性子任务 by
2023-12-21 14:43:48 +0800
4f00ff2
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-21 13:33:32 +0800
9085ab2
(refs/pull/364/head)
Merge remote-tracking branch 'origin/develop' into develop by
2023-12-21 11:51:39 +0800
08858eb
解决:单次任务分页列表缺少inspectionCycleId字段 by
2023-12-21 11:51:15 +0800
c60b7dc
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-12-20 14:53:14 +0800
36e0117
(refs/pull/363/head)
修改小程序返回航线名称问题 by
2023-12-20 14:52:35 +0800
400e3ac
修改获取任务分页列表代码 by
2023-12-20 14:38:04 +0800