wangliwen
|
fc11b15fbf
|
Merge branch 'master' into docker_package
|
2022-08-18 14:53:58 +08:00 |
wangliwen
|
92542c2ad8
|
TODO 调整
|
2022-08-18 14:53:41 +08:00 |
wangliwen
|
069a42e0c0
|
...
|
2022-08-18 10:17:46 +08:00 |
wangliwen
|
7fccba5008
|
Merge branch 'master' into docker_package
|
2022-08-18 10:01:26 +08:00 |
wangliwen
|
964bf55f12
|
TODO abilityprocess_v3 能力申请流程的发起
|
2022-08-18 10:01:04 +08:00 |
wangliwen
|
00592c3242
|
Merge branch 'master' into docker_package
|
2022-08-17 18:09:43 +08:00 |
Koi-tsk
|
617ecd64c8
|
初步完成区、市审批流程监听器
|
2022-08-17 17:41:55 +08:00 |
wangliwen
|
8337e4320d
|
Merge branch 'master' into docker_package
|
2022-08-17 16:27:24 +08:00 |
wangliwen
|
4446657af2
|
500了
|
2022-08-17 16:27:11 +08:00 |
wangliwen
|
806dcb3d80
|
Merge branch 'master' into docker_package
|
2022-08-17 16:04:35 +08:00 |
wangliwen
|
0eb62c0885
|
增加下架附件文件名
|
2022-08-17 16:04:23 +08:00 |
wangliwen
|
0b0278a9fb
|
Merge branch 'master' into docker_package
|
2022-08-17 15:44:38 +08:00 |
wangliwen
|
4028588ea7
|
下架新增录入字段
|
2022-08-17 15:43:27 +08:00 |
wangliwen
|
f5c66771be
|
Merge branch 'master' into docker_package
|
2022-08-17 11:17:08 +08:00 |
wangliwen
|
b7ce167d5f
|
增加取消置顶接口
|
2022-08-17 11:16:34 +08:00 |
wangliwen
|
37adee5850
|
Merge branch 'master' into docker_package
|
2022-08-17 11:05:59 +08:00 |
huangweixiong
|
9bcdd78bae
|
网关重启适配
|
2022-08-17 11:04:49 +08:00 |
wangliwen
|
45cf2f747f
|
Merge branch 'master' into docker_package
|
2022-08-17 11:02:43 +08:00 |
huangweixiong
|
98a18a1ddd
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform: (25 commits)
置顶存在缓存
...
会议室预约的表描述字段扩增
菜单新增会议室
会议室预约的新增表
能力广场和能力集市资源排序按指定方式排序修改 门户首页最新,最热查询排除知识库
total 排序将置顶放前面
...
能力广场和能力集市资源排序按指定方式排序
npe
...
npe
npe
归并为一个排序
屮
...
...
屮
stream 的排序模式
。。。
...
|
2022-08-17 11:01:16 +08:00 |
huangweixiong
|
ebe3d33994
|
适配网关重启
|
2022-08-17 11:00:59 +08:00 |
wangliwen
|
5d83ef8fd2
|
Merge branch 'master' into docker_package
|
2022-08-17 10:17:21 +08:00 |
wangliwen
|
1f7d1e69db
|
置顶存在缓存
|
2022-08-17 10:17:02 +08:00 |
wangliwen
|
5c1a887024
|
Merge branch 'master' into docker_package
|
2022-08-17 09:13:27 +08:00 |
wangliwen
|
afbfd42c07
|
...
|
2022-08-17 09:13:05 +08:00 |
zhangzhikang
|
3697fbf5ee
|
会议室预约的表描述字段扩增
|
2022-08-16 17:39:34 +08:00 |
wangliwen
|
6470c2e3fb
|
Merge branch 'master' into docker_package
|
2022-08-16 17:35:57 +08:00 |
wangliwen
|
74888c915b
|
Merge branch 'master' into docker_package
|
2022-08-16 14:00:10 +08:00 |
dinggang
|
1e5231a197
|
菜单新增会议室
|
2022-08-16 13:59:13 +08:00 |
zhangzhikang
|
b780ea9ad8
|
会议室预约的新增表
|
2022-08-16 14:02:48 +08:00 |
wangliwen
|
16a06c51a5
|
Merge branch 'master' into docker_package
|
2022-08-16 10:55:17 +08:00 |
dinggang
|
408baba4af
|
能力广场和能力集市资源排序按指定方式排序修改
门户首页最新,最热查询排除知识库
|
2022-08-16 10:26:47 +08:00 |
wangliwen
|
4b657ea0d3
|
Merge branch 'master' into docker_package
|
2022-08-16 10:18:15 +08:00 |
wangliwen
|
42d7d1a27c
|
total 排序将置顶放前面
|
2022-08-16 10:17:37 +08:00 |
wangliwen
|
367a70209c
|
Merge branch 'master' into docker_package
|
2022-08-15 18:56:34 +08:00 |
wangliwen
|
4000c2d30e
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-15 18:56:17 +08:00 |
wangliwen
|
fb1eaef889
|
...
|
2022-08-15 18:56:04 +08:00 |
dinggang
|
9e362f3ae9
|
能力广场和能力集市资源排序按指定方式排序
|
2022-08-15 18:55:05 +08:00 |
wangliwen
|
e93234e7ec
|
Merge branch 'master' into docker_package
|
2022-08-15 18:45:20 +08:00 |
wangliwen
|
8574f26607
|
npe
|
2022-08-15 18:44:57 +08:00 |
wangliwen
|
64d7563cb2
|
Merge branch 'master' into docker_package
|
2022-08-15 18:37:23 +08:00 |
wangliwen
|
6a9ae0e939
|
...
|
2022-08-15 18:37:10 +08:00 |
wangliwen
|
b0e7330961
|
Merge branch 'master' into docker_package
|
2022-08-15 18:19:17 +08:00 |
wangliwen
|
469a0d9d32
|
npe
|
2022-08-15 18:18:44 +08:00 |
wangliwen
|
29adf34a3e
|
Merge branch 'master' into docker_package
|
2022-08-15 18:12:32 +08:00 |
wangliwen
|
d79578665f
|
npe
|
2022-08-15 18:12:18 +08:00 |
wangliwen
|
26f194e914
|
Merge branch 'master' into docker_package
|
2022-08-15 18:01:21 +08:00 |
wangliwen
|
d7b4075e7f
|
归并为一个排序
|
2022-08-15 18:01:09 +08:00 |
wangliwen
|
a75dc249c9
|
屮
|
2022-08-15 17:47:33 +08:00 |
wangliwen
|
0e18c338e8
|
Merge branch 'master' into docker_package
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
|
2022-08-15 17:39:45 +08:00 |
wangliwen
|
4fa7825bcd
|
...
|
2022-08-15 17:37:48 +08:00 |
wangliwen
|
3430e57229
|
。。。
|
2022-08-15 17:28:08 +08:00 |
wangliwen
|
b07798e6af
|
。。。
|
2022-08-15 17:16:27 +08:00 |
wangliwen
|
ec9b9cad87
|
Merge branch 'master' into docker_package
|
2022-08-15 17:05:47 +08:00 |
wangliwen
|
6e9868e0f7
|
...
|
2022-08-15 17:05:33 +08:00 |
wangliwen
|
7ef59e72bb
|
Merge branch 'master' into docker_package
|
2022-08-15 16:51:09 +08:00 |
wangliwen
|
4b308ed69f
|
屮
|
2022-08-15 16:50:52 +08:00 |
wangliwen
|
7f8cd71ad1
|
Merge branch 'master' into docker_package
|
2022-08-15 16:34:48 +08:00 |
wangliwen
|
a8cd7f8436
|
stream 的排序模式
|
2022-08-15 16:34:11 +08:00 |
wangliwen
|
1198ca9a09
|
Merge branch 'master' into docker_package
|
2022-08-15 16:11:20 +08:00 |
wangliwen
|
5b63e648e2
|
。。。
|
2022-08-15 16:11:06 +08:00 |
wangliwen
|
37251fa0d8
|
Merge branch 'master' into docker_package
|
2022-08-15 16:03:32 +08:00 |
wangliwen
|
a26819491d
|
屮
|
2022-08-15 16:03:20 +08:00 |
wangliwen
|
00327fc8a1
|
Merge branch 'master' into docker_package
|
2022-08-15 15:47:21 +08:00 |
wangliwen
|
bda6596caa
|
....
|
2022-08-15 15:47:06 +08:00 |
wangliwen
|
7a7c81194e
|
Merge branch 'master' into docker_package
|
2022-08-15 15:30:07 +08:00 |
wangliwen
|
9565b4fe82
|
结果分页的排序
|
2022-08-15 15:29:54 +08:00 |
wangliwen
|
638105a035
|
Merge branch 'master' into docker_package
|
2022-08-15 15:17:13 +08:00 |
wangliwen
|
b3b4ca16a6
|
屮
|
2022-08-15 15:16:59 +08:00 |
wangliwen
|
107ef702b0
|
Merge branch 'master' into docker_package
|
2022-08-15 15:09:18 +08:00 |
wangliwen
|
ce881d43de
|
total排序时,置顶优于total
|
2022-08-15 15:08:20 +08:00 |
huangweixiong
|
ed20fbd0a4
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
补充置顶状态与置顶时间
屮
全局搜索统计各类型能力数量
...
..
..
增加置顶接口
排序修改
sql
...
增加能力置顶字段
parallelStream 使用自定义 ForkJoinPool防止任务堆积
屮
...
...
会议室功能后端开发
|
2022-08-15 14:07:41 +08:00 |
huangweixiong
|
d5ca1cee4c
|
网关配置ip与监控ip分开
|
2022-08-15 14:07:22 +08:00 |
wangliwen
|
e1bf97ff70
|
Merge branch 'master' into docker_package
|
2022-08-15 10:48:24 +08:00 |
wangliwen
|
42f5f3e46a
|
补充置顶状态与置顶时间
|
2022-08-15 10:48:10 +08:00 |
wangliwen
|
cf13470a00
|
Merge branch 'master' into docker_package
|
2022-08-15 10:23:39 +08:00 |
wangliwen
|
61995e999e
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-15 10:23:23 +08:00 |
wangliwen
|
5b5ec4d05d
|
屮
|
2022-08-15 10:23:10 +08:00 |
dinggang
|
2241e2808d
|
全局搜索统计各类型能力数量
|
2022-08-15 09:30:39 +08:00 |
wangliwen
|
22a066e319
|
Merge branch 'master' into docker_package
|
2022-08-12 17:48:10 +08:00 |
wangliwen
|
e602317a7a
|
...
|
2022-08-12 17:47:53 +08:00 |
wangliwen
|
9e6b0d4ecd
|
Merge branch 'master' into docker_package
|
2022-08-12 17:37:29 +08:00 |
dinggang
|
c7ff499956
|
..
|
2022-08-12 17:35:04 +08:00 |
wangliwen
|
f33f32161e
|
Merge branch 'master' into docker_package
|
2022-08-12 17:22:24 +08:00 |
dinggang
|
ce07b0ea32
|
..
|
2022-08-12 17:21:35 +08:00 |
wangliwen
|
f823e24e6c
|
Merge branch 'master' into docker_package
|
2022-08-12 17:18:59 +08:00 |
wangliwen
|
81e13e7824
|
Merge branch 'master' into dev
|
2022-08-12 17:18:43 +08:00 |
wangliwen
|
7d4f3cdb57
|
增加置顶接口
|
2022-08-12 17:18:20 +08:00 |
dinggang
|
e51668cc4d
|
排序修改
|
2022-08-12 16:58:35 +08:00 |
wangliwen
|
c6c63b05c5
|
Merge branch 'master' into docker_package
|
2022-08-12 16:30:01 +08:00 |
wangliwen
|
6e7c224109
|
sql
|
2022-08-12 16:29:48 +08:00 |
wangliwen
|
20436f27dc
|
Merge branch 'master' into docker_package
|
2022-08-12 16:26:37 +08:00 |
wangliwen
|
ab11836c23
|
...
|
2022-08-12 16:26:22 +08:00 |
wangliwen
|
d07ec6d360
|
Merge branch 'master' into docker_package
|
2022-08-12 16:13:04 +08:00 |
wangliwen
|
2ccc878eda
|
增加能力置顶字段
|
2022-08-12 16:12:50 +08:00 |
wangliwen
|
4692653705
|
Merge branch 'master' into docker_package
|
2022-08-12 14:11:51 +08:00 |
wangliwen
|
f45e3ea2f4
|
parallelStream 使用自定义 ForkJoinPool防止任务堆积
|
2022-08-12 14:11:34 +08:00 |
wangliwen
|
05f6d8fb5f
|
Merge branch 'master' into docker_package
|
2022-08-12 10:41:29 +08:00 |
wangliwen
|
8980f61b1c
|
屮
|
2022-08-12 10:41:11 +08:00 |
wangliwen
|
32b7d27772
|
Merge branch 'master' into docker_package
|
2022-08-11 14:56:28 +08:00 |
dinggang
|
f6509b5e19
|
...
|
2022-08-11 14:55:20 +08:00 |
wangliwen
|
a27757f18c
|
Merge branch 'master' into docker_package
|
2022-08-11 14:21:53 +08:00 |
dinggang
|
4aee184562
|
...
|
2022-08-11 14:02:35 +08:00 |
wangliwen
|
60e20399c0
|
Merge branch 'master' into docker_package
|
2022-08-11 11:31:35 +08:00 |
zhangzhikang
|
6b98b44d48
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-11 09:27:35 +08:00 |
zhangzhikang
|
e4ba0fcbea
|
会议室功能后端开发
|
2022-08-11 09:20:29 +08:00 |
lizhicheng
|
a01ecfc0fb
|
融合服务接口优化
|
2022-08-10 19:43:17 +08:00 |
dinggang
|
65dc6fae91
|
...
|
2022-08-10 14:02:19 +08:00 |
huangweixiong
|
201a092ed0
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
能力广场-应用资源列表查询
编目更新
|
2022-08-10 11:56:10 +08:00 |
huangweixiong
|
bbefe4fff1
|
增加网关注册接口
|
2022-08-10 11:55:54 +08:00 |
wangliwen
|
4c5d961b65
|
Merge branch 'master' into docker_package
|
2022-08-09 17:11:26 +08:00 |
dinggang
|
0f493bb87c
|
能力广场-应用资源列表查询
|
2022-08-09 16:52:04 +08:00 |
wangliwen
|
d5a0859a1a
|
Merge branch 'master' into docker_package
|
2022-08-09 10:03:59 +08:00 |
dinggang
|
1dee7f1edc
|
编目更新
|
2022-08-09 10:02:53 +08:00 |
wangliwen
|
0d9092ed99
|
Merge branch 'master' into docker_package
|
2022-08-08 18:02:35 +08:00 |
huangweixiong
|
b071097e96
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
管理系统-工作台-部门待办列表查询及部门已办列表查询新增申请用户所在部门及申请内容字段
|
2022-08-08 16:48:12 +08:00 |
huangweixiong
|
51fac0eb09
|
网关测试用接口
|
2022-08-08 16:45:46 +08:00 |
wangliwen
|
f8d3af0dc0
|
Merge branch 'master' into docker_package
|
2022-08-08 16:26:25 +08:00 |
dinggang
|
a94fce5066
|
管理系统-工作台-部门待办列表查询及部门已办列表查询新增申请用户所在部门及申请内容字段
|
2022-08-08 15:36:33 +08:00 |
huangweixiong
|
1e8c970c39
|
能力挂接注册网关
|
2022-08-08 15:17:03 +08:00 |
wangliwen
|
f590c05463
|
Merge branch 'master' into docker_package
|
2022-08-08 14:47:31 +08:00 |
wangliwen
|
f7af710466
|
npe
|
2022-08-08 14:47:15 +08:00 |
wangliwen
|
693fbe9a5b
|
Merge branch 'master' into docker_package
|
2022-08-08 10:46:27 +08:00 |
wangliwen
|
33c2b30a60
|
...
|
2022-08-08 10:46:13 +08:00 |
wangliwen
|
f0eb0e7740
|
Merge branch 'master' into docker_package
|
2022-08-08 09:59:00 +08:00 |
wangliwen
|
c1cd6de9e3
|
屮
|
2022-08-08 09:58:47 +08:00 |
wangliwen
|
f07753a143
|
Merge branch 'master' into docker_package
|
2022-08-08 09:44:12 +08:00 |
wangliwen
|
4d53ef4c99
|
TODO 异步优化
|
2022-08-08 09:43:57 +08:00 |
wangliwen
|
3de584e7e3
|
Merge branch 'master' into docker_package
|
2022-08-06 09:48:59 +08:00 |
wangliwen
|
50696e2617
|
新赋予部门审批人权限用户分配审批去啊权重更大
|
2022-08-06 09:48:45 +08:00 |
wangliwen
|
8d15d7efc9
|
Merge branch 'master' into docker_package
|
2022-08-05 18:06:06 +08:00 |
dinggang
|
e5da46fd4d
|
sql更新
|
2022-08-05 17:34:53 +08:00 |
wangliwen
|
3f2a769542
|
Merge branch 'master' into docker_package
|
2022-08-05 17:15:05 +08:00 |
wangliwen
|
b9a489beac
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-05 17:14:49 +08:00 |
wangliwen
|
16df18cddf
|
异步处理 能力申请
|
2022-08-05 17:14:44 +08:00 |
yitonglei
|
20c73efac5
|
修改ResourceDao.xml的selectByAppArea,增加了条件 AND tda.attr_type = '应用领域'
|
2022-08-05 15:10:27 +08:00 |
wangliwen
|
0d50ad1e4b
|
Merge branch 'master' into docker_package
|
2022-08-05 12:48:21 +08:00 |
wangliwen
|
1047569a77
|
。。。
|
2022-08-05 12:48:03 +08:00 |
wangliwen
|
da785822e0
|
Merge branch 'master' into docker_package
|
2022-08-05 11:56:44 +08:00 |
wangliwen
|
36ad699d38
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-05 11:56:26 +08:00 |
wangliwen
|
c065c04703
|
资源部门被删
|
2022-08-05 11:56:16 +08:00 |
dinggang
|
603d107b65
|
...
|
2022-08-05 10:41:55 +08:00 |
wangliwen
|
45718e5a35
|
Merge branch 'master' into docker_package
|
2022-08-05 10:25:42 +08:00 |
wangliwen
|
0666081fdc
|
Merge branch 'dev'
|
2022-08-05 10:25:20 +08:00 |
wangliwen
|
166fe05195
|
。。。
|
2022-08-05 10:25:00 +08:00 |
dinggang
|
8953cbd867
|
减少日志输出
|
2022-08-05 09:59:47 +08:00 |
wangliwen
|
d3f92adacc
|
Merge branch 'master' into docker_package
|
2022-08-05 09:46:46 +08:00 |
wangliwen
|
a1bbd95591
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-05 09:46:19 +08:00 |
wangliwen
|
e4736d2ac4
|
部门审批人用户状态被停用时,流程不再分配给该用户
|
2022-08-05 09:46:09 +08:00 |
dinggang
|
a0901114ec
|
..
|
2022-08-05 09:18:29 +08:00 |
wangliwen
|
8cb3d5bea5
|
Merge branch 'master' into docker_package
|
2022-08-05 09:09:29 +08:00 |
wangliwen
|
5023c7f288
|
屮
|
2022-08-05 09:09:14 +08:00 |
wangliwen
|
01242fb6f0
|
Merge branch 'master' into docker_package
|
2022-08-04 17:41:11 +08:00 |
huangweixiong
|
086c9ff165
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
主动终止时 驳回置false
getByApplyFlag增加backToFirst标识
驳回重复通知
|
2022-08-04 17:24:49 +08:00 |
huangweixiong
|
082a6612ec
|
开启网关数据同步
|
2022-08-04 17:24:25 +08:00 |
wangliwen
|
b9b88cf135
|
Merge branch 'master' into docker_package
|
2022-08-04 11:21:14 +08:00 |
wangliwen
|
f2c55b7718
|
主动终止时 驳回置false
|
2022-08-04 10:57:36 +08:00 |
wangliwen
|
44226924de
|
切换docker打包服务器
|
2022-08-04 10:55:34 +08:00 |
wangliwen
|
d63a28e73e
|
Merge branch 'master' into docker_package
|
2022-08-04 10:17:06 +08:00 |
wangliwen
|
c728ff3960
|
getByApplyFlag增加backToFirst标识
|
2022-08-04 10:16:51 +08:00 |
wangliwen
|
a1465d0e9a
|
Merge branch 'master' into docker_package
|
2022-08-03 18:40:25 +08:00 |
wangliwen
|
f47682c7f3
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-03 18:40:04 +08:00 |
wangliwen
|
aa482a8fb8
|
Merge branch 'master' into docker_package
|
2022-08-03 18:39:33 +08:00 |
wangliwen
|
0753dcf27c
|
驳回重复通知
|
2022-08-03 18:39:18 +08:00 |
huangweixiong
|
359e49f7db
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
...
|
2022-08-03 18:06:50 +08:00 |
wangliwen
|
cf534258f7
|
Merge branch 'master' into docker_package
|
2022-08-03 18:05:35 +08:00 |
wangliwen
|
ec2b030a30
|
...
|
2022-08-03 18:05:20 +08:00 |
huangweixiong
|
ebfbe769a6
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
资源上架异常
。。。
pageWithAttrs补充返回approveStatus字段值
。。。
配置文件新增默认审批人id
管理系统-用户管理-列表查询新增根据用户姓名模糊查询
被驳回 消息通知
被驳回时发送消息通知
|
2022-08-03 18:05:05 +08:00 |
huangweixiong
|
8e69ca0526
|
网关总数同步
|
2022-08-03 18:04:47 +08:00 |
wangliwen
|
357ad936f2
|
Merge branch 'master' into docker_package
|
2022-08-03 17:49:20 +08:00 |
wangliwen
|
c27816d13a
|
资源上架异常
|
2022-08-03 17:49:04 +08:00 |
wangliwen
|
0c2409488a
|
Merge branch 'master' into docker_package
|
2022-08-03 16:50:13 +08:00 |
wangliwen
|
6159b3b1ba
|
。。。
|
2022-08-03 16:49:52 +08:00 |
wangliwen
|
a09db3a28e
|
Merge branch 'master' into docker_package
|
2022-08-03 16:39:49 +08:00 |
wangliwen
|
654ef21298
|
pageWithAttrs补充返回approveStatus字段值
|
2022-08-03 16:39:33 +08:00 |
wangliwen
|
7d634eefdf
|
Merge branch 'master' into docker_package
|
2022-08-03 16:28:34 +08:00 |
wangliwen
|
d59ebd507b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-03 16:28:18 +08:00 |
wangliwen
|
8b40e077d1
|
。。。
|
2022-08-03 16:27:54 +08:00 |
dinggang
|
d945bad3a5
|
配置文件新增默认审批人id
|
2022-08-03 16:26:04 +08:00 |
wangliwen
|
6425515e28
|
Merge branch 'master' into docker_package
|
2022-08-03 15:51:25 +08:00 |
dinggang
|
d0c8b4ae5f
|
管理系统-用户管理-列表查询新增根据用户姓名模糊查询
|
2022-08-03 15:22:03 +08:00 |
wangliwen
|
380cf848e3
|
Merge branch 'master' into docker_package
|
2022-08-03 15:10:03 +08:00 |
wangliwen
|
46ccea4556
|
被驳回 消息通知
|
2022-08-03 15:09:49 +08:00 |
wangliwen
|
f091b24110
|
Merge branch 'master' into docker_package
|
2022-08-03 14:41:39 +08:00 |
wangliwen
|
527266a9b5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-03 14:41:08 +08:00 |
wangliwen
|
1ec9b2db5c
|
被驳回时发送消息通知
|
2022-08-03 14:40:42 +08:00 |
huangweixiong
|
259f1b757a
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
..
1、修改获取基础设施-视频资源的相关sql操作的表为cache表
发起者终止流程
存在欺诈行为?
npe
删除所有运行中的流程接口
...
npe
屮
..
。。。
???
用户主动终止流程
1.编目更新 2.工作台部门待办列表查询增加申请人姓名bugfix
通过实例id 终止流程
1、修改因为合并代码出现的基础设施-视频资源,点击左侧树报错的问题,原因是sql语句去组织cache表中查询了
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
..
超级管理员挂载能力时 无部门id问题
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/gateway/service/MonitorServiceV2.java
|
2022-08-03 14:27:30 +08:00 |
huangweixiong
|
04db7c6dc5
|
网关重启数据失效适配
|
2022-08-03 14:24:35 +08:00 |
dinggang
|
af5e237b3d
|
..
|
2022-08-03 11:04:53 +08:00 |
wangliwen
|
e803835bbf
|
Merge branch 'master' into docker_package
|
2022-08-03 09:14:14 +08:00 |
yitonglei
|
975d6654ce
|
1、修改获取基础设施-视频资源的相关sql操作的表为cache表
|
2022-08-02 18:13:25 +08:00 |
wangliwen
|
b359c02bcc
|
Merge branch 'master' into docker_package
|
2022-08-02 16:59:03 +08:00 |
wangliwen
|
d0df922c62
|
发起者终止流程
|
2022-08-02 16:58:48 +08:00 |
wangliwen
|
1fba85a1aa
|
Merge branch 'master' into docker_package
|
2022-08-02 15:56:14 +08:00 |
wangliwen
|
a04745eaab
|
存在欺诈行为?
|
2022-08-02 15:55:58 +08:00 |
wangliwen
|
f4a36e8a22
|
Merge branch 'master' into docker_package
|
2022-08-02 15:41:23 +08:00 |
wangliwen
|
d170f9c177
|
npe
|
2022-08-02 15:40:46 +08:00 |
wangliwen
|
3074526828
|
Merge branch 'master' into docker_package
|
2022-08-02 15:32:25 +08:00 |
wangliwen
|
95989cc59c
|
删除所有运行中的流程接口
|
2022-08-02 15:32:08 +08:00 |
wangliwen
|
4606a21ab3
|
Merge branch 'master' into docker_package
|
2022-08-02 15:08:17 +08:00 |
wangliwen
|
d96f797813
|
...
|
2022-08-02 15:08:01 +08:00 |
wangliwen
|
06fc61a4fe
|
Merge branch 'master' into docker_package
|
2022-08-02 14:50:22 +08:00 |
wangliwen
|
cbd91df644
|
npe
|
2022-08-02 14:49:03 +08:00 |
wangliwen
|
a652a9a03b
|
Merge branch 'master' into docker_package
|
2022-08-02 14:09:14 +08:00 |
wangliwen
|
bbf677b513
|
屮
|
2022-08-02 14:08:57 +08:00 |
wangliwen
|
9d6df94f63
|
Merge branch 'master' into docker_package
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java
|
2022-08-02 13:48:30 +08:00 |
wangliwen
|
ef450bbf01
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-02 13:46:03 +08:00 |
dinggang
|
508c73df6b
|
..
|
2022-08-02 13:45:31 +08:00 |
wangliwen
|
d21c3b7099
|
。。。
|
2022-08-02 13:44:53 +08:00 |
wangliwen
|
7a15b30d26
|
Merge branch 'master' into docker_package
|
2022-08-02 12:00:58 +08:00 |
wangliwen
|
6a12463098
|
???
|
2022-08-02 12:00:40 +08:00 |
wangliwen
|
1c067cde9f
|
Merge branch 'master' into docker_package
|
2022-08-02 11:29:50 +08:00 |
wangliwen
|
621920daf9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-02 11:29:32 +08:00 |
wangliwen
|
d5fd0d2858
|
用户主动终止流程
|
2022-08-02 11:29:24 +08:00 |
dinggang
|
8f183162b5
|
1.编目更新
2.工作台部门待办列表查询增加申请人姓名bugfix
|
2022-08-02 10:39:32 +08:00 |
wangliwen
|
390828b619
|
Merge branch 'master' into docker_package
|
2022-08-02 09:29:06 +08:00 |
wangliwen
|
fe7b406f52
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-02 09:28:35 +08:00 |
wangliwen
|
5174a75b35
|
通过实例id 终止流程
|
2022-08-02 09:28:12 +08:00 |
yitonglei
|
95eb94f885
|
1、修改因为合并代码出现的基础设施-视频资源,点击左侧树报错的问题,原因是sql语句去组织cache表中查询了
|
2022-08-02 09:23:13 +08:00 |
wangliwen
|
ea27fa60b1
|
Merge branch 'master' into docker_package
|
2022-08-02 08:53:20 +08:00 |
yitonglei
|
ca9133004a
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-01 16:17:54 +08:00 |
dinggang
|
4d8f0c63ae
|
..
|
2022-08-01 16:11:59 +08:00 |
wangliwen
|
3d9ccca9c3
|
Merge branch 'master' into docker_package
|
2022-08-01 14:41:20 +08:00 |
wangliwen
|
bb3d25d62f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-08-01 14:40:48 +08:00 |
wangliwen
|
89821d9d55
|
Merge branch 'master' into docker_package
|
2022-08-01 14:37:21 +08:00 |
wangliwen
|
124940fc04
|
超级管理员挂载能力时 无部门id问题
|
2022-08-01 14:36:59 +08:00 |
huangweixiong
|
a4e6dad451
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform: (80 commits)
1.配置文件修改 2.融合服务bugfix
1、修改大数据局配置文件,在最后增加了一个同步label标签表的数据库连接 2、简单修改了获取视频资源的部分代码
1、flyway提交的sql改版本号为4.4
配置文件修改
西海岸基础设施视频资源来源修改
西海岸基础设施视频资源来源修改
1、增加获取视频资源过程中2张缓存表的定义
..
融合服务完善
1、代码注释的修改
..
no message
1、自动获取视频资源部门和通道信息过程中所使用的RestTemplate不使用框架定义的而使用新定义的(主要是重新配置超时时间)
..
1、根据新的流程重新梳理获取视频资源(地区和通道信息)
西海岸基础设施需求修改
发送站内信 加点异常日志
发送站内信There is no session 的处理
bugfix
bugfix
...
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/processForm/listener/v2/CorrectionListenerV2.java
# renren-admin/src/main/java/io/renren/modules/processForm/service/ApiGatewayService.java
# renren-admin/src/main/resources/application-prod.yml
|
2022-08-01 14:33:05 +08:00 |
huangweixiong
|
9279ecf139
|
网关第二次对接
|
2022-08-01 11:41:12 +08:00 |
wangliwen
|
5a14646104
|
Merge branch 'master' into docker_package
|
2022-08-01 11:35:47 +08:00 |
dinggang
|
8b51c0f378
|
1.配置文件修改
2.融合服务bugfix
|
2022-08-01 11:22:29 +08:00 |
yitonglei
|
8628a34b1e
|
1、修改大数据局配置文件,在最后增加了一个同步label标签表的数据库连接
2、简单修改了获取视频资源的部分代码
|
2022-08-01 11:02:26 +08:00 |
huangweixiong
|
61898cbcdc
|
修复没有满足网关申请数据时的审批标注
|
2022-08-01 11:02:00 +08:00 |
wangliwen
|
a0a4e0fb7f
|
调整ip
|
2022-08-01 10:15:04 +08:00 |
wangliwen
|
8ea4e4fbe4
|
Merge branch 'master' into docker_package
|
2022-08-01 10:14:07 +08:00 |
wangliwen
|
b68daeda1c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-08-01 10:13:33 +08:00 |
yitonglei
|
ff3e590dda
|
1、flyway提交的sql改版本号为4.4
|
2022-08-01 10:04:45 +08:00 |
dinggang
|
00651bc910
|
配置文件修改
|
2022-08-01 10:00:40 +08:00 |
dinggang
|
bb13969a1a
|
西海岸基础设施视频资源来源修改
|
2022-08-01 09:56:31 +08:00 |
dinggang
|
0e6984fb85
|
西海岸基础设施视频资源来源修改
|
2022-07-30 18:53:36 +08:00 |
wangliwen
|
a26fce4ddb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-29 18:04:09 +08:00 |
wangliwen
|
1d12345410
|
Merge remote-tracking branch '备份/dev' into docker_package
|
2022-07-29 18:03:49 +08:00 |
wangliwen
|
7421c08dc8
|
Merge remote-tracking branch 'origin/dev' into docker_package
|
2022-07-29 18:03:41 +08:00 |
yitonglei
|
e1327c7fee
|
1、增加获取视频资源过程中2张缓存表的定义
|
2022-07-29 17:57:29 +08:00 |
dinggang
|
4760fa1898
|
..
|
2022-07-29 17:52:26 +08:00 |
lizhicheng
|
b525a1d50a
|
融合服务完善
|
2022-07-29 16:48:23 +08:00 |
wangliwen
|
bd7e3848a4
|
Merge branch 'master' into docker_package
|
2022-07-29 13:55:16 +08:00 |
wangliwen
|
79807f44e2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-29 13:55:00 +08:00 |
yitonglei
|
c874e7f9cf
|
1、代码注释的修改
|
2022-07-29 12:05:22 +08:00 |
dinggang
|
20c21aabf7
|
..
|
2022-07-29 11:30:17 +08:00 |
yitonglei
|
353485ee04
|
no message
|
2022-07-29 11:30:09 +08:00 |
yitonglei
|
63125fa2c5
|
1、自动获取视频资源部门和通道信息过程中所使用的RestTemplate不使用框架定义的而使用新定义的(主要是重新配置超时时间)
|
2022-07-29 11:29:18 +08:00 |
dinggang
|
52c4715b8f
|
..
|
2022-07-29 10:43:29 +08:00 |
wangliwen
|
a218187d9c
|
Merge branch 'master' into docker_package
|
2022-07-29 09:59:06 +08:00 |
yitonglei
|
0ccdf069f8
|
1、根据新的流程重新梳理获取视频资源(地区和通道信息)
|
2022-07-29 09:31:47 +08:00 |
wangliwen
|
e0d48f1f3d
|
Merge branch 'master' into docker_package
|
2022-07-28 20:06:48 +08:00 |
dinggang
|
7586127226
|
西海岸基础设施需求修改
|
2022-07-28 20:03:59 +08:00 |
wangliwen
|
648ce5ced7
|
Merge branch 'dev' into docker_package
|
2022-07-28 19:01:03 +08:00 |
wangliwen
|
e74cc546f1
|
发送站内信 加点异常日志
|
2022-07-28 19:00:55 +08:00 |
wangliwen
|
41b80c5772
|
Merge branch 'master' into docker_package
|
2022-07-28 17:41:20 +08:00 |
wangliwen
|
fdbf32c47c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-28 17:41:05 +08:00 |
wangliwen
|
47888777f8
|
发送站内信There is no session 的处理
|
2022-07-28 17:40:52 +08:00 |
dinggang
|
0628d738c4
|
bugfix
|
2022-07-28 17:30:13 +08:00 |
dinggang
|
645368398d
|
bugfix
|
2022-07-28 16:55:04 +08:00 |
wangliwen
|
22cb72b0bf
|
Merge branch 'master' into docker_package
|
2022-07-28 16:31:26 +08:00 |
dinggang
|
1f606f0c18
|
1.西海岸基础设施需求修改
2.shiro的jsessionid问题修复V1.0
3.新增基础设施sql导入
|
2022-07-28 16:28:34 +08:00 |
wangliwen
|
311713f895
|
Merge branch 'master' into docker_package
|
2022-07-28 10:44:37 +08:00 |
wangliwen
|
ee1d2550d3
|
...
|
2022-07-28 10:44:11 +08:00 |
wangliwen
|
209303821b
|
。。。
|
2022-07-28 09:33:25 +08:00 |
wangliwen
|
4def91b45f
|
换jdk 17
|
2022-07-28 09:13:42 +08:00 |
wangliwen
|
7bacc9b245
|
Merge branch 'master' into docker_package
|
2022-07-27 17:10:21 +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
|
3281c72fff
|
...
|
2022-07-27 14:20:50 +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 |
wangliwen
|
9b0cbc88e6
|
Merge branch 'master' into docker_package
|
2022-07-22 17:54:29 +08:00 |
wangliwen
|
51ab0f7c78
|
屮
|
2022-07-22 17:54:17 +08:00 |
wangliwen
|
762dccbb91
|
Merge branch 'master' into docker_package
|
2022-07-22 17:35:50 +08:00 |
wangliwen
|
47e873ecab
|
。。。
|
2022-07-22 17:35:29 +08:00 |
wangliwen
|
488b42719f
|
Merge branch 'master' into docker_package
|
2022-07-22 17:21:58 +08:00 |
wangliwen
|
573c55687c
|
能力详情出是否通过
|
2022-07-22 17:21:45 +08:00 |
wangliwen
|
5092055091
|
Merge branch 'master' into docker_package
|
2022-07-22 17:14:03 +08:00 |
wangliwen
|
aad23ca5ee
|
资源详情返回 是否加入申购车
|
2022-07-22 17:11:21 +08:00 |
wangliwen
|
0d6347c964
|
Merge branch 'master' into docker_package
|
2022-07-22 16:47:50 +08:00 |
wangliwen
|
676a1d2e17
|
是否为基础设施的判断
|
2022-07-22 16:47:32 +08:00 |
wangliwen
|
555c023476
|
Merge branch 'master' into docker_package
|
2022-07-22 16:11:40 +08:00 |
wangliwen
|
4a4d21bf87
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-07-22 16:11:22 +08:00 |
wangliwen
|
373af4ba93
|
Merge remote-tracking branch '备份/dev' into docker_package
|
2022-07-22 16:10:43 +08:00 |
wangliwen
|
888e148fb4
|
。。。
|
2022-07-22 16:10:33 +08:00 |
yitonglei
|
72cf26ec72
|
1、能力集市-基础设施页面的列表查询的sql语句增加 check_status 为空的判断
|
2022-07-22 16:06:44 +08:00 |
wangliwen
|
fe3c6bb939
|
Merge branch 'master' into docker_package
|
2022-07-22 15:45:47 +08:00 |
wangliwen
|
6c06060b16
|
Merge branch 'master' into dev
|
2022-07-22 15:45:34 +08:00 |
wangliwen
|
aa54a9a8fc
|
pageWithAttr增加是否加入申购车
|
2022-07-22 15:45:11 +08:00 |
dinggang
|
81b5b28743
|
1.修复金宏环境-能力统计-资源图谱-能力类型-能力集-按照数据资源查数据接口调用错误
|
2022-07-22 14:43:04 +08:00 |
wangliwen
|
0dc2b4eac3
|
Merge branch 'master' into docker_package
|
2022-07-22 13:32:40 +08:00 |
wangliwen
|
c950efc96e
|
已办流程查询流程内参数
|
2022-07-22 13:32:23 +08:00 |
wangliwen
|
05d77742d1
|
Merge branch 'master' into docker_package
|
2022-07-22 12:04:36 +08:00 |
yitonglei
|
375d482ce2
|
1、flyway V4.1 改为V4.2,语句的文件存放地址改为resources/db下
|
2022-07-22 12:03:23 +08:00 |
wangliwen
|
a00131421d
|
Merge branch 'master' into docker_package
|
2022-07-22 11:58:42 +08:00 |
wangliwen
|
7f59e33101
|
Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev
|
2022-07-22 11:57:54 +08:00 |
wangliwen
|
af7c18df12
|
已办任务内出现待办的问题解决
|
2022-07-22 11:57:28 +08:00 |
yitonglei
|
6f72e38a56
|
1、flyway增加V4.1,新增表t_region
2、修改基础设施页面地图中根据区域聚合查询的方法,区市信息以t_region表为准
|
2022-07-22 11:22:39 +08:00 |
wangliwen
|
622da8f4e5
|
Merge branch 'master' into docker_package
|
2022-07-22 10:28:57 +08:00 |
wangliwen
|
1ebd70df03
|
调整mysql 全文索引使用自然语言搜索模式
|
2022-07-22 10:28:37 +08:00 |
wangliwen
|
f3dc7ca4d5
|
Merge branch 'master' into docker_package
|
2022-07-22 08:56:04 +08:00 |
yitonglei
|
fc66ef062b
|
同步摄像头通道信息后删除掉经纬度有空的通道
|
2022-07-21 18:18:26 +08:00 |
wangliwen
|
f41ef8a3ba
|
Merge branch 'master' into docker_package
|
2022-07-21 17:30:31 +08:00 |
wangliwen
|
8de4de904f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-21 17:30:17 +08:00 |
wangliwen
|
1af2b0e48e
|
Merge branch 'master' into docker_package
|
2022-07-21 17:29:38 +08:00 |
wangliwen
|
66ae7d2fe6
|
...
|
2022-07-21 17:29:08 +08:00 |
dinggang
|
6bdd4b3c30
|
1.能力统计部门数统计逻辑修改
|
2022-07-21 17:28:13 +08:00 |
wangliwen
|
aa4b0d3d70
|
Merge branch 'master' into docker_package
|
2022-07-21 16:58:23 +08:00 |
wangliwen
|
92dc144d7d
|
拆单 是否完成
|
2022-07-21 16:58:03 +08:00 |
wangliwen
|
120e5cb13a
|
Merge branch 'master' into docker_package
|
2022-07-21 16:33:34 +08:00 |
wangliwen
|
7bdbecfe63
|
。。。
|
2022-07-21 16:33:20 +08:00 |
wangliwen
|
412ef1cc78
|
拆单审核所有流程是否完成
|
2022-07-21 16:31:22 +08:00 |
wangliwen
|
de73c653b0
|
Merge branch 'master' into docker_package
|
2022-07-21 16:00:20 +08:00 |
wangliwen
|
0ac8ef8940
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-21 15:59:57 +08:00 |
wangliwen
|
544a673f2a
|
...websocket先收到消息?
|
2022-07-21 15:59:36 +08:00 |
dinggang
|
67f8811b21
|
...
|
2022-07-21 15:40:52 +08:00 |
wangliwen
|
20851412a4
|
Merge branch 'master' into docker_package
|
2022-07-21 15:34:13 +08:00 |
wangliwen
|
4b99279d87
|
审核结束消息通知bug与能力申请节点不进入能力申请异常
|
2022-07-21 15:33:59 +08:00 |
wangliwen
|
826f327482
|
Merge branch 'master' into docker_package
|
2022-07-21 15:18:44 +08:00 |
wangliwen
|
6fae1071ff
|
...
|
2022-07-21 15:18:31 +08:00 |
wangliwen
|
53589991ea
|
Merge branch 'master' into docker_package
|
2022-07-21 14:28:08 +08:00 |
wangliwen
|
2b6165be0f
|
websocket 发送站内信通知
|
2022-07-21 14:27:24 +08:00 |
wangliwen
|
3941260b63
|
Merge branch 'master' into docker_package
|
2022-07-21 11:44:46 +08:00 |
wangliwen
|
abbabe2e9a
|
npe
|
2022-07-21 11:44:27 +08:00 |
wangliwen
|
e5c683de8b
|
Merge branch 'master' into docker_package
|
2022-07-21 11:04:29 +08:00 |
wangliwen
|
6a50553545
|
jackson允许出现特殊字符和转义符
|
2022-07-21 11:04:11 +08:00 |
wangliwen
|
20b7a2dccd
|
站内信通知异常
|
2022-07-21 10:54:25 +08:00 |
wangliwen
|
d9de090df4
|
Merge branch 'master' into docker_package
|
2022-07-21 10:41:58 +08:00 |
wangliwen
|
aad70245d8
|
前端无法展示异常信息
|
2022-07-21 10:41:46 +08:00 |
wangliwen
|
0f01dd82a5
|
Merge branch 'master' into docker_package
|
2022-07-21 10:02:49 +08:00 |
wangliwen
|
7e53cac06c
|
Merge branch 'master' into dev
|
2022-07-21 10:02:30 +08:00 |
wangliwen
|
76255c5ff3
|
...
|
2022-07-21 10:02:03 +08:00 |
dinggang
|
55ac3b8a60
|
1.编目更新
2.bugfix
|
2022-07-21 09:51:32 +08:00 |
wangliwen
|
a5278aed91
|
Merge branch 'dev' into docker_package
|
2022-07-21 09:41:07 +08:00 |
wangliwen
|
162b016d36
|
下架支持附件
|
2022-07-21 09:40:55 +08:00 |
wangliwen
|
24207a2843
|
Merge branch 'dev' into docker_package
|
2022-07-21 09:08:22 +08:00 |
dinggang
|
7632d92ac2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-20 18:15:03 +08:00 |
dinggang
|
d7c0fa6dc2
|
1.新增菜单初始化数据sql
2.编目更新
3.bugfix
|
2022-07-20 18:14:34 +08:00 |
wangliwen
|
02322bdbb3
|
Merge branch 'master' into docker_package
|
2022-07-20 18:14:19 +08:00 |
wangliwen
|
935f8f1588
|
...
|
2022-07-20 18:14:05 +08:00 |
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 |
huangweixiong
|
e729b95d2d
|
Merge branch 'master' of http://221.0.232.152:9393/ability-center/share-platform
* 'master' of http://221.0.232.152:9393/ability-center/share-platform: (29 commits)
屮
...
???
。。。
西海岸获取hls流地址更正
增加 根据能力资源id获取该能力申请使用分页接口
申购车模糊查询
.
新增日志清除任务
能力申请全为免批资源时,流程节点默认审核通过
1、 修改flyway 4.0语句
1、同步摄像头标签信息时数据库配置增加默认值
deal with
。。。
屮
dev环境配置文件调整
1、增加同步视频摄像头标签--配置文件
1、手动更新基础设施-摄像头信息后同步monitor_service项目中标签表的信息
deptToDoTaskPage接口优化
...
...
|
2022-07-20 17:00:21 +08:00 |
huangweixiong
|
c925cfdad3
|
线上上产环境配置文件同步
|
2022-07-20 16:57:52 +08:00 |
huangweixiong
|
9c720dff85
|
网关新接口
|
2022-07-20 16:56:54 +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
|
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 |
wangliwen
|
18dad09f8f
|
调整sql
|
2022-07-19 10:34:58 +08:00 |
wangliwen
|
93766456dc
|
Merge branch 'dev' into docker_package
|
2022-07-19 09:56:40 +08:00 |
wangliwen
|
fdf7922d9b
|
。。
|
2022-07-19 09:56:32 +08:00 |
wangliwen
|
ee2e372c1f
|
Merge branch 'dev' into docker_package
|
2022-07-19 09:53:52 +08:00 |
wangliwen
|
916aef738c
|
分页不传ended时的处理
|
2022-07-19 09:53:44 +08:00 |
wangliwen
|
359df7a17b
|
Merge branch 'master' into docker_package
|
2022-07-19 09:26:55 +08:00 |
wangliwen
|
56e20ef9ae
|
...
|
2022-07-19 09:26:39 +08:00 |
wangliwen
|
409b0b3b9b
|
Merge branch 'master' into docker_package
|
2022-07-19 09:04:47 +08:00 |
huangweixiong
|
9b94a3b913
|
我的配置修改
|
2022-07-18 20:51:11 +08:00 |
huangweixiong
|
f6fb190ade
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
。。。屮
门户首页-热门能力筛选去除赋能案例
审核状态不正确的处理
拆单内流程是否完成
屮
1.编目和字典表初始化数据sql 2.bugfix
。。。
批量申请异步处理
。。。
资源所属部门为空时的处理
...
fix bug
批量进行所有应用资源
排除特殊项目配置
|
2022-07-18 20:49:30 +08:00 |
huangweixiong
|
7dce8c0326
|
按部门申请网关
|
2022-07-18 20:48:59 +08:00 |
wangliwen
|
480fdec445
|
Merge branch 'master' into docker_package
|
2022-07-18 18:53:10 +08:00 |
wangliwen
|
3bd433fc1c
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 18:52:50 +08:00 |
wangliwen
|
46576aa4fa
|
Merge branch 'dev' into docker_package
|
2022-07-18 18:52:12 +08:00 |
wangliwen
|
236162b861
|
。。。屮
|
2022-07-18 18:51:59 +08:00 |
dinggang
|
c8afb955a1
|
门户首页-热门能力筛选去除赋能案例
|
2022-07-18 18:39:47 +08:00 |
wangliwen
|
beb8fc93d9
|
Merge branch 'master' into docker_package
|
2022-07-18 18:29:21 +08:00 |
wangliwen
|
56fa006d82
|
审核状态不正确的处理
|
2022-07-18 18:28:25 +08:00 |
wangliwen
|
ac3622a039
|
Merge branch 'master' into docker_package
|
2022-07-18 18:16:56 +08:00 |
wangliwen
|
a503a961e0
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 18:16:26 +08:00 |
wangliwen
|
fd02f8ea2d
|
Merge branch 'master' into docker_package
|
2022-07-18 18:15:05 +08:00 |
wangliwen
|
fe35973785
|
拆单内流程是否完成
|
2022-07-18 18:11:03 +08:00 |
dinggang
|
2b7cf13bfb
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 17:57:55 +08:00 |
dinggang
|
f165418650
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-18 17:54:49 +08:00 |
wangliwen
|
ca1a10c8ae
|
屮
|
2022-07-18 17:54:39 +08:00 |
dinggang
|
474976439b
|
1.编目和字典表初始化数据sql
2.bugfix
|
2022-07-18 17:54:19 +08:00 |
wangliwen
|
b911e4068e
|
。。。
|
2022-07-18 17:47:28 +08:00 |
wangliwen
|
a3e320ea4c
|
Merge branch 'master' into docker_package
|
2022-07-18 17:22:49 +08:00 |
wangliwen
|
115bb063b8
|
批量申请异步处理
|
2022-07-18 17:20:38 +08:00 |
wangliwen
|
76f2f4a323
|
。。。
|
2022-07-18 17:11:09 +08:00 |
wangliwen
|
24d104e904
|
资源所属部门为空时的处理
|
2022-07-18 17:06:56 +08:00 |
wangliwen
|
edf383ab8c
|
...
|
2022-07-18 16:55:37 +08:00 |
wangliwen
|
869e3c9d4c
|
Merge branch 'master' into docker_package
|
2022-07-18 16:37:08 +08:00 |
wangliwen
|
e62756b431
|
fix bug
|
2022-07-18 16:36:28 +08:00 |
wangliwen
|
6a2a13aa20
|
Merge branch 'master' into docker_package
|
2022-07-18 16:12:30 +08:00 |
wangliwen
|
da6901392c
|
批量进行所有应用资源
|
2022-07-18 16:11:21 +08:00 |
wangliwen
|
7cbbc369bb
|
排除特殊项目配置
|
2022-07-18 15:07:10 +08:00 |
wangliwen
|
c2b0982710
|
Merge branch 'master' into docker_package
|
2022-07-18 14:29:52 +08:00 |
wangliwen
|
7cfe1ce192
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-18 14:17:10 +08:00 |
wangliwen
|
adc72fb15d
|
sql文件名调整
|
2022-07-18 14:16:54 +08:00 |
dinggang
|
6420e23271
|
...
|
2022-07-18 13:55:19 +08:00 |
wangliwen
|
175d51aebe
|
Merge branch 'master' into docker_package
|
2022-07-18 13:41:46 +08:00 |
dinggang
|
071233b34e
|
bugfix
|
2022-07-18 12:48:40 +08:00 |
dinggang
|
99ee0fa9a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-18 12:04:52 +08:00 |
wangliwen
|
847a55b79f
|
Merge branch 'master' into docker_package
|
2022-07-18 12:01:11 +08:00 |
wangliwen
|
c4bacec4bd
|
是否申请 bug fix
|
2022-07-18 11:57:01 +08:00 |
wangliwen
|
1338bd64ff
|
模型全量调整
|
2022-07-18 11:02:31 +08:00 |
wangliwen
|
641fcacc17
|
。。。
|
2022-07-18 10:30:46 +08:00 |
wangliwen
|
f5e0bac27d
|
申购车不再只限制出组件服务
|
2022-07-18 10:04:32 +08:00 |
wangliwen
|
8a782ee314
|
Merge branch 'master' into docker_package
|
2022-07-18 09:47:44 +08:00 |
yitonglei
|
2cf7198a09
|
1、配置修改
|
2022-07-18 09:41:32 +08:00 |
yitonglei
|
0c8e905501
|
Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev
|
2022-07-18 09:33:21 +08:00 |
wangliwen
|
8cb469de89
|
。。。
|
2022-07-18 09:26:29 +08:00 |
dinggang
|
9c3623757b
|
Merge branch 'dev' of http://15.2.21.221:3000/wangliwen/share-platform into dev
|
2022-07-18 09:20:53 +08:00 |
dinggang
|
b1be59a581
|
bugfix
|
2022-07-18 09:20:25 +08:00 |
yitonglei
|
89161843d0
|
1、修改能力超市/基础设施的地图下面的列表查询语句,优化查询速度
|
2022-07-15 19:07:37 +08:00 |
wangliwen
|
e335b27933
|
Merge branch 'dev' into docker_package
|
2022-07-15 17:19:42 +08:00 |
wangliwen
|
6b63979594
|
统一okhttp客户端
|
2022-07-15 16:54:33 +08:00 |
wangliwen
|
0d5257c994
|
Merge branch 'dev' into docker_package
|
2022-07-15 16:44:27 +08:00 |
wangliwen
|
c3d971e56d
|
。。。
|
2022-07-15 16:44:14 +08:00 |
wangliwen
|
46b445eba9
|
西海岸视频预览加日志输出
|
2022-07-15 16:35:37 +08:00 |
wangliwen
|
cf0ee02aeb
|
Merge branch 'master' into docker_package
|
2022-07-15 16:29:51 +08:00 |
wangliwen
|
33d2595974
|
设置流水号传参的调整
|
2022-07-15 16:24:19 +08:00 |
wangliwen
|
9cc5b5eda1
|
Merge branch 'master' into docker_package
|
2022-07-15 15:25:43 +08:00 |
wangliwen
|
b8b4623a8f
|
能力申请特殊处理
|
2022-07-15 15:25:12 +08:00 |
wangliwen
|
ad93b162ec
|
Merge branch 'master' into docker_package
|
2022-07-15 12:00:46 +08:00 |
wangliwen
|
4c696eb196
|
...
|
2022-07-15 12:00:29 +08:00 |
wangliwen
|
fe612f5901
|
Merge branch 'dev' into docker_package
|
2022-07-15 11:48:04 +08:00 |
wangliwen
|
87988942fa
|
npe
|
2022-07-15 11:47:40 +08:00 |
wangliwen
|
6af7f2edc1
|
Merge branch 'master' into docker_package
|
2022-07-15 11:27:54 +08:00 |
wangliwen
|
d7a45b2d17
|
...
|
2022-07-15 11:27:35 +08:00 |
wangliwen
|
5707d6948f
|
Merge branch 'master' into docker_package
|
2022-07-15 10:23:10 +08:00 |
wangliwen
|
6ba099605d
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-15 10:12:52 +08:00 |
wangliwen
|
5ef9763cae
|
能力使用申请可用流程是否结束来进行过滤
|
2022-07-15 10:01:10 +08:00 |
yitonglei
|
f24b7070fc
|
1、新增的能力超市/基础设施的地图下面的列表查询语句进行修改
|
2022-07-15 09:53:54 +08:00 |
wangliwen
|
15998bcc48
|
Merge branch 'master' into docker_package
|
2022-07-15 09:17:08 +08:00 |
wangliwen
|
40477d75c4
|
流程流水号生成调整
|
2022-07-15 09:16:49 +08:00 |
wangliwen
|
35d8b7715a
|
Merge branch 'master' into docker_package
|
2022-07-14 18:32:31 +08:00 |
wangliwen
|
5e07068442
|
TODO 写流水号使加锁
|
2022-07-14 18:31:33 +08:00 |
wangliwen
|
22ba83eefe
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 16:17:43 +08:00 |
wangliwen
|
81e41c2449
|
Merge branch 'dev' into docker_package
|
2022-07-14 16:17:24 +08:00 |
wangliwen
|
8cedffa8e7
|
Merge remote-tracking branch 'origin/dev' into docker_package
|
2022-07-14 16:17:18 +08:00 |
wangliwen
|
56316a2ce2
|
。。。补充部门名
|
2022-07-14 16:17:05 +08:00 |
lizhicheng
|
647adaf461
|
初步完成赋能场景、开发文档,融合服务修复
|
2022-07-14 15:37:19 +08:00 |
wangliwen
|
0b87db85d6
|
Merge branch 'master' into docker_package
|
2022-07-14 15:29:45 +08:00 |
dinggang
|
bc44f875b2
|
...
|
2022-07-14 15:19:34 +08:00 |
wangliwen
|
0cdc4b50a1
|
Merge branch 'master' into docker_package
|
2022-07-14 14:45:05 +08:00 |
dinggang
|
5ff1ab946f
|
...
|
2022-07-14 14:44:18 +08:00 |
wangliwen
|
29d8975c87
|
Merge branch 'master' into docker_package
|
2022-07-14 14:13:56 +08:00 |
dinggang
|
c1e165135b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 14:12:51 +08:00 |
dinggang
|
ffd3d24b6a
|
...
|
2022-07-14 14:12:17 +08:00 |
wangliwen
|
23b16f1c3e
|
Merge branch 'master' into docker_package
|
2022-07-14 13:37:31 +08:00 |
wangliwen
|
37e3ca34a8
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 13:37:12 +08:00 |
wangliwen
|
712fdf8265
|
。。
|
2022-07-14 13:37:01 +08:00 |
yitonglei
|
455f5b71d9
|
改
|
2022-07-14 12:54:22 +08:00 |
yitonglei
|
3b0e930aa9
|
1、摄像头根据区域聚合查询的sql修改
|
2022-07-14 12:43:59 +08:00 |
wangliwen
|
85750e766d
|
Merge branch 'master' into docker_package
|
2022-07-14 11:52:31 +08:00 |
dinggang
|
e3f451b375
|
...
|
2022-07-14 11:51:31 +08:00 |
dinggang
|
2bdc46db62
|
...
|
2022-07-14 11:50:45 +08:00 |
wangliwen
|
4e370a94ee
|
Merge branch 'master' into docker_package
|
2022-07-14 11:47:43 +08:00 |
wangliwen
|
dfaeb397da
|
需求评论tip
|
2022-07-14 11:47:29 +08:00 |
wangliwen
|
49ce333723
|
Merge branch 'master' into docker_package
|
2022-07-14 11:39:19 +08:00 |
dinggang
|
311cadef3e
|
...
|
2022-07-14 11:38:30 +08:00 |
wangliwen
|
53798a2e7f
|
Merge branch 'master' into docker_package
|
2022-07-14 11:09:19 +08:00 |
wangliwen
|
74edb1ef0c
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-14 11:08:56 +08:00 |
wangliwen
|
136e4453ce
|
流程记录返回申请单号
|
2022-07-14 11:08:31 +08:00 |
dinggang
|
1a4d495af5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-14 11:02:30 +08:00 |
dinggang
|
861483a477
|
...
|
2022-07-14 11:01:49 +08:00 |
wangliwen
|
e6f2e3e5b2
|
Merge branch 'master' into docker_package
|
2022-07-14 10:43:29 +08:00 |
wangliwen
|
a001fd5963
|
状态
|
2022-07-14 10:41:47 +08:00 |
wangliwen
|
2149d0b5e5
|
Merge branch 'master' into docker_package
|
2022-07-14 09:56:15 +08:00 |
wangliwen
|
92eb9d542e
|
日志
|
2022-07-14 09:55:46 +08:00 |
wangliwen
|
a9c39f4f02
|
Merge branch 'master' into docker_package
|
2022-07-14 09:53:42 +08:00 |
wangliwen
|
5cefbe1a0f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-14 09:53:15 +08:00 |
dinggang
|
cfe6c9f240
|
...
|
2022-07-14 09:52:36 +08:00 |
wangliwen
|
35c938ef3b
|
。。。
|
2022-07-14 09:52:19 +08:00 |
wangliwen
|
4fde0bc273
|
Merge branch 'master' into docker_package
|
2022-07-14 09:37:45 +08:00 |
wangliwen
|
589f03a103
|
使用单例枚举保证流水号工具类为全局单例
|
2022-07-14 09:35:59 +08:00 |
wangliwen
|
75060f9947
|
Merge branch 'master' into docker_package
|
2022-07-14 09:12:38 +08:00 |
wangliwen
|
b27ebec5ba
|
...
|
2022-07-14 09:11:51 +08:00 |
wangliwen
|
3f5934bca6
|
Merge branch 'master' into docker_package
|
2022-07-13 18:48:19 +08:00 |
wangliwen
|
223c449417
|
流水号加锁
|
2022-07-13 18:29:22 +08:00 |
wangliwen
|
c9edff06dd
|
Merge branch 'master' into docker_package
|
2022-07-13 18:15:48 +08:00 |
wangliwen
|
0d61729d4a
|
TODO 流水号生成加锁
|
2022-07-13 18:15:20 +08:00 |
wangliwen
|
c0676abb1b
|
Merge branch 'master' into docker_package
|
2022-07-13 18:12:13 +08:00 |
dinggang
|
8afd024265
|
...
|
2022-07-13 18:11:51 +08:00 |
wangliwen
|
a0a238b894
|
...
|
2022-07-13 18:00:51 +08:00 |
wangliwen
|
c3531a5b8f
|
Merge branch 'master' into docker_package
|
2022-07-13 17:14:23 +08:00 |
wangliwen
|
91355094ee
|
...
|
2022-07-13 16:29:33 +08:00 |
wangliwen
|
c81eb20845
|
能力资源更新infolist
|
2022-07-13 16:16:58 +08:00 |
wangliwen
|
9296dd1ce5
|
申请单号
|
2022-07-13 16:00:32 +08:00 |
wangliwen
|
97d26d9e1a
|
能力申请增加申请时间
|
2022-07-13 15:44:30 +08:00 |
huangweixiong
|
508aef594f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
...
1、新增摄像头聚合展示
普通资源的npe问题
。。。
配置文件的调整
...
|
2022-07-13 15:26:54 +08:00 |
huangweixiong
|
bf8d191f52
|
hwx配置文件更新
|
2022-07-13 15:26:38 +08:00 |
dinggang
|
e5dc75844c
|
...
|
2022-07-13 15:17:10 +08:00 |
yitonglei
|
1290072076
|
1、新增摄像头聚合展示
|
2022-07-13 15:10:02 +08:00 |
wangliwen
|
6e328843a8
|
普通资源的npe问题
|
2022-07-13 15:02:56 +08:00 |
wangliwen
|
2ac2149cf8
|
。。。
|
2022-07-13 12:54:39 +08:00 |
wangliwen
|
ad5e567250
|
配置文件的调整
|
2022-07-13 11:43:34 +08:00 |
wangliwen
|
956d062428
|
...
|
2022-07-13 11:38:24 +08:00 |
wangliwen
|
ce4b2e8310
|
Merge branch 'master' into docker_package
|
2022-07-13 11:08:50 +08:00 |
wangliwen
|
63d23588f5
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-13 11:08:07 +08:00 |
wangliwen
|
218d42ad9b
|
。。。instanceId逆序失效的处理
|
2022-07-13 11:07:24 +08:00 |
huangweixiong
|
99822463e7
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
文案调整
processForm/tabilityapplication/my_page 接口摄像头特殊处理
|
2022-07-13 10:47:43 +08:00 |
huangweixiong
|
af6cc27fcd
|
【单账号多地登录】初版
|
2022-07-13 10:47:23 +08:00 |
wangliwen
|
61ab58b704
|
文案调整
|
2022-07-13 10:47:21 +08:00 |
wangliwen
|
bd13ed4b62
|
文案调整
|
2022-07-13 10:46:09 +08:00 |
wangliwen
|
60f4e1ae14
|
Merge branch 'master' into docker_package
|
2022-07-13 10:20:27 +08:00 |
wangliwen
|
31cdc17236
|
processForm/tabilityapplication/my_page 接口摄像头特殊处理
|
2022-07-13 10:19:46 +08:00 |
wangliwen
|
24cb34d98e
|
Merge branch 'dev' into docker_package
|
2022-07-12 14:56:46 +08:00 |
wangliwen
|
9426860495
|
npe
|
2022-07-12 14:56:31 +08:00 |
wangliwen
|
923bf8b1ca
|
Merge branch 'dev' into docker_package
|
2022-07-12 14:38:30 +08:00 |
dinggang
|
5a603f5cf0
|
...
|
2022-07-12 14:08:53 +08:00 |
wangliwen
|
60d3505364
|
Merge branch 'master' into docker_package
|
2022-07-12 14:03:46 +08:00 |
wangliwen
|
5a2e6727f7
|
...
|
2022-07-12 14:02:40 +08:00 |
wangliwen
|
e0a6369b5a
|
Merge branch 'master' into docker_package
|
2022-07-12 11:38:01 +08:00 |
wangliwen
|
454b0c5ed6
|
处理摄像头
|
2022-07-12 11:36:56 +08:00 |
wangliwen
|
4e063c2408
|
Merge branch 'master' into docker_package
|
2022-07-12 10:43:26 +08:00 |
wangliwen
|
44abdc3c2f
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/processForm/entity/TAbilityApplicationEntity.java
|
2022-07-12 10:42:47 +08:00 |
wangliwen
|
45be93e850
|
根据申请标识获取本次申请详情(信息、流程、部门)
|
2022-07-12 10:40:30 +08:00 |
dinggang
|
4dda8aaf1b
|
1.dev配置mysql空闲回收时间为1分钟
2.操作日志新增操作数据表字段,日志注解增加操作数据表属性,修改涉及到数据修改接口的日志注解
3.ucs编码生成工具类
4.涉及到流程的增加申请单号字段
|
2022-07-12 10:24:51 +08:00 |
wangliwen
|
64e82a94fa
|
Merge branch 'master' into docker_package
|
2022-07-11 18:12:54 +08:00 |
wangliwen
|
15cc666261
|
根据申请标识获取本次申请的分部门申请信息
|
2022-07-11 17:52:43 +08:00 |
wangliwen
|
c27d2c9c78
|
流程流转异常
|
2022-07-11 15:43:40 +08:00 |