wangliwen
|
3195fdb885
|
Merge branch 'master' into docker_package
|
2022-12-08 09:20:29 +08:00 |
|
wangliwen
|
6e2ba70c84
|
Merge branch 'dev'
|
2022-12-08 09:20:18 +08:00 |
|
wangliwen
|
c8a5e0450c
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-12-08 09:20:08 +08:00 |
|
wangliwen
|
63c979057f
|
fix 474
|
2022-12-08 09:19:59 +08:00 |
 dinggang
|
aa31a7bd43
|
1.浪潮政务云视频和云资源申请相关接口
2.全局搜索统计增加政务云资源搜索结果
3.后台管理-能力统计-能力上架统计-明细页面SQL调整
|
2022-12-08 09:12:24 +08:00 |
|
wangliwen
|
d2b1cb4114
|
Merge branch 'master' into docker_package
|
2022-12-06 18:09:22 +08:00 |
|
wangliwen
|
6c5559e0ab
|
Merge branch 'dev'
|
2022-12-06 18:09:12 +08:00 |
|
dinggang
|
1289bfc619
|
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-06 18:08:42 +08:00 |
|
dinggang
|
948c1d2d55
|
1.全局搜索增加政务云资源搜索结果
2.后台管理-通知管理-我的通知增加按通知类型筛选
3.对接浪潮政务云资源和云视频
|
2022-12-06 18:01:51 +08:00 |
|
wangliwen
|
c03a788bda
|
Merge branch 'master' into docker_package
|
2022-12-06 17:57:36 +08:00 |
|
wangliwen
|
9d0b6d4d4c
|
Merge branch 'dev'
|
2022-12-06 17:57:29 +08:00 |
|
wangliwen
|
b6de83347a
|
...
|
2022-12-06 17:57:17 +08:00 |
|
wangliwen
|
f3f911e726
|
Merge branch 'master' into docker_package
|
2022-12-06 10:06:50 +08:00 |
|
wangliwen
|
c57003e31c
|
Merge branch 'dev'
|
2022-12-06 10:06:41 +08:00 |
|
wangliwen
|
e1abfa6e5d
|
批量驳回接口
|
2022-12-06 10:06:31 +08:00 |
|
wangliwen
|
fa0c9f0f61
|
Merge branch 'master' into docker_package
|
2022-12-05 16:59:48 +08:00 |
|
wangliwen
|
9874820779
|
Merge branch 'dev'
|
2022-12-05 16:59:41 +08:00 |
|
wangliwen
|
9832a37e2c
|
...
|
2022-12-05 16:59:30 +08:00 |
|
wangliwen
|
5e23978366
|
Merge branch 'master' into docker_package
|
2022-12-05 16:09:15 +08:00 |
|
wangliwen
|
dbc8759760
|
Merge branch 'dev'
|
2022-12-05 16:09:08 +08:00 |
|
wangliwen
|
386478aa76
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-12-05 16:08:56 +08:00 |
|
wangliwen
|
19e6f7d5a4
|
能力申请每个任务节点加入催办信息与状态
|
2022-12-05 16:08:46 +08:00 |
|
dinggang
|
b2b21f6442
|
漏提交
|
2022-12-05 15:56:27 +08:00 |
|
dinggang
|
c4e43ff5ef
|
资金大屏统计修改
|
2022-12-05 15:55:44 +08:00 |
|
wangliwen
|
4d6b3552db
|
Merge branch 'master' into docker_package
|
2022-12-05 15:26:31 +08:00 |
|
wangliwen
|
b5995b1d26
|
Merge branch 'dev'
|
2022-12-05 15:26:22 +08:00 |
|
wangliwen
|
7e332201c4
|
从未催办过的任务 判断是否已超过预置天数
|
2022-12-05 15:26:13 +08:00 |
|
wangliwen
|
6bc3e01863
|
Merge branch 'master' into docker_package
|
2022-12-05 14:17:45 +08:00 |
|
wangliwen
|
1bb9540e86
|
Merge branch 'dev'
|
2022-12-05 14:17:35 +08:00 |
|
wangliwen
|
9e618c75cc
|
催办信息保存前判断
|
2022-12-05 14:17:27 +08:00 |
|
wangliwen
|
54d0ca1ecf
|
Merge branch 'master' into docker_package
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
|
2022-12-05 11:59:54 +08:00 |
|
wangliwen
|
7ecfad7e81
|
Merge branch 'dev'
|
2022-12-05 11:58:34 +08:00 |
|
wangliwen
|
8d62701756
|
...
|
2022-12-05 11:58:23 +08:00 |
|
wangliwen
|
1d33f23fc3
|
...
|
2022-12-05 11:57:35 +08:00 |
|
wangliwen
|
df61e3cd99
|
Merge branch 'master' into docker_package
|
2022-12-05 10:28:50 +08:00 |
|
wangliwen
|
c8f603df6a
|
Merge branch 'dev'
|
2022-12-05 10:28:42 +08:00 |
|
wangliwen
|
4b724593c6
|
。。。
|
2022-12-05 10:26:16 +08:00 |
|
wangliwen
|
5a66d2423e
|
Merge branch 'master' into docker_package
|
2022-12-05 09:53:13 +08:00 |
|
wangliwen
|
b1989791b0
|
Merge branch 'dev'
|
2022-12-05 09:53:06 +08:00 |
|
wangliwen
|
77185be5c1
|
能力申请的催办判断
|
2022-12-05 09:52:54 +08:00 |
|
wangliwen
|
4bca4247d3
|
Merge branch 'master' into docker_package
|
2022-12-05 09:20:54 +08:00 |
|
wangliwen
|
570cfd0d5c
|
Merge branch 'dev'
|
2022-12-05 09:20:47 +08:00 |
|
wangliwen
|
1a2d443bc0
|
查看能力申请详情时返回催办相关信息
|
2022-12-05 09:20:37 +08:00 |
|
wangliwen
|
7ac416f92c
|
Merge branch 'master' into docker_package
|
2022-12-02 18:16:57 +08:00 |
|
wangliwen
|
4268e557a5
|
Merge branch 'dev'
|
2022-12-02 18:16:49 +08:00 |
|
dinggang
|
5c3f32f313
|
用户角色消失问题
|
2022-12-02 16:50:29 +08:00 |
|
wangliwen
|
b695006954
|
Merge branch 'master' into docker_package
|
2022-12-02 15:46:39 +08:00 |
|
wangliwen
|
0b572a1e8b
|
Merge branch 'dev'
|
2022-12-02 15:46:12 +08:00 |
|
wangliwen
|
4789a3cb60
|
批量审核通过接口
|
2022-12-02 15:14:40 +08:00 |
|
wangliwen
|
e9f709ce0f
|
Merge branch 'master' into docker_package
|
2022-12-02 14:19:58 +08:00 |