Commit Graph

2446 Commits

Author SHA1 Message Date
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
wangliwen 4d9b0b9fbe Merge branch 'master' into docker_package 2022-09-07 18:08:55 +08:00
lizhicheng 866bbd1faf 融合服务:新增申请量统计功能 2022-09-07 15:42:00 +08:00
lizhicheng 2a453b02d8 云脑群网关接入 2022-09-07 13:46:14 +08:00
wangliwen a8a78e08bf Merge branch 'master' into docker_package 2022-09-07 11:31:38 +08:00
lizhicheng 2349aec38e 通知消息修改 2022-09-07 11:03:35 +08:00
wangliwen 72aaa294b5 Merge branch 'master' into docker_package 2022-09-05 10:03:26 +08:00
dinggang 2ce9eac65d 查询最新能力增加所属部门名称 2022-09-05 09:35:55 +08:00
wangliwen 938301a081 Merge branch 'master' into docker_package 2022-09-02 14:22:50 +08:00
wangliwen 606757b31e npe 2022-09-02 14:22:23 +08:00
wangliwen 6bd39f39bd Merge branch 'master' into docker_package 2022-09-02 11:33:01 +08:00
wangliwen 9a9d791ae5 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-09-02 11:32:41 +08:00
wangliwen d143699684 ... 2022-09-02 11:32:15 +08:00
zhangzhikang 2b1bc48814 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-09-02 11:09:11 +08:00
zhangzhikang 4f33fac986 0902会议室禅道问题修改 2022-09-02 11:08:54 +08:00
wangliwen 419d5aa258 Merge branch 'master' into docker_package 2022-09-02 09:20:29 +08:00
wangliwen c542c51e5c ... 2022-09-02 09:20:13 +08:00
wangliwen 977579bf5b Merge branch 'master' into docker_package 2022-09-02 08:58:22 +08:00
Koi-tsk 087b1ca78f 停用账号不分配审批bug修复 2022-09-01 17:10:47 +08:00
wangliwen f2039ed918 Merge branch 'master' into docker_package 2022-09-01 17:05:11 +08:00
wangliwen 7865ebbd27 能力申请V3 免批判断 2022-09-01 17:04:09 +08:00
wangliwen aa898827b7 Merge branch 'master' into docker_package 2022-09-01 13:48:56 +08:00
wangliwen f3a155c44d Merge remote-tracking branch 'origin/dev' into dev 2022-09-01 13:48:11 +08:00
wangliwen 82a96dba99 ... 2022-09-01 13:47:55 +08:00
dinggang 7bdbc7dcb1 编目更新 2022-09-01 11:51:48 +08:00
wangliwen 3359e7c0ca Merge branch 'master' into docker_package 2022-08-31 18:50:09 +08:00
zhangzhikang 28f4558fa6 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-31 18:27:44 +08:00
zhangzhikang 9c7470a123 0831会议室禅道问题修改 2022-08-31 18:27:31 +08:00
wangliwen 658f773dfe Merge branch 'master' into docker_package 2022-08-31 16:54:38 +08:00
wangliwen e251ae518f Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-31 16:54:09 +08:00
wangliwen be6968c78f 发送消息到亚微 2022-08-31 16:53:43 +08:00
yitonglei 82ca10d9eb no message 2022-08-31 16:19:43 +08:00
wangliwen ed29d6e0fb Merge branch 'master' into docker_package 2022-08-31 16:11:37 +08:00
yitonglei cdca90474d Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-31 15:48:50 +08:00
yitonglei aa9f756f2c 添加注释,并删掉无用的注释 2022-08-31 15:48:15 +08:00
wangliwen a2f3c79cee Merge branch 'master' into docker_package 2022-08-31 15:39:07 +08:00
Koi-tsk c62cfc25a6 自动审批通过的节点不发消息 2022-08-31 15:31:01 +08:00
wangliwen 9f78638ab7 Merge branch 'master' into docker_package 2022-08-31 15:19:57 +08:00
yitonglei d452ddb4fb 修改从金宏网获取用户的方法,增加自动任务调度功能 2022-08-31 13:50:46 +08:00
wangliwen a7489a8033 Merge branch 'master' into docker_package 2022-08-31 09:48:08 +08:00
wangliwen ce1bce47c5 ... 2022-08-31 09:47:46 +08:00
wangliwen b015025c40 Merge branch 'master' into docker_package 2022-08-30 15:21:12 +08:00
wangliwen c7adca34bd 使用索引替换 2022-08-30 15:20:35 +08:00
wangliwen c002b0c0c5 Merge branch 'master' into docker_package 2022-08-30 13:30:47 +08:00
wangliwen f95d2d0157 ... 2022-08-30 13:30:28 +08:00
wangliwen ae906d2331 Merge branch 'master' into docker_package 2022-08-30 13:03:51 +08:00
wangliwen 35f004a75d ... 2022-08-30 13:03:34 +08:00
wangliwen 0701c6fa67 Merge branch 'master' into docker_package 2022-08-30 12:55:16 +08:00