wangliwen
|
5d9931a6d7
|
Merge branch 'master' into docker_package
|
2022-12-13 09:16:01 +08:00 |
|
wangliwen
|
ba05b09ec6
|
Merge branch 'dev'
|
2022-12-13 09:15:52 +08:00 |
|
wangliwen
|
d009afa030
|
sql调整
|
2022-12-13 09:15:44 +08:00 |
|
wangliwen
|
036c05f15b
|
Merge branch 'master' into docker_package
|
2022-12-13 09:05:10 +08:00 |
|
wangliwen
|
401b270a71
|
Merge branch 'dev'
|
2022-12-13 09:04:59 +08:00 |
 dinggang
|
1c143be715
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/activiti/controller/ActTaskController.java
|
2022-12-13 03:13:45 +08:00 |
|
dinggang
|
aa6f1f55d5
|
..
|
2022-12-13 03:07:40 +08:00 |
|
wangliwen
|
077237c285
|
Merge branch 'master' into docker_package
|
2022-12-12 17:20:27 +08:00 |
|
wangliwen
|
10d9f4428a
|
Merge branch 'dev'
|
2022-12-12 17:20:21 +08:00 |
|
wangliwen
|
e3184382fc
|
协作组互助审核通过时不发分配通知
|
2022-12-12 17:20:13 +08:00 |
|
wangliwen
|
819e0bc441
|
Merge branch 'master' into docker_package
|
2022-12-12 17:06:37 +08:00 |
|
wangliwen
|
5468ce701b
|
Merge branch 'dev'
|
2022-12-12 17:06:30 +08:00 |
|
wangliwen
|
5f2b55d975
|
...恢复
|
2022-12-12 17:06:21 +08:00 |
|
wangliwen
|
6d2ba4a421
|
Merge branch 'master' into docker_package
|
2022-12-12 16:55:48 +08:00 |
|
wangliwen
|
b8565cb9d1
|
Merge branch 'dev'
|
2022-12-12 16:55:41 +08:00 |
|
wangliwen
|
4bdebca7d7
|
调整协作组内审核人不更改
|
2022-12-12 16:55:33 +08:00 |
|
wangliwen
|
6425454bec
|
Merge branch 'master' into docker_package
|
2022-12-12 16:38:53 +08:00 |
|
wangliwen
|
1a252a3cdb
|
Merge branch 'dev'
|
2022-12-12 16:38:45 +08:00 |
|
wangliwen
|
d9f600f046
|
我的待办数量中加入协作组内数量
|
2022-12-12 16:38:13 +08:00 |
|
wangliwen
|
c883aaf8d2
|
...
|
2022-12-12 16:21:23 +08:00 |
|
wangliwen
|
3950ab6936
|
Merge branch 'master' into docker_package
|
2022-12-12 15:57:30 +08:00 |
|
wangliwen
|
8d97144826
|
Merge branch 'dev'
|
2022-12-12 15:57:22 +08:00 |
|
wangliwen
|
b2f03e4218
|
流程涉及的审核协作组逻辑
|
2022-12-12 15:57:11 +08:00 |
|
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 |