wangliwen
|
0e4e1b100c
|
Merge branch 'master' into docker_package
|
2022-12-12 10:13:08 +08:00 |
|
wangliwen
|
967ab8642a
|
Merge branch 'dev'
|
2022-12-12 10:13:01 +08:00 |
|
wangliwen
|
31abb2e28c
|
屮
|
2022-12-12 10:12:53 +08:00 |
|
wangliwen
|
8b29639e7c
|
Merge branch 'master' into docker_package
|
2022-12-12 10:04:50 +08:00 |
|
wangliwen
|
3eeee80aaf
|
Merge branch 'dev'
|
2022-12-12 10:04:43 +08:00 |
|
wangliwen
|
3147d1ea2e
|
..
|
2022-12-12 10:04:34 +08:00 |
|
wangliwen
|
eb97a398fe
|
sql文件调整
|
2022-12-12 10:04:25 +08:00 |
|
wangliwen
|
5858237193
|
Merge branch 'master' into docker_package
|
2022-12-12 09:54:58 +08:00 |
|
wangliwen
|
66e0e637d3
|
Merge branch 'dev'
|
2022-12-12 09:54:49 +08:00 |
|
wangliwen
|
871862bd00
|
...
|
2022-12-12 09:54:39 +08:00 |
|
wangliwen
|
82ec4b4da5
|
创建流程审核组成员表
|
2022-12-12 09:54:26 +08:00 |
|
wangliwen
|
33da1c1e17
|
Merge branch 'master' into docker_package
|
2022-12-12 09:05:11 +08:00 |
|
wangliwen
|
cfddb4e1f8
|
Merge branch 'dev'
|
2022-12-12 09:05:03 +08:00 |
 dinggang
|
2059a69538
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
|
2022-12-12 08:42:19 +08:00 |
|
dinggang
|
1e55d1eade
|
..
|
2022-12-12 08:37:22 +08:00 |
|
wangliwen
|
2dca64b91f
|
Merge branch 'master' into docker_package
|
2022-12-10 20:29:04 +08:00 |
|
wangliwen
|
1663277e9c
|
Merge branch 'dev'
|
2022-12-10 20:28:56 +08:00 |
|
wangliwen
|
5c83bfa1da
|
fix npe
|
2022-12-10 20:28:46 +08:00 |
|
wangliwen
|
5c65ca315d
|
Merge branch 'master' into docker_package
|
2022-12-10 20:18:30 +08:00 |
|
wangliwen
|
3228cbd926
|
Merge branch 'dev'
|
2022-12-10 20:18:23 +08:00 |
|
wangliwen
|
035575b45d
|
npe
|
2022-12-10 20:18:14 +08:00 |
|
wangliwen
|
4f563fa48a
|
Merge branch 'master' into docker_package
|
2022-12-10 19:59:27 +08:00 |
|
wangliwen
|
c43b7d9225
|
Merge branch 'dev'
|
2022-12-10 19:59:16 +08:00 |
|
wangliwen
|
439ed6aa61
|
政务云访问异常时统计
|
2022-12-10 19:59:06 +08:00 |
|
dinggang
|
3109a28f06
|
新增依赖
|
2022-12-10 19:22:50 +08:00 |
|
wangliwen
|
2ee00e0d97
|
Merge branch 'master' into docker_package
|
2022-12-10 17:03:29 +08:00 |
|
wangliwen
|
fbb8afce2c
|
Merge branch 'dev'
|
2022-12-10 17:03:22 +08:00 |
|
wangliwen
|
e266885230
|
...
|
2022-12-10 17:03:12 +08:00 |
|
wangliwen
|
3d50a6dd05
|
Merge branch 'master' into docker_package
|
2022-12-10 16:46:37 +08:00 |
|
wangliwen
|
4af9bd90e4
|
Merge branch 'dev'
|
2022-12-10 16:46:26 +08:00 |
|
wangliwen
|
180cfcf52c
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2022-12-10 16:46:11 +08:00 |
|
wangliwen
|
72339c1f9c
|
异步处理待办任务内详情，大幅减少计算时间
|
2022-12-10 16:45:56 +08:00 |
|
dinggang
|
e331fffaa5
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2022-12-10 16:10:45 +08:00 |
|
dinggang
|
a52ecdaeca
|
1.云资源和云视频申请查询接口
2.ucs与浪潮部门对应表
|
2022-12-10 16:10:20 +08:00 |
|
wangliwen
|
4bc0401a46
|
Merge branch 'master' into docker_package
|
2022-12-10 16:10:15 +08:00 |
|
wangliwen
|
5b86609369
|
Merge branch 'dev'
|
2022-12-10 16:10:05 +08:00 |
|
wangliwen
|
14bbde1103
|
配置是否开启恩科组会功能
|
2022-12-10 16:09:53 +08:00 |
|
wangliwen
|
179830ff16
|
Merge branch 'master' into docker_package
|
2022-12-10 15:46:20 +08:00 |
|
wangliwen
|
1f72d75871
|
Merge branch 'dev'
|
2022-12-10 15:46:12 +08:00 |
|
wangliwen
|
ac188e41eb
|
增加审核任务是否为审核组内其它组员任务
|
2022-12-10 15:46:04 +08:00 |
|
wangliwen
|
7106e0813b
|
Merge branch 'master' into docker_package
|
2022-12-10 15:03:02 +08:00 |
|
wangliwen
|
1f549b5659
|
Merge branch 'dev'
|
2022-12-10 15:02:45 +08:00 |
|
wangliwen
|
07c73216dd
|
...
|
2022-12-10 15:00:43 +08:00 |
|
wangliwen
|
07bb9d1ed9
|
使用activiti NativeTaskQuery查询待办分页，为审核组互助审核做查询基础
|
2022-12-10 15:00:28 +08:00 |
|
wangliwen
|
b81c11f011
|
Merge branch 'master' into docker_package
|
2022-12-09 14:28:02 +08:00 |
|
wangliwen
|
c59d6ca71c
|
Merge branch 'dev'
|
2022-12-09 14:27:50 +08:00 |
|
wangliwen
|
80cbecc6e0
|
公告修改接口
|
2022-12-09 14:27:40 +08:00 |
|
wangliwen
|
cc51c7e3b5
|
Merge branch 'master' into docker_package
|
2022-12-09 11:42:43 +08:00 |
|
wangliwen
|
cb9fa3f0ab
|
Merge branch 'dev'
|
2022-12-09 11:42:37 +08:00 |
|
wangliwen
|
4425851bed
|
...
|
2022-12-09 11:42:30 +08:00 |