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 |
|
wangliwen
|
7703c6d6cf
|
Merge branch 'dev'
|
2022-12-02 14:19:48 +08:00 |
|
wangliwen
|
f39a9e473e
|
市局数据资源按照上线部门出数据资源列表
|
2022-12-02 14:18:54 +08:00 |
|
wangliwen
|
96321f7b84
|
Merge branch 'master' into docker_package
|
2022-12-01 18:18:47 +08:00 |
|
wangliwen
|
230664910c
|
Merge branch 'dev'
|
2022-12-01 18:18:40 +08:00 |
|
dinggang
|
f8088fb2f9
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2022-12-01 18:17:07 +08:00 |
|
dinggang
|
fee19d8f17
|
1.公告相关接口
2.建表sql
3.我的待办-能力申请增加资源类型及提供部门字段
4.减少无用日志输出
|
2022-12-01 18:16:43 +08:00 |
|
wangliwen
|
1783204473
|
Merge branch 'master' into docker_package
|
2022-12-01 17:30:48 +08:00 |
|
wangliwen
|
d0fbaee7ba
|
Merge branch 'dev'
|
2022-12-01 17:30:38 +08:00 |
|
wangliwen
|
0a174de50a
|
数据资源左侧树
|
2022-12-01 17:30:28 +08:00 |
|
wangliwen
|
32ac7bf16b
|
Merge branch 'master' into docker_package
|
2022-12-01 15:48:01 +08:00 |
|
wangliwen
|
9f9ff3fd27
|
Merge branch 'dev'
|
2022-12-01 15:47:53 +08:00 |
|
wangliwen
|
3a87c7381d
|
增加能力申请 是否存在子单驳回的情况
|
2022-12-01 15:47:08 +08:00 |
|
wangliwen
|
8059071f89
|
Merge branch 'master' into docker_package
|
2022-12-01 15:17:38 +08:00 |
|
wangliwen
|
37ca5ade65
|
Merge branch 'dev'
|
2022-12-01 15:17:31 +08:00 |
|
wangliwen
|
bf684bacbb
|
能力申请催办相关
|
2022-12-01 15:17:16 +08:00 |
|
wangliwen
|
9aa06f6253
|
Merge branch 'master' into docker_package
|
2022-12-01 14:22:20 +08:00 |
|
wangliwen
|
1bccf11ddb
|
Merge branch 'dev'
|
2022-12-01 14:22:12 +08:00 |
|
wangliwen
|
49d94eda9d
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-12-01 14:21:56 +08:00 |