wangliwen
|
edb5c683f8
|
Merge branch 'dev'
|
2022-12-14 11:46:16 +08:00 |
 dinggang
|
fbeadb6ba3
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
# Conflicts:
# renren-admin/src/main/resources/db/V8.4__tb_fuse_add_col.sql
|
2022-12-14 11:39:51 +08:00 |
|
dinggang
|
6e1bea68ff
|
1.赋能场景需求变更
2.能力统计逻辑修改
3.sql
|
2022-12-14 11:38:36 +08:00 |
|
wangliwen
|
bc238cf39e
|
Merge branch 'master' into docker_package
|
2022-12-14 11:32:55 +08:00 |
|
wangliwen
|
928237e8e4
|
Merge branch 'dev'
|
2022-12-14 11:32:45 +08:00 |
|
wangliwen
|
5dc4b1e482
|
分页数量不正确
|
2022-12-14 11:32:34 +08:00 |
|
wangliwen
|
c831c2dd80
|
Merge branch 'master' into docker_package
|
2022-12-14 10:48:31 +08:00 |
|
wangliwen
|
88ec021412
|
Merge branch 'dev'
|
2022-12-14 10:48:16 +08:00 |
|
wangliwen
|
f7e739ea7d
|
获取具备审核权限人员时支持过滤已加入审核组人员
|
2022-12-14 10:48:01 +08:00 |
|
wangliwen
|
ffdb41c662
|
Merge branch 'master' into docker_package
|
2022-12-13 17:56:33 +08:00 |
|
wangliwen
|
0a69c619c8
|
Merge branch 'dev'
|
2022-12-13 17:56:26 +08:00 |
|
wangliwen
|
d177a351ac
|
...
|
2022-12-13 17:56:17 +08:00 |
|
wangliwen
|
b7ca062f61
|
Merge branch 'master' into docker_package
|
2022-12-13 17:11:54 +08:00 |
|
wangliwen
|
6f3096556b
|
Merge branch 'dev'
|
2022-12-13 17:11:47 +08:00 |
|
wangliwen
|
35d08fe63f
|
增加已在审核组内的审核组名称与去重审核权限人员
|
2022-12-13 17:11:40 +08:00 |
|
wangliwen
|
fb990f0791
|
Merge branch 'master' into docker_package
|
2022-12-13 16:45:28 +08:00 |
|
wangliwen
|
2ffe4948cf
|
Merge branch 'dev'
|
2022-12-13 16:45:21 +08:00 |
|
wangliwen
|
d9df602910
|
审核组外围支持接口
|
2022-12-13 16:45:12 +08:00 |
|
wangliwen
|
1918365fc4
|
Merge branch 'master' into docker_package
|
2022-12-13 13:34:11 +08:00 |
|
wangliwen
|
151d61d04a
|
Merge branch 'dev'
|
2022-12-13 13:33:58 +08:00 |
|
wangliwen
|
4c935c6115
|
...
|
2022-12-13 13:33:51 +08:00 |
|
wangliwen
|
d258a875ae
|
Merge branch 'master' into docker_package
|
2022-12-13 11:34:58 +08:00 |
|
wangliwen
|
11ed5a0ba7
|
Merge branch 'dev'
|
2022-12-13 11:33:12 +08:00 |
|
wangliwen
|
7418814fbd
|
已办、待办 拥有运维管理员权限用户才返回会客厅相关数据
|
2022-12-13 11:33:00 +08:00 |
|
wangliwen
|
0c6028ec75
|
Merge branch 'master' into docker_package
|
2022-12-13 11:00:40 +08:00 |
|
wangliwen
|
34ea6630f3
|
Merge branch 'dev'
|
2022-12-13 11:00:26 +08:00 |
|
wangliwen
|
fafd6f48cd
|
...
|
2022-12-13 11:00:19 +08:00 |
|
wangliwen
|
aec5088067
|
Merge branch 'master' into docker_package
|
2022-12-13 10:23:03 +08:00 |
|
wangliwen
|
eb5c316eab
|
Merge branch 'dev'
|
2022-12-13 10:22:56 +08:00 |
|
wangliwen
|
2994ebde69
|
附件名称字段
|
2022-12-13 10:22:49 +08:00 |
|
wangliwen
|
a85552322e
|
Merge branch 'master' into docker_package
|
2022-12-13 09:54:57 +08:00 |
|
wangliwen
|
6f036e0d64
|
Merge branch 'dev'
|
2022-12-13 09:54:50 +08:00 |
|
wangliwen
|
1565a9ca70
|
能力需求增加附件名称
|
2022-12-13 09:54:38 +08:00 |
|
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 |