wangliwen
|
14daa09790
|
Merge branch 'master' into docker_package
|
2022-10-20 09:33:22 +08:00 |
|
wangliwen
|
e07f88e2ad
|
Merge branch 'dev'
|
2022-10-20 09:33:13 +08:00 |
|
wangliwen
|
8c256f315d
|
代码格式化
|
2022-10-20 09:33:01 +08:00 |
|
wangliwen
|
734c247adc
|
Merge branch 'master' into docker_package
|
2022-10-19 14:04:09 +08:00 |
|
wangliwen
|
9c1b01c6d1
|
Merge branch 'dev'
|
2022-10-19 14:04:01 +08:00 |
|
wangliwen
|
027e493020
|
...
|
2022-10-19 14:03:52 +08:00 |
|
wangliwen
|
94765a612d
|
Merge branch 'master' into docker_package
|
2022-10-19 11:13:52 +08:00 |
|
wangliwen
|
0b9ee53bc8
|
Merge branch 'dev'
|
2022-10-19 11:13:43 +08:00 |
 lizhicheng
|
30a4ce6797
|
统计报表加分页
|
2022-10-19 10:16:23 +08:00 |
|
wangliwen
|
f114059256
|
Merge branch 'master' into docker_package
|
2022-10-19 08:54:31 +08:00 |
|
wangliwen
|
5d0b4bc32d
|
Merge branch 'dev'
|
2022-10-19 08:54:22 +08:00 |
 huangweixiong
|
1bcb055baf
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
CIM智能算法改开发组件
|
2022-10-18 17:35:29 +08:00 |
|
huangweixiong
|
109a2a1f79
|
待办推送格式修改
|
2022-10-18 17:34:59 +08:00 |
|
wangliwen
|
5f6fafb7b2
|
Merge branch 'master' into docker_package
|
2022-10-18 17:22:52 +08:00 |
|
wangliwen
|
4245d1c782
|
Merge branch 'dev'
|
2022-10-18 17:22:45 +08:00 |
|
wangliwen
|
14a9aa33ae
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
|
2022-10-18 17:22:34 +08:00 |
|
wangliwen
|
3dde0b314d
|
Merge branch 'master' into docker_package
|
2022-10-18 17:21:48 +08:00 |
|
wangliwen
|
d7f8bf7656
|
Merge branch 'dev'
|
2022-10-18 17:21:41 +08:00 |
|
lizhicheng
|
317a0d21aa
|
CIM智能算法改开发组件
|
2022-10-18 17:07:46 +08:00 |
|
huangweixiong
|
b326c8e24b
|
Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev
* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
数据异常导出失败
npe
导出表头宽度自适应
调整导出文件名
...
能力统计 导出
CIM组件统计改为开发组件
selectDeptDetailTypeCountList 增加导出接口
npe
会议室重复统计
...
npe
...
能力使用部门排序
屮
...
...
HIQDUCS-100 的处理
设备申请新增设备详情字段
统计报表状态修改
|
2022-10-18 16:41:18 +08:00 |
|
huangweixiong
|
482e3fd51c
|
修改能力申请的发送通知
|
2022-10-18 16:40:39 +08:00 |
|
wangliwen
|
dd63b8db3d
|
Merge branch 'master' into docker_package
|
2022-10-18 15:43:37 +08:00 |
|
wangliwen
|
488ed3ec33
|
Merge branch 'dev'
|
2022-10-18 15:43:30 +08:00 |
|
wangliwen
|
f2a1b152a8
|
数据异常导出失败
|
2022-10-18 15:43:22 +08:00 |
|
wangliwen
|
e9e685beb8
|
Merge branch 'master' into docker_package
|
2022-10-18 15:22:06 +08:00 |
|
wangliwen
|
03a0b43941
|
Merge branch 'dev'
|
2022-10-18 15:21:59 +08:00 |
|
wangliwen
|
a4047352c1
|
npe
|
2022-10-18 15:21:50 +08:00 |
|
wangliwen
|
90b9c0b112
|
Merge branch 'master' into docker_package
|
2022-10-18 14:38:56 +08:00 |
|
wangliwen
|
1d16cca31b
|
Merge branch 'dev'
|
2022-10-18 14:38:49 +08:00 |
|
wangliwen
|
f1d3fea424
|
导出表头宽度自适应
|
2022-10-18 14:38:41 +08:00 |
|
wangliwen
|
24749b0c18
|
Merge branch 'master' into docker_package
|
2022-10-18 13:44:11 +08:00 |
|
wangliwen
|
847f1490b8
|
Merge branch 'dev'
|
2022-10-18 13:44:04 +08:00 |
|
wangliwen
|
094d27fddf
|
调整导出文件名
|
2022-10-18 13:43:54 +08:00 |
|
wangliwen
|
9426631fee
|
Merge branch 'master' into docker_package
|
2022-10-18 11:31:45 +08:00 |
|
wangliwen
|
7499cbf4a0
|
Merge branch 'dev'
|
2022-10-18 11:31:38 +08:00 |
|
wangliwen
|
fa94eb77f3
|
...
|
2022-10-18 11:31:31 +08:00 |
|
wangliwen
|
f5ff6df7ca
|
Merge branch 'master' into docker_package
|
2022-10-18 11:18:43 +08:00 |
|
wangliwen
|
c9c256ff87
|
Merge branch 'dev'
|
2022-10-18 11:18:36 +08:00 |
|
wangliwen
|
17cd5900f8
|
Merge remote-tracking branch '备份/dev' into dev
|
2022-10-18 11:18:24 +08:00 |
|
wangliwen
|
020a32519a
|
能力统计 导出
|
2022-10-18 11:18:11 +08:00 |
|
lizhicheng
|
7c4b941031
|
CIM组件统计改为开发组件
|
2022-10-18 10:00:46 +08:00 |
|
wangliwen
|
d6907665be
|
Merge branch 'master' into docker_package
|
2022-10-18 09:58:25 +08:00 |
|
wangliwen
|
41d382c71a
|
Merge branch 'dev'
|
2022-10-18 09:58:18 +08:00 |
|
wangliwen
|
c02702e70e
|
selectDeptDetailTypeCountList 增加导出接口
|
2022-10-18 09:58:06 +08:00 |
|
wangliwen
|
23a3c38620
|
Merge branch 'master' into docker_package
|
2022-10-18 09:05:27 +08:00 |
|
wangliwen
|
6004a99da7
|
Merge branch 'dev'
|
2022-10-18 09:05:05 +08:00 |
|
lizhicheng
|
9961970fb1
|
npe
|
2022-10-17 17:56:53 +08:00 |
|
wangliwen
|
1b7c0c2c03
|
Merge branch 'master' into docker_package
|
2022-10-17 16:54:56 +08:00 |
|
wangliwen
|
3e54f99052
|
Merge branch 'dev'
|
2022-10-17 16:54:43 +08:00 |
|
wangliwen
|
5b85df5010
|
会议室重复统计
|
2022-10-17 16:54:25 +08:00 |