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 |
|
huangweixiong
|
1095276517
|
【单账号多地登录】索引删除脚本更新
|
2022-07-13 15:26:13 +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
|
ac8d2de636
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-07-13 11:38:56 +08:00 |
|
wangliwen
|
956d062428
|
...
|
2022-07-13 11:38:24 +08:00 |
|
huangweixiong
|
4cafd42d2e
|
sql文件更版本
|
2022-07-13 11:36:05 +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 |
|
wangliwen
|
b2c7ce5ce6
|
Merge branch 'master' into docker_package
|
2022-07-13 10:48:03 +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 |
|
wangliwen
|
6ac753b68b
|
Merge branch 'master' into docker_package
|
2022-07-11 15:33:57 +08:00 |
|
wangliwen
|
588b41669d
|
resource 更新失败
|
2022-07-11 15:33:23 +08:00 |
|
wangliwen
|
10051778ac
|
Merge branch 'master' into docker_package
|
2022-07-11 15:00:28 +08:00 |
|
wangliwen
|
97cd4bede6
|
sys_dept gson 序列化与反序列化 异常
|
2022-07-11 14:59:41 +08:00 |