Commit Graph

2450 Commits

Author SHA1 Message Date
yitonglei f1d87b3907 整理代码 2022-08-19 14:35:56 +08:00
wangliwen fcfff400fc Merge branch 'master' into docker_package 2022-08-19 14:22:39 +08:00
wangliwen 1f7a61a601 Merge remote-tracking branch 'origin/dev' into dev 2022-08-19 14:22:19 +08:00
wangliwen 999c265c7e ... 2022-08-19 14:22:10 +08:00
yitonglei e503565a85 cim 根据应用领域查询图层服务 和 查询智能算法组件 2022-08-19 14:11:06 +08:00
dinggang 6dcee405c5 1.cim模块统计查询及列表查询
2.编目及字典更新
2022-08-19 11:59:05 +08:00
wangliwen 29a5dffb65 Merge branch 'master' into docker_package 2022-08-19 11:29:40 +08:00
wangliwen f4418bae13 能力申请V3 批量进行能力申请 2022-08-19 11:29:23 +08:00
wangliwen 151a34f456 Merge branch 'master' into docker_package 2022-08-19 11:21:09 +08:00
wangliwen 13db3a21bc 能力申请V3补充 2022-08-19 11:20:53 +08:00
wangliwen bc760323fa Merge branch 'master' into docker_package 2022-08-19 10:04:28 +08:00
wangliwen 08c05a2a55 Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 2022-08-19 10:04:04 +08:00
wangliwen ea21ee8c76 Merge branch 'master' into docker_package 2022-08-19 10:03:24 +08:00
dinggang a20fd1f5c8 cim模块 2022-08-19 10:03:14 +08:00
wangliwen 633339f64b 能力申请 V3 2022-08-19 10:03:06 +08:00
wangliwen 43cd2c492a Merge branch 'master' into docker_package 2022-08-18 18:14:23 +08:00
wangliwen 368d78f48f ... 2022-08-18 18:14:08 +08:00
wangliwen fc11b15fbf Merge branch 'master' into docker_package 2022-08-18 14:53:58 +08:00
wangliwen 92542c2ad8 TODO 调整 2022-08-18 14:53:41 +08:00
wangliwen 069a42e0c0 ... 2022-08-18 10:17:46 +08:00
wangliwen 7fccba5008 Merge branch 'master' into docker_package 2022-08-18 10:01:26 +08:00
wangliwen 964bf55f12 TODO abilityprocess_v3 能力申请流程的发起 2022-08-18 10:01:04 +08:00
wangliwen 00592c3242 Merge branch 'master' into docker_package 2022-08-17 18:09:43 +08:00
Koi-tsk 617ecd64c8 初步完成区、市审批流程监听器 2022-08-17 17:41:55 +08:00
wangliwen 8337e4320d Merge branch 'master' into docker_package 2022-08-17 16:27:24 +08:00
wangliwen 4446657af2 500了 2022-08-17 16:27:11 +08:00
wangliwen 806dcb3d80 Merge branch 'master' into docker_package 2022-08-17 16:04:35 +08:00
wangliwen 0eb62c0885 增加下架附件文件名 2022-08-17 16:04:23 +08:00
wangliwen 0b0278a9fb Merge branch 'master' into docker_package 2022-08-17 15:44:38 +08:00
wangliwen 4028588ea7 下架新增录入字段 2022-08-17 15:43:27 +08:00
wangliwen f5c66771be Merge branch 'master' into docker_package 2022-08-17 11:17:08 +08:00
wangliwen b7ce167d5f 增加取消置顶接口 2022-08-17 11:16:34 +08:00
wangliwen 37adee5850 Merge branch 'master' into docker_package 2022-08-17 11:05:59 +08:00
huangweixiong 9bcdd78bae 网关重启适配 2022-08-17 11:04:49 +08:00
wangliwen 45cf2f747f Merge branch 'master' into docker_package 2022-08-17 11:02:43 +08:00
huangweixiong 98a18a1ddd 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: (25 commits)
  置顶存在缓存
  ...
  会议室预约的表描述字段扩增
  菜单新增会议室
  会议室预约的新增表
  能力广场和能力集市资源排序按指定方式排序修改 门户首页最新,最热查询排除知识库
  total 排序将置顶放前面
  ...
  能力广场和能力集市资源排序按指定方式排序
  npe
  ...
  npe
  npe
  归并为一个排序
  屮
  ...
  ...
  屮
  stream 的排序模式
  。。。
  ...
2022-08-17 11:01:16 +08:00
huangweixiong ebe3d33994 适配网关重启 2022-08-17 11:00:59 +08:00
wangliwen 5d83ef8fd2 Merge branch 'master' into docker_package 2022-08-17 10:17:21 +08:00
wangliwen 1f7d1e69db 置顶存在缓存 2022-08-17 10:17:02 +08:00
wangliwen 5c1a887024 Merge branch 'master' into docker_package 2022-08-17 09:13:27 +08:00
wangliwen afbfd42c07 ... 2022-08-17 09:13:05 +08:00
zhangzhikang 3697fbf5ee 会议室预约的表描述字段扩增 2022-08-16 17:39:34 +08:00
wangliwen 6470c2e3fb Merge branch 'master' into docker_package 2022-08-16 17:35:57 +08:00
wangliwen 74888c915b Merge branch 'master' into docker_package 2022-08-16 14:00:10 +08:00
dinggang 1e5231a197 菜单新增会议室 2022-08-16 13:59:13 +08:00
zhangzhikang b780ea9ad8 会议室预约的新增表 2022-08-16 14:02:48 +08:00
wangliwen 16a06c51a5 Merge branch 'master' into docker_package 2022-08-16 10:55:17 +08:00
dinggang 408baba4af 能力广场和能力集市资源排序按指定方式排序修改
门户首页最新,最热查询排除知识库
2022-08-16 10:26:47 +08:00
wangliwen 4b657ea0d3 Merge branch 'master' into docker_package 2022-08-16 10:18:15 +08:00
wangliwen 42d7d1a27c total 排序将置顶放前面 2022-08-16 10:17:37 +08:00