wangliwen
|
427d0312cc
|
Merge branch 'dev'
|
2023-01-16 16:04:01 +08:00 |
|
wangliwen
|
38788db278
|
能力使用统计导出增加云资源、云视频
|
2023-01-16 16:03:53 +08:00 |
|
wangliwen
|
88ce9be9dd
|
Merge branch 'dev'
|
2023-01-16 11:13:48 +08:00 |
|
wangliwen
|
a6f955f22d
|
调整评论字数不限制
|
2023-01-16 11:13:39 +08:00 |
|
wangliwen
|
462cd7025f
|
Merge branch 'dev'
|
2023-01-16 10:26:57 +08:00 |
|
wangliwen
|
0673343ad6
|
Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev
|
2023-01-16 10:26:29 +08:00 |
|
wangliwen
|
a7d497fdbb
|
Merge branch 'dev'
|
2023-01-16 10:25:53 +08:00 |
|
wangliwen
|
3b671cb670
|
填充默认0
|
2023-01-16 10:25:44 +08:00 |
|
QYTHINK\qiaoy
|
45dc1bad08
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-01-16 10:13:10 +08:00 |
|
QYTHINK\qiaoy
|
346284ae26
|
excel会议室申请记录导入
|
2023-01-16 10:12:24 +08:00 |
|
wangliwen
|
4a91e17e5e
|
Merge branch 'dev'
|
2023-01-16 09:59:23 +08:00 |
|
wangliwen
|
1cbeb17eee
|
HIQDUCS-757
|
2023-01-16 09:59:13 +08:00 |
|
wangliwen
|
c45186367a
|
Merge branch 'dev'
|
2023-01-12 14:58:49 +08:00 |
|
wangliwen
|
0fe0f9b4a5
|
npe
|
2023-01-12 14:58:43 +08:00 |
|
wangliwen
|
3ccdca54c5
|
Merge branch 'dev'
|
2023-01-12 14:40:22 +08:00 |
|
wangliwen
|
8ff33d570e
|
获取能力申请详情可过滤只出某个资源所属部门
|
2023-01-12 14:40:13 +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
|
2c342eb087
|
Merge branch 'dev'
|
2023-01-11 13:02:15 +08:00 |
|
wangliwen
|
42449c79a2
|
能力统计-能力使用统计 资源类型过滤失效
|
2023-01-11 13:02:07 +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
|
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
|
29c406e2d8
|
Merge branch 'dev'
|
2023-01-10 14:53:42 +08:00 |
|
wangliwen
|
54333ea1d3
|
补充资源分类
|
2023-01-10 14:53:34 +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
|
b8de7ee235
|
Merge branch 'dev'
|
2023-01-10 14:02:58 +08:00 |
|
wangliwen
|
aa225e9255
|
...
|
2023-01-10 14:02:49 +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
|
b672daf030
|
Merge branch 'dev'
|
2023-01-10 11:47:20 +08:00 |
|
wangliwen
|
3ac9f76c7f
|
...
|
2023-01-10 11:47:13 +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
|
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
|
26dc0e0c6d
|
Merge branch 'dev'
|
2023-01-10 10:26:02 +08:00 |
|
wangliwen
|
3721c336c3
|
查询部门时 若未进行云资源统计 填充0
|
2023-01-10 10:25:54 +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
|
2d07184435
|
Merge branch 'dev'
|
2023-01-09 16:25:53 +08:00 |
|
wangliwen
|
40a8d4f525
|
按照是否评分分页查询申请个人申请
|
2023-01-09 16:00:54 +08:00 |
|
wangliwen
|
e59dbd413d
|
Merge branch 'dev'
|
2023-01-09 11:53:27 +08:00 |