0bc5625
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-06 17:15:49 +0800
b870069
(refs/pull/190/head)
修改图片显示字段由fileOriginal改为fileImage by
2023-02-06 17:14:51 +0800
b6f46ef
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-06 10:38:29 +0800
9526138
(refs/pull/189/head)
添加gis部分根据用户角色获取公路和路段列表接口 by
2023-02-06 10:37:25 +0800
9ace624
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-06 10:10:01 +0800
ff92095
(refs/pull/188/head)
添加gis部分根据用户角色获取公路和路段列表接口 by
2023-02-06 09:56:46 +0800
1218b93
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-03 11:31:00 +0800
48ee7fb
(refs/pull/187/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-02-03 11:30:19 +0800
053c51b
修改提示语 by
2023-02-03 11:29:38 +0800
148cf4e
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-03 11:06:04 +0800
bde5772
(refs/pull/186/head)
修改问题类型增加审核人和审核时间字段 by
2023-02-03 11:05:06 +0800
132fb04
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-03 10:20:11 +0800
b1de292
(refs/pull/185/head)
查询任务分页列表添加是否可编辑字段 by
2023-02-03 10:18:06 +0800
ee1882a
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-02 16:58:03 +0800
e2377c1
(refs/pull/184/head)
Merge branch 'wanjing' into develop by
2023-02-02 16:55:39 +0800
7b21511
新增修改机场任务接口 by
2023-02-02 16:54:16 +0800
720558d
构造物种类添加其他 by
2023-02-02 14:34:57 +0800
ae3e7fb
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-02 13:35:35 +0800
39be180
(refs/pull/183/head)
优化代码 by
2023-02-02 13:34:30 +0800
97b6c0e
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-02 11:19:21 +0800
b76bd60
(refs/pull/182/head)
优化代码 by
2023-02-02 11:05:27 +0800
0bc6373
优化代码 by
2023-02-02 10:55:46 +0800
00a388c
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-02 10:36:48 +0800
b5d44f5
(refs/pull/181/head)
Merge branch 'wanjing' into develop by
2023-02-02 10:35:15 +0800
43dee71
修改报告管理中问题总数和问题处理数改为每次查询实时计算 by
2023-02-02 10:32:19 +0800
a3aece9
保存和编辑公路时当公路代码重复时不让保存和编辑公路 by
2023-02-02 10:20:46 +0800
c4fb701
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-01 16:35:15 +0800
019af23
(refs/pull/180/head)
新增根据deptId获取树形列表接口 by
2023-02-01 16:34:21 +0800
89d098a
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-02-01 15:01:40 +0800
e3bc0b6
(refs/pull/179/head)
1、修改查询用户分页列表权限;2、重构用户管理返回码枚举; by
2023-02-01 15:00:45 +0800
120f265
(tag: v1.0.1)
Merge branch 'release' of gitadmin/tuoheng_freeway into master by
2023-01-31 17:32:45 +0800
841f5fb
(refs/pull/178/head)
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-31 16:43:02 +0800
75d2909
(refs/pull/177/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-01-31 16:42:23 +0800
2ed8e5f
任务详情中增加执行开始时间,执行结束时间字段 by
2023-01-31 16:42:11 +0800
e0d663e
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-31 11:35:00 +0800
b6c1b7f
(refs/pull/176/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-01-31 11:30:14 +0800
59d22ca
修改gis问题类型和数量功能接口数据权限控制 by
2023-01-31 11:28:35 +0800
cfed544
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-29 11:38:26 +0800
1da536e
(refs/pull/175/head)
1、问题分布修改根据任务编号和任务名称匹配;2、重构代码; by
2023-01-29 11:37:20 +0800
ec9368f
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-28 16:10:02 +0800
3c721f0
(refs/pull/174/head)
机场巡逻任务,飞行中显示直播按钮 by
2023-01-28 16:08:45 +0800
90c9422
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-28 10:44:58 +0800
cdbbc7d
(refs/pull/173/head)
修改小程序代办工单分配人员字段属性值取realname字段 by
2023-01-28 10:43:53 +0800
3f16d26
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-28 10:24:12 +0800
b990f0b
(refs/pull/172/head)
修改小程序代办工单分配人员字段属性值取realname字段 by
2023-01-28 10:21:22 +0800
57a3dc8
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-14 10:48:41 +0800
0f71ea8
(refs/pull/171/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-01-14 10:47:37 +0800
63edaa9
重构代码 by
2023-01-14 10:47:25 +0800
efddf2c
(tag: v1.0.0)
Merge branch 'release' of gitadmin/tuoheng_freeway into master by
2023-01-13 16:19:15 +0800
39fca33
(refs/pull/170/head)
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-13 15:38:13 +0800
3950360
(refs/pull/169/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0 by
2023-01-13 15:36:39 +0800
abb993d
添加按创建时间倒序排序 by
2023-01-13 15:36:25 +0800
b6939d5
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-13 15:30:46 +0800
94f33f8
(refs/pull/168/head)
问题处理添加日志 by
2023-01-13 15:30:06 +0800
7152e04
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-13 14:56:27 +0800
eadc633
(refs/pull/167/head)
导出报告,机场任务,使用机场名称作为设备名称 by
2023-01-13 14:46:52 +0800
a744b7c
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-13 14:32:15 +0800
4928c27
(refs/pull/166/head)
重构添加/修改部门代码 by
2023-01-13 14:31:33 +0800
6498760
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-13 14:01:54 +0800
6a1a275
(refs/pull/165/head)
添加机场平台回调修改报告日志 by
2023-01-13 14:01:06 +0800
2e569fe
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-13 11:49:43 +0800
f93fd3c
(refs/pull/164/head)
机场任务没有设备名称,暂定使用机场ID作为设备ID, 机场名称作为设备名称 by
2023-01-13 11:49:01 +0800
3661d5e
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-13 08:52:10 +0800
c571679
(refs/pull/163/head)
机场和飞手平台回调,有报告时,同步修改报告中的字段; by
2023-01-13 08:51:14 +0800
8f7fa63
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 21:10:03 +0800
8f801c4
(refs/pull/162/head)
1、机场回调修改任务结束时间;2、机场回调修改报告状态和结束时间; by
2023-01-12 21:09:08 +0800
59cbd78
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 20:00:38 +0800
f57b085
(refs/pull/161/head)
任务完成,同步修改报告中的状态和完成时间 by
2023-01-12 19:59:45 +0800
c3f6dbc
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 19:51:14 +0800
f102131
(refs/pull/160/head)
只有飞行中和飞行完成的才有问题核实按钮 by
2023-01-12 19:50:32 +0800
df7513a
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 19:33:35 +0800
c1a61ff
(refs/pull/159/head)
优化报告前端展示时间格式 by
2023-01-12 19:32:57 +0800
7b0d549
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 19:23:11 +0800
8c3ff06
(refs/pull/158/head)
1、解决工单分页搜索;2、解决任务重新提交问题; by
2023-01-12 19:22:19 +0800
cd4d031
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 18:57:49 +0800
1d8a2b8
(refs/pull/157/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-01-12 18:57:24 +0800
1098d0a
处理用户登录获得子部门列表为空问题 by
2023-01-12 18:57:02 +0800
ad81e6a
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 17:14:39 +0800
59dff0a
(refs/pull/156/head)
添加问题状态属性改变 by
2023-01-12 17:13:10 +0800
acc122b
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0 by
2023-01-12 17:10:56 +0800
9542c42
添加问题状态属性改变 by
2023-01-12 17:10:19 +0800
ae2e15c
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 17:03:45 +0800
a6d9e71
(refs/pull/155/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-01-12 17:02:40 +0800
8277fca
1、修改问题分布返回图片字段;2、修改导出报告添加任务编号和任务名称; by
2023-01-12 17:02:31 +0800
f0c0abf
添加问题状态属性改变 by
2023-01-12 16:57:03 +0800
5556fb5
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 16:51:45 +0800
c4af528
(refs/pull/154/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into feature_v1.0 by
2023-01-12 16:50:45 +0800
b81ed0b
添加问题状态属性改变 by
2023-01-12 16:50:28 +0800
862bc98
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 15:57:43 +0800
63376f7
(refs/pull/153/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-01-12 15:57:07 +0800
c88a49b
处理立即执行接口 by
2023-01-12 15:56:57 +0800
22fbbc7
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 15:44:01 +0800
64576a0
(refs/pull/152/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop by
2023-01-12 15:43:02 +0800
9073f5e
添加questionName和questionid属性修改 by
2023-01-12 15:42:51 +0800
cbcb4d6
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 15:24:36 +0800
fb50f40
(refs/pull/151/head)
添加部门公路路段,解决前端重复提交问题 by
2023-01-12 15:23:41 +0800
d963b64
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 15:05:30 +0800
7734c84
(refs/pull/150/head)
修改机场平台回调返回字段 by
2023-01-12 15:04:54 +0800
df2a742
Merge branch 'develop' of gitadmin/tuoheng_freeway into release by
2023-01-12 15:03:16 +0800
41b5f86
(refs/pull/149/head)
修改机场平台回调返回字段 by
2023-01-12 15:02:25 +0800