wangliwen
|
a960e9c894
|
Merge branch 'master' into docker_package
|
2022-07-20 17:46:39 +08:00 |
|
wangliwen
|
41a06c660c
|
...
|
2022-07-20 17:35:46 +08:00 |
|
wangliwen
|
d297b6c6e1
|
Merge branch 'master' into docker_package
|
2022-07-20 17:18:14 +08:00 |
|
wangliwen
|
9f510817ff
|
tabilityapplication/in_use_page 参数缺少注解
|
2022-07-20 17:17:58 +08:00 |
|
wangliwen
|
7fd83391fb
|
Merge branch 'master' into docker_package
|
2022-07-20 16:34:28 +08:00 |
|
wangliwen
|
84d9562041
|
屮
|
2022-07-20 16:34:09 +08:00 |
|
wangliwen
|
16b12761b7
|
Merge branch 'master' into docker_package
|
2022-07-20 15:46:54 +08:00 |
|
wangliwen
|
c3658aceb0
|
...
|
2022-07-20 15:46:28 +08:00 |
|
wangliwen
|
fe109a8890
|
Merge branch 'master' into docker_package
|
2022-07-20 15:44:52 +08:00 |
|
wangliwen
|
46a30be29a
|
???
|
2022-07-20 15:44:24 +08:00 |
|
wangliwen
|
6d733c3c48
|
Merge branch 'master' into docker_package
|
2022-07-20 14:51:13 +08:00 |
|
wangliwen
|
dc51b673a1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-20 14:50:52 +08:00 |
|
wangliwen
|
c44bb2df88
|
。。。
|
2022-07-20 14:50:35 +08:00 |
 dinggang
|
6aaa0d13ad
|
西海岸获取hls流地址更正
|
2022-07-20 11:23:43 +08:00 |
|
wangliwen
|
88f72d0fc7
|
Merge branch 'master' into docker_package
|
2022-07-20 09:21:53 +08:00 |
|
wangliwen
|
d0d2afeaf3
|
增加 根据能力资源id获取该能力申请使用分页接口
|
2022-07-20 09:21:28 +08:00 |
|
wangliwen
|
a4c697474d
|
Merge branch 'master' into docker_package
|
2022-07-19 20:05:30 +08:00 |
|
wangliwen
|
76068f2ab5
|
申购车模糊查询
|
2022-07-19 20:04:51 +08:00 |
|
wangliwen
|
70c7d9c039
|
Merge branch 'master' into docker_package
|
2022-07-19 19:17:26 +08:00 |
|
dinggang
|
b306ce533d
|
.
|
2022-07-19 19:16:19 +08:00 |
|
dinggang
|
5536f25c8f
|
新增日志清除任务
|
2022-07-19 19:14:23 +08:00 |
|
wangliwen
|
7d862de2cb
|
Merge branch 'master' into docker_package
|
2022-07-19 18:06:15 +08:00 |
|
wangliwen
|
20007761eb
|
能力申请全为免批资源时，流程节点默认审核通过
|
2022-07-19 18:05:31 +08:00 |
 yitonglei
|
2c708e1204
|
1、 修改flyway 4.0语句
|
2022-07-19 17:48:20 +08:00 |
|
yitonglei
|
6da7fa0665
|
1、同步摄像头标签信息时数据库配置增加默认值
|
2022-07-19 16:59:48 +08:00 |
|
wangliwen
|
dbd4164e4c
|
Merge branch 'master' into docker_package
|
2022-07-19 16:52:57 +08:00 |
|
wangliwen
|
6954af5ba4
|
deal with
|
2022-07-19 16:52:40 +08:00 |
|
wangliwen
|
58ba499f79
|
。。。
|
2022-07-19 16:47:13 +08:00 |
|
wangliwen
|
62231a0d92
|
Merge branch 'master' into docker_package
|
2022-07-19 16:24:52 +08:00 |
|
wangliwen
|
0cd5c87689
|
屮
|
2022-07-19 16:24:16 +08:00 |
|
wangliwen
|
c3c4a8025b
|
dev环境配置文件调整
|
2022-07-19 16:03:43 +08:00 |
|
wangliwen
|
ef86c15598
|
Merge branch 'master' into docker_package
|
2022-07-19 15:53:29 +08:00 |
|
yitonglei
|
e98a470d7e
|
1、增加同步视频摄像头标签--配置文件
|
2022-07-19 15:51:15 +08:00 |
|
wangliwen
|
dc62d53ca5
|
Merge branch 'master' into docker_package
|
2022-07-19 15:42:32 +08:00 |
|
yitonglei
|
561c481949
|
1、手动更新基础设施-摄像头信息后同步monitor_service项目中标签表的信息
|
2022-07-19 15:30:44 +08:00 |
|
wangliwen
|
c9137ee369
|
Merge branch 'master' into docker_package
|
2022-07-19 15:07:29 +08:00 |
|
wangliwen
|
df7e2a3824
|
deptToDoTaskPage接口优化
|
2022-07-19 15:06:38 +08:00 |
|
wangliwen
|
cbc0018a36
|
Merge branch 'master' into docker_package
|
2022-07-19 13:59:24 +08:00 |
|
dinggang
|
b843f76d0f
|
...
|
2022-07-19 13:57:37 +08:00 |
|
wangliwen
|
bbedac70f0
|
Merge branch 'dev' into docker_package
|
2022-07-19 13:42:10 +08:00 |
|
wangliwen
|
2ff63afa00
|
...
|
2022-07-19 13:41:52 +08:00 |
|
wangliwen
|
1749b66ed9
|
Merge branch 'master' into docker_package
|
2022-07-19 13:38:10 +08:00 |
|
yitonglei
|
75a51451fb
|
1、去掉所有t_camera_channel01和t_camera_organization02的后缀。并添加sql版本为t_camera_channel和t_camera_organization增加字段
|
2022-07-19 12:03:05 +08:00 |
|
wangliwen
|
75e84b35d9
|
Merge branch 'master' into docker_package
|
2022-07-19 11:46:08 +08:00 |
|
yitonglei
|
b3e4b77447
|
1、修改个人中心-我的浏览接口
|
2022-07-19 11:19:05 +08:00 |
|
wangliwen
|
b38653e2c5
|
Merge branch 'dev' into docker_package
|
2022-07-19 11:06:31 +08:00 |
|
dinggang
|
b23afc8029
|
1.编目更新
2.后台管理-工作台-部门待办新增用户名称
|
2022-07-19 10:58:30 +08:00 |
|
dinggang
|
de822a40ae
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-19 10:37:00 +08:00 |
|
dinggang
|
4e6e9cdd42
|
谨记
|
2022-07-19 10:36:24 +08:00 |
|
wangliwen
|
32ce62afeb
|
Merge branch 'dev' into docker_package
|
2022-07-19 10:35:07 +08:00 |