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 |
wangliwen
|
447760f509
|
Merge branch 'master' into docker_package
|
2022-07-11 14:33:40 +08:00 |
wangliwen
|
7a15f3ad92
|
同一次批量申请做好标识
|
2022-07-11 14:32:25 +08:00 |
wangliwen
|
bbffe9a6e5
|
Merge branch 'master' into docker_package
|
2022-07-11 13:49:22 +08:00 |
wangliwen
|
e43e86b30b
|
能力下线对各类统计的影响
|
2022-07-11 13:48:49 +08:00 |
wangliwen
|
92ab97f795
|
Merge branch 'master' into docker_package
|
2022-07-11 11:27:45 +08:00 |
wangliwen
|
9abc6bf96e
|
npe
|
2022-07-11 11:27:04 +08:00 |
wangliwen
|
b8de1070fc
|
...
|
2022-07-11 11:08:21 +08:00 |
wangliwen
|
6b5a55881c
|
Merge branch 'master' into docker_package
|
2022-07-11 11:06:46 +08:00 |
wangliwen
|
99a945e33f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2022-07-11 11:03:43 +08:00 |
wangliwen
|
1b46f676f2
|
查询部门信息 by name
|
2022-07-11 11:02:39 +08:00 |
lizhicheng
|
c3737733f7
|
完成融合服务功能开发
|
2022-07-11 09:17:28 +08:00 |
wangliwen
|
da499d088d
|
Merge branch 'master' into docker_package
|
2022-07-08 17:44:44 +08:00 |
wangliwen
|
c7a4e1219c
|
站内信消息通知异常解决
|
2022-07-08 17:44:10 +08:00 |
wangliwen
|
0df88251da
|
...
|
2022-07-08 17:32:17 +08:00 |
wangliwen
|
30e60deda8
|
Merge branch 'dev' into docker_package
|
2022-07-08 17:21:14 +08:00 |
wangliwen
|
510afd01cc
|
。。。
|
2022-07-08 17:20:46 +08:00 |
wangliwen
|
1df08939cb
|
Merge branch 'master' into docker_package
|
2022-07-08 11:30:32 +08:00 |
wangliwen
|
2ab4b169f5
|
。。。
|
2022-07-08 11:29:39 +08:00 |
wangliwen
|
fb1ff312ec
|
Merge branch 'master' into docker_package
|
2022-07-08 11:27:37 +08:00 |
wangliwen
|
76584319d4
|
根据流程定义key获取对应已办任务
|
2022-07-08 11:22:29 +08:00 |
wangliwen
|
fe69f08765
|
Merge branch 'dev' into docker_package
|
2022-07-08 11:00:42 +08:00 |
wangliwen
|
a34e254e79
|
二级缓存策略调整
|
2022-07-08 11:00:17 +08:00 |
wangliwen
|
9fbe1a69e9
|
Merge branch 'master' into docker_package
|
2022-07-08 10:31:39 +08:00 |
wangliwen
|
44dd889936
|
timeout too small.
|
2022-07-08 10:31:08 +08:00 |
wangliwen
|
5a88770943
|
Merge branch 'master' into docker_package
|
2022-07-08 10:13:04 +08:00 |
wangliwen
|
73dd3535bd
|
Merge branch 'master' into dev
|
2022-07-08 10:11:43 +08:00 |
wangliwen
|
90b62a9f8f
|
调整知识库http客户端线程池
|
2022-07-08 10:11:16 +08:00 |
wangliwen
|
486c9b8d02
|
Merge branch 'master' into docker_package
|
2022-07-08 09:38:33 +08:00 |
wangliwen
|
e1329442cb
|
调整pageWithAttrs 接口代码结构
|
2022-07-08 09:37:28 +08:00 |