wangliwen
|
25d68b648b
|
Merge branch 'master' into docker_package
|
2023-01-12 11:01:57 +08:00 |
|
wangliwen
|
d8bff2e17e
|
Merge branch 'dev'
|
2023-01-12 11:01:47 +08:00 |
|
wangliwen
|
1998f17c2e
|
会客厅增加申请成功次数
|
2023-01-12 11:01:37 +08:00 |
|
wangliwen
|
fa3bc6484a
|
Merge branch 'master' into docker_package
|
2023-01-11 13:02:22 +08:00 |
|
wangliwen
|
2c342eb087
|
Merge branch 'dev'
|
2023-01-11 13:02:15 +08:00 |
|
wangliwen
|
42449c79a2
|
能力统计-能力使用统计 资源类型过滤失效
|
2023-01-11 13:02:07 +08:00 |
|
wangliwen
|
07b5892265
|
Merge branch 'master' into docker_package
|
2023-01-10 18:19:35 +08:00 |
|
wangliwen
|
ef790fd82c
|
Merge branch 'dev'
# Conflicts:
# renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
|
2023-01-10 18:19:28 +08:00 |
|
wangliwen
|
9503da7c52
|
...
|
2023-01-10 18:18:57 +08:00 |
|
wangliwen
|
451a5629de
|
...
|
2023-01-10 18:17:56 +08:00 |
|
wangliwen
|
bb44d49adb
|
格式化代码
|
2023-01-10 17:10:51 +08:00 |
|
wangliwen
|
596b7e0db4
|
Merge branch 'master' into docker_package
|
2023-01-10 15:59:34 +08:00 |
|
wangliwen
|
defb11ee00
|
Merge branch 'dev'
|
2023-01-10 15:59:28 +08:00 |
|
wangliwen
|
b9ba60bb40
|
...
|
2023-01-10 15:59:21 +08:00 |
|
wangliwen
|
6929e5cd3e
|
Merge branch 'dev'
|
2023-01-10 15:29:28 +08:00 |
|
wangliwen
|
b6f305e71a
|
.。。
|
2023-01-10 15:29:21 +08:00 |
|
wangliwen
|
65b13b651c
|
fix 500
|
2023-01-10 15:28:44 +08:00 |
|
wangliwen
|
a769a5a64a
|
Merge branch 'master' into docker_package
|
2023-01-10 14:53:49 +08:00 |
|
wangliwen
|
29c406e2d8
|
Merge branch 'dev'
|
2023-01-10 14:53:42 +08:00 |
|
wangliwen
|
54333ea1d3
|
补充资源分类
|
2023-01-10 14:53:34 +08:00 |
|
wangliwen
|
a61d906f94
|
Merge branch 'master' into docker_package
|
2023-01-10 14:17:00 +08:00 |
|
wangliwen
|
9a78f132ae
|
Merge branch 'dev'
|
2023-01-10 14:16:53 +08:00 |
|
wangliwen
|
35ed50e443
|
...
|
2023-01-10 14:16:47 +08:00 |
|
wangliwen
|
f6d8cb2c95
|
Merge branch 'master' into docker_package
|
2023-01-10 14:03:04 +08:00 |
|
wangliwen
|
b8de7ee235
|
Merge branch 'dev'
|
2023-01-10 14:02:58 +08:00 |
|
wangliwen
|
aa225e9255
|
...
|
2023-01-10 14:02:49 +08:00 |
|
wangliwen
|
f79cb8d3fa
|
Merge branch 'master' into docker_package
|
2023-01-10 14:00:41 +08:00 |
|
wangliwen
|
41cb130314
|
Merge branch 'dev'
|
2023-01-10 14:00:32 +08:00 |
|
wangliwen
|
9b61af88ff
|
补充默认数量0 和 补充政务云资源部门名称
|
2023-01-10 14:00:23 +08:00 |
|
wangliwen
|
b95e75b886
|
Merge branch 'master' into docker_package
|
2023-01-10 11:47:26 +08:00 |
|
wangliwen
|
b672daf030
|
Merge branch 'dev'
|
2023-01-10 11:47:20 +08:00 |
|
wangliwen
|
3ac9f76c7f
|
...
|
2023-01-10 11:47:13 +08:00 |
|
wangliwen
|
4a438a4ecb
|
Merge branch 'master' into docker_package
|
2023-01-10 11:39:58 +08:00 |
|
wangliwen
|
b30439de67
|
Merge branch 'dev'
|
2023-01-10 11:39:52 +08:00 |
|
wangliwen
|
9f9c631f77
|
过滤能力资源不存在的申请供评分
|
2023-01-10 11:39:45 +08:00 |
|
wangliwen
|
ccfcdf1769
|
Merge branch 'master' into docker_package
|
2023-01-10 11:36:36 +08:00 |
|
wangliwen
|
848f0fd3c2
|
Merge branch 'dev'
|
2023-01-10 11:36:28 +08:00 |
|
wangliwen
|
4ac19db323
|
...
|
2023-01-10 11:36:21 +08:00 |
|
wangliwen
|
d574c7b99c
|
所有部门补充会客厅填入的部门名 、过滤掉未通过的申请
|
2023-01-10 11:33:29 +08:00 |
|
wangliwen
|
7d82b523dc
|
Merge branch 'master' into docker_package
|
2023-01-10 10:26:08 +08:00 |
|
wangliwen
|
26dc0e0c6d
|
Merge branch 'dev'
|
2023-01-10 10:26:02 +08:00 |
|
wangliwen
|
3721c336c3
|
查询部门时 若未进行云资源统计 填充0
|
2023-01-10 10:25:54 +08:00 |
|
wangliwen
|
22b103c5a0
|
Merge branch 'master' into docker_package
|
2023-01-10 10:05:50 +08:00 |
|
wangliwen
|
cc1ae60000
|
Merge branch 'dev'
|
2023-01-10 10:05:42 +08:00 |
|
wangliwen
|
36fe1f08e2
|
...
|
2023-01-10 10:05:13 +08:00 |
|
wangliwen
|
02efbd6131
|
Merge branch 'master' into docker_package
|
2023-01-09 16:26:02 +08:00 |
|
wangliwen
|
2d07184435
|
Merge branch 'dev'
|
2023-01-09 16:25:53 +08:00 |
|
wangliwen
|
40a8d4f525
|
按照是否评分分页查询申请个人申请
|
2023-01-09 16:00:54 +08:00 |
|
wangliwen
|
afc2e0c292
|
Merge branch 'master' into docker_package
|
2023-01-09 11:53:49 +08:00 |
|
wangliwen
|
e59dbd413d
|
Merge branch 'dev'
|
2023-01-09 11:53:27 +08:00 |