wangliwen
|
ac4347687f
|
Merge branch 'dev'
|
2022-07-27 17:10:13 +08:00 |
 dinggang
|
5eb0184bd4
|
西海岸基础设施需求修改
|
2022-07-27 17:07:58 +08:00 |
|
wangliwen
|
1ff30d3d13
|
Merge branch 'master' into docker_package
|
2022-07-27 14:21:06 +08:00 |
|
wangliwen
|
b1aaf5e5bc
|
Merge branch 'dev'
|
2022-07-27 14:20:59 +08:00 |
|
wangliwen
|
3281c72fff
|
...
|
2022-07-27 14:20:50 +08:00 |
|
wangliwen
|
cf6641b8e4
|
Merge branch 'master' into docker_package
|
2022-07-27 10:25:01 +08:00 |
|
wangliwen
|
58f9ecc762
|
Merge branch 'dev'
|
2022-07-27 10:24:51 +08:00 |
|
wangliwen
|
fdac3a7a86
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-27 10:24:36 +08:00 |
|
wangliwen
|
ab08469ac2
|
Merge branch 'master' into docker_package
|
2022-07-27 10:23:02 +08:00 |
|
wangliwen
|
1b26354533
|
Merge branch 'dev'
|
2022-07-27 10:22:54 +08:00 |
|
wangliwen
|
32f9558052
|
....
|
2022-07-27 10:21:45 +08:00 |
|
wangliwen
|
ed237c62ee
|
Merge branch 'master' into docker_package
|
2022-07-27 10:07:53 +08:00 |
|
dinggang
|
26830e19e8
|
前台退出未清除后台登录用户bugfix-1.0
|
2022-07-27 10:06:31 +08:00 |
|
wangliwen
|
f997270565
|
Merge branch 'master' into docker_package
|
2022-07-26 19:45:40 +08:00 |
|
wangliwen
|
559a1a4f55
|
...
|
2022-07-26 19:45:27 +08:00 |
|
wangliwen
|
0959ac88f4
|
Merge branch 'master' into docker_package
|
2022-07-26 19:07:05 +08:00 |
 yitonglei
|
68cf80df1f
|
手动获取视频地区信息后保存地区信息前先清空表格t_camera_organization
|
2022-07-26 17:55:37 +08:00 |
|
wangliwen
|
7ea6145f61
|
Merge branch 'master' into docker_package
|
2022-07-26 17:08:20 +08:00 |
|
wangliwen
|
4f03039109
|
...
|
2022-07-26 17:08:06 +08:00 |
|
wangliwen
|
c2e64e630b
|
Merge branch 'master' into docker_package
|
2022-07-26 17:03:58 +08:00 |
|
wangliwen
|
df86ed661f
|
websocket定时心跳
|
2022-07-26 17:03:38 +08:00 |
|
wangliwen
|
cc50527b4b
|
Merge branch 'master' into docker_package
|
2022-07-26 16:29:28 +08:00 |
|
wangliwen
|
ec20e986fa
|
...
|
2022-07-26 16:29:15 +08:00 |
|
wangliwen
|
1969a1c0bd
|
Merge branch 'dev' into docker_package
|
2022-07-26 16:26:05 +08:00 |
|
wangliwen
|
8968c1017d
|
定时清理操作日志
|
2022-07-26 16:25:53 +08:00 |
|
wangliwen
|
3c5c26b7de
|
Merge branch 'master' into docker_package
|
2022-07-26 16:13:18 +08:00 |
|
wangliwen
|
b314c05072
|
...
|
2022-07-26 16:13:02 +08:00 |
|
wangliwen
|
83f6fb67df
|
Merge branch 'master' into docker_package
|
2022-07-26 15:37:11 +08:00 |
|
dinggang
|
efdda05ec2
|
门户首页-推荐能力-去除重复能力
|
2022-07-26 15:34:13 +08:00 |
|
wangliwen
|
eb4c402866
|
换一下初始镜像
|
2022-07-26 14:07:12 +08:00 |
|
wangliwen
|
31cae23036
|
Merge branch 'master' into docker_package
|
2022-07-26 10:29:36 +08:00 |
|
wangliwen
|
a68d24f687
|
npe
|
2022-07-26 10:29:22 +08:00 |
|
wangliwen
|
ef5bb41a0f
|
Merge branch 'master' into docker_package
|
2022-07-25 19:04:54 +08:00 |
|
wangliwen
|
d61043f00d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-25 19:04:36 +08:00 |
|
yitonglei
|
4d2141d807
|
增加视频资源申请时查询该资源是否在库中的判断cameraChannelService.checkCameraIfExists
|
2022-07-25 18:00:29 +08:00 |
|
dinggang
|
115944b8e8
|
管理系统-能力挂接列表新增显示所属部门字段
|
2022-07-25 17:19:23 +08:00 |
|
wangliwen
|
1a2c909f4c
|
Merge branch 'master' into docker_package
|
2022-07-25 16:00:27 +08:00 |
|
wangliwen
|
6fedef22c0
|
屮
|
2022-07-25 16:00:10 +08:00 |
|
wangliwen
|
37d511742c
|
Merge remote-tracking branch '备份/dev' into docker_package
|
2022-07-25 14:14:12 +08:00 |
|
wangliwen
|
88c75d5022
|
docker 启动调整jvm参数
|
2022-07-25 14:13:54 +08:00 |
|
yitonglei
|
f0cc8cc5a9
|
1、能力超市、基础设施、视频资源的列表查询增加gps坐标为空的判断
|
2022-07-25 14:01:45 +08:00 |
|
wangliwen
|
62c023a046
|
Merge branch 'master' into docker_package
|
2022-07-25 11:47:20 +08:00 |
|
wangliwen
|
5d1b7da56a
|
批量申请时 businesskey只记录5条id
|
2022-07-25 11:47:03 +08:00 |
|
wangliwen
|
cc70512cdd
|
Merge branch 'master' into docker_package
|
2022-07-25 10:52:06 +08:00 |
|
wangliwen
|
d113c6ec7a
|
已办任务接口，能力下架增加申请内容为 能力名称
|
2022-07-25 10:51:43 +08:00 |
|
wangliwen
|
3f9405ab88
|
Merge branch 'master' into docker_package
|
2022-07-25 10:20:45 +08:00 |
|
wangliwen
|
0b2844e246
|
能力上架审核被拒绝时，能力状态不正确的bug fix
|
2022-07-25 10:20:08 +08:00 |
|
wangliwen
|
001bae1711
|
Merge branch 'master' into docker_package
|
2022-07-22 18:44:17 +08:00 |
|
wangliwen
|
afaa8cb26c
|
.。
|
2022-07-22 18:44:04 +08:00 |
|
wangliwen
|
ca0bb90e1f
|
调整
|
2022-07-22 18:43:45 +08:00 |