Commit Graph

1743 Commits

Author SHA1 Message Date
wangliwen c98509adc0 Merge branch 'master' into docker_package 2022-09-26 16:39:55 +08:00
wangliwen 128653d837 2022-09-26 16:39:43 +08:00
wangliwen 16ee9172be Merge branch 'master' into docker_package 2022-09-26 16:35:54 +08:00
wangliwen 950f3f3b6e ... 2022-09-26 16:35:41 +08:00
wangliwen c67274cf51 Merge branch 'master' into docker_package 2022-09-26 16:25:53 +08:00
wangliwen 21a56a4d26 ... 2022-09-26 16:25:38 +08:00
wangliwen 736d815f68 Merge branch 'master' into docker_package 2022-09-26 16:08:19 +08:00
wangliwen 0e4c61cda1 能力申请增加当前节点信息 2022-09-26 16:07:28 +08:00
wangliwen 48c80cb357 能力申请通知调整 2022-09-26 15:39:40 +08:00
wangliwen 84fc633381 Merge branch 'master' into docker_package 2022-09-26 14:22:17 +08:00
wangliwen 5edf6803e9 ... 2022-09-26 14:21:46 +08:00
wangliwen aaf7324d98 Merge branch 'master' into docker_package 2022-09-23 18:04:36 +08:00
lizhicheng c64c3b4278 统计报表修改 2022-09-23 17:42:43 +08:00
wangliwen 8f497f7b29 Merge branch 'master' into docker_package 2022-09-23 09:49:02 +08:00
lizhicheng 4aab62391a 西海岸bug修复 2022-09-23 09:17:41 +08:00
wangliwen e32725c2aa Merge branch 'master' into docker_package 2022-09-22 09:16:45 +08:00
lizhicheng 51682736e6 新增功能:无人机、单兵设备审批 2022-09-21 21:57:38 +08:00
wangliwen b871304d86 Merge branch 'master' into docker_package 2022-09-20 13:55:41 +08:00
lizhicheng 98ae1d69bd 云脑群网关统计对接 2022-09-20 13:05:08 +08:00
wangliwen c8589edb41 Merge branch 'master' into docker_package 2022-09-20 10:36:30 +08:00
lizhicheng ffa1ebc9f7 西海岸需求:通知消息体现资源 2022-09-20 10:25:11 +08:00
wangliwen e90976b781 Merge branch 'master' into docker_package 2022-09-19 11:49:20 +08:00
wangliwen 347961cbd2 ... 2022-09-19 11:49:06 +08:00
wangliwen 2f4aeb75dc Merge branch 'master' into docker_package 2022-09-19 11:06:29 +08:00
wangliwen 8b8d155bc2 /resource/selectAppList 接口增加参数 area 2022-09-19 11:06:03 +08:00
wangliwen f5118dc89c Merge branch 'master' into docker_package 2022-09-16 14:35:46 +08:00
wangliwen cda3c4968a ... 2022-09-16 14:35:30 +08:00
wangliwen d3dde53310 Merge branch 'master' into docker_package 2022-09-16 14:21:16 +08:00
wangliwen a0508e76ff ... 2022-09-16 14:21:00 +08:00
wangliwen f9dca3b8fb Merge branch 'master' into docker_package 2022-09-16 11:45:59 +08:00
wangliwen 71611ec1d6 npe 2022-09-16 11:45:14 +08:00
wangliwen 5c90ce83ba Merge branch 'master' into docker_package 2022-09-16 10:53:34 +08:00
wangliwen 8e5648b964 能力申请前端传用户部门id时,更新用户部门id(存在用户原有部门被删除的情况 屮) 2022-09-16 10:53:17 +08:00
wangliwen 3a3ccaa356 Merge branch 'master' into docker_package 2022-09-15 09:23:24 +08:00
DESKTOP-VA9NQUP\liwen 5c45acdffa Merge branch 'master' into docker_package 2022-09-14 22:11:41 +08:00
lizhicheng e539922487 申请、上架全局统计优化 2022-09-14 19:38:51 +08:00
lizhicheng 4e027e9f04 新增上架、申请详情统计 2022-09-14 17:09:13 +08:00
huangweixiong 7cbdb1c555 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:
  新增上架统计api
  新增统计api
2022-09-14 17:05:58 +08:00
huangweixiong b8e3884c6d 修改亚威通知字段 2022-09-14 17:05:15 +08:00
lizhicheng 3f0f344d5b 新增上架统计api
按照部门、能力类型、组件类型统计能力上架情况
2022-09-14 14:19:50 +08:00
wangliwen cccb0b4a59 Merge branch 'master' into docker_package 2022-09-13 18:03:42 +08:00
lizhicheng c3541440c5 新增统计api
按照部门、能力类型、组件类型统计能力使用情况
2022-09-13 17:42:50 +08:00
huangweixiong 3c8d2d6ccd 人员同步添加日志 2022-09-13 14:51:49 +08:00
wangliwen b58d8799d8 Merge branch 'master' into docker_package 2022-09-13 09:44:16 +08:00
wangliwen df7da72a99 ... 2022-09-13 09:44:00 +08:00
wangliwen e380179a6d Merge branch 'master' into docker_package 2022-09-08 17:00:38 +08:00
wangliwen 9a0c01619e 2022-09-08 17:00:21 +08:00
wangliwen 4467a80b7a Merge branch 'master' into docker_package 2022-09-08 10:33:57 +08:00
lizhicheng 3c51f94840 云脑群网关代码优化 2022-09-08 10:31:48 +08:00
lizhicheng 3da00d0ce9 添加网关配置项 2022-09-08 10:30:17 +08:00