Commit Graph

  • 02f28b100e Merge branch 'master' into docker_package docker_package wangliwen 2023-01-16 16:04:08 +0800
  • 427d0312cc Merge branch 'dev' master wangliwen 2023-01-16 16:04:01 +0800
  • 38788db278 能力使用统计导出增加云资源、云视频 dev wangliwen 2023-01-16 16:03:53 +0800
  • e6adffab53 Merge branch 'master' into docker_package wangliwen 2023-01-16 11:13:56 +0800
  • 88ce9be9dd Merge branch 'dev' wangliwen 2023-01-16 11:13:48 +0800
  • a6f955f22d 调整评论字数不限制 wangliwen 2023-01-16 11:13:39 +0800
  • de93cb7234 Merge branch 'master' into docker_package wangliwen 2023-01-16 10:27:04 +0800
  • 462cd7025f Merge branch 'dev' wangliwen 2023-01-16 10:26:57 +0800
  • 0673343ad6 Merge branch 'dev' of http://192.168.124.50:3000/wangliwen/share-platform into dev wangliwen 2023-01-16 10:26:29 +0800
  • 10b45f7c48 Merge branch 'master' into docker_package wangliwen 2023-01-16 10:26:00 +0800
  • a7d497fdbb Merge branch 'dev' wangliwen 2023-01-16 10:25:53 +0800
  • 3b671cb670 填充默认0 wangliwen 2023-01-16 10:25:44 +0800
  • 45dc1bad08 Merge remote-tracking branch 'origin/dev' into dev QYTHINK\qiaoy 2023-01-16 10:13:10 +0800
  • 346284ae26 excel会议室申请记录导入 QYTHINK\qiaoy 2023-01-16 10:12:24 +0800
  • db620ea454 Merge branch 'master' into docker_package wangliwen 2023-01-16 09:59:30 +0800
  • 4a91e17e5e Merge branch 'dev' wangliwen 2023-01-16 09:59:23 +0800
  • 1cbeb17eee HIQDUCS-757 wangliwen 2023-01-16 09:59:13 +0800
  • a6cadcb68f Merge branch 'master' into docker_package wangliwen 2023-01-12 14:58:56 +0800
  • c45186367a Merge branch 'dev' wangliwen 2023-01-12 14:58:49 +0800
  • 0fe0f9b4a5 npe wangliwen 2023-01-12 14:58:43 +0800
  • 3fc32a5a43 Merge branch 'master' into docker_package wangliwen 2023-01-12 14:40:29 +0800
  • 3ccdca54c5 Merge branch 'dev' wangliwen 2023-01-12 14:40:22 +0800
  • 8ff33d570e 获取能力申请详情可过滤只出某个资源所属部门 wangliwen 2023-01-12 14:40:13 +0800
  • 25d68b648b Merge branch 'master' into docker_package wangliwen 2023-01-12 11:01:57 +0800
  • d8bff2e17e Merge branch 'dev' wangliwen 2023-01-12 11:01:47 +0800
  • 1998f17c2e 会客厅增加申请成功次数 wangliwen 2023-01-12 11:01:37 +0800
  • fa3bc6484a Merge branch 'master' into docker_package wangliwen 2023-01-11 13:02:22 +0800
  • 2c342eb087 Merge branch 'dev' wangliwen 2023-01-11 13:02:15 +0800
  • 42449c79a2 能力统计-能力使用统计 资源类型过滤失效 wangliwen 2023-01-11 13:02:07 +0800
  • 07b5892265 Merge branch 'master' into docker_package wangliwen 2023-01-10 18:19:35 +0800
  • ef790fd82c Merge branch 'dev' wangliwen 2023-01-10 18:19:28 +0800
  • 9503da7c52 ... wangliwen 2023-01-10 18:18:57 +0800
  • 451a5629de ... wangliwen 2023-01-10 18:17:56 +0800
  • bb44d49adb 格式化代码 wangliwen 2023-01-10 17:10:51 +0800
  • 596b7e0db4 Merge branch 'master' into docker_package wangliwen 2023-01-10 15:59:34 +0800
  • defb11ee00 Merge branch 'dev' wangliwen 2023-01-10 15:59:28 +0800
  • b9ba60bb40 ... wangliwen 2023-01-10 15:59:21 +0800
  • a8d8182124 Merge branch 'master' into docker_package wangliwen 2023-01-10 15:29:34 +0800
  • 6929e5cd3e Merge branch 'dev' wangliwen 2023-01-10 15:29:28 +0800
  • b6f305e71a .。。 wangliwen 2023-01-10 15:29:21 +0800
  • 65b13b651c fix 500 wangliwen 2023-01-10 15:28:44 +0800
  • a769a5a64a Merge branch 'master' into docker_package wangliwen 2023-01-10 14:53:49 +0800
  • 29c406e2d8 Merge branch 'dev' wangliwen 2023-01-10 14:53:42 +0800
  • 54333ea1d3 补充资源分类 wangliwen 2023-01-10 14:53:34 +0800
  • a61d906f94 Merge branch 'master' into docker_package wangliwen 2023-01-10 14:17:00 +0800
  • 9a78f132ae Merge branch 'dev' wangliwen 2023-01-10 14:16:53 +0800
  • 35ed50e443 ... wangliwen 2023-01-10 14:16:47 +0800
  • f6d8cb2c95 Merge branch 'master' into docker_package wangliwen 2023-01-10 14:03:04 +0800
  • b8de7ee235 Merge branch 'dev' wangliwen 2023-01-10 14:02:58 +0800
  • aa225e9255 ... wangliwen 2023-01-10 14:02:49 +0800
  • f79cb8d3fa Merge branch 'master' into docker_package wangliwen 2023-01-10 14:00:41 +0800
  • 41cb130314 Merge branch 'dev' wangliwen 2023-01-10 14:00:32 +0800
  • 9b61af88ff 补充默认数量0 和 补充政务云资源部门名称 wangliwen 2023-01-10 14:00:23 +0800
  • b95e75b886 Merge branch 'master' into docker_package wangliwen 2023-01-10 11:47:26 +0800
  • b672daf030 Merge branch 'dev' wangliwen 2023-01-10 11:47:20 +0800
  • 3ac9f76c7f ... wangliwen 2023-01-10 11:47:13 +0800
  • 4a438a4ecb Merge branch 'master' into docker_package wangliwen 2023-01-10 11:39:58 +0800
  • b30439de67 Merge branch 'dev' wangliwen 2023-01-10 11:39:52 +0800
  • 9f9c631f77 过滤能力资源不存在的申请供评分 wangliwen 2023-01-10 11:39:45 +0800
  • ccfcdf1769 Merge branch 'master' into docker_package wangliwen 2023-01-10 11:36:36 +0800
  • 848f0fd3c2 Merge branch 'dev' wangliwen 2023-01-10 11:36:28 +0800
  • 4ac19db323 ... wangliwen 2023-01-10 11:36:21 +0800
  • d574c7b99c 所有部门补充会客厅填入的部门名 、过滤掉未通过的申请 wangliwen 2023-01-10 11:33:29 +0800
  • 7d82b523dc Merge branch 'master' into docker_package wangliwen 2023-01-10 10:26:08 +0800
  • 26dc0e0c6d Merge branch 'dev' wangliwen 2023-01-10 10:26:02 +0800
  • 3721c336c3 查询部门时 若未进行云资源统计 填充0 wangliwen 2023-01-10 10:25:54 +0800
  • 22b103c5a0 Merge branch 'master' into docker_package wangliwen 2023-01-10 10:05:50 +0800
  • cc1ae60000 Merge branch 'dev' wangliwen 2023-01-10 10:05:42 +0800
  • 36fe1f08e2 ... wangliwen 2023-01-10 10:05:13 +0800
  • 02efbd6131 Merge branch 'master' into docker_package wangliwen 2023-01-09 16:26:02 +0800
  • 2d07184435 Merge branch 'dev' wangliwen 2023-01-09 16:25:53 +0800
  • 40a8d4f525 按照是否评分分页查询申请个人申请 wangliwen 2023-01-09 16:00:54 +0800
  • afc2e0c292 Merge branch 'master' into docker_package wangliwen 2023-01-09 11:53:49 +0800
  • e59dbd413d Merge branch 'dev' wangliwen 2023-01-09 11:53:27 +0800
  • 80bb545457 回显问题 wangliwen 2023-01-09 11:53:16 +0800
  • 5ac81177a5 Merge branch 'master' into docker_package wangliwen 2023-01-09 11:18:08 +0800
  • 5c8824eaae Merge branch 'dev' wangliwen 2023-01-09 11:18:01 +0800
  • 00d59f3e54 能力申请后的评分内容增加字段 wangliwen 2023-01-09 11:15:50 +0800
  • c9a5332fdb Merge branch 'master' into docker_package wangliwen 2023-01-09 10:13:17 +0800
  • 4bfdfbb72d Merge branch 'dev' wangliwen 2023-01-09 10:13:09 +0800
  • acd84f2b4e ... wangliwen 2023-01-09 10:13:01 +0800
  • 2a315cbbe6 Merge branch 'master' into docker_package wangliwen 2023-01-09 09:34:33 +0800
  • 5a88fb6847 Merge branch 'dev' wangliwen 2023-01-09 09:34:25 +0800
  • fe6ee21c7c ... wangliwen 2023-01-09 09:34:17 +0800
  • e3bb49b72d Merge branch 'master' into docker_package wangliwen 2023-01-06 17:29:09 +0800
  • 3d496eebff Merge branch 'dev' wangliwen 2023-01-06 17:29:02 +0800
  • 477468b2e5 ... wangliwen 2023-01-06 17:28:55 +0800
  • 8d433b5492 Merge branch 'master' into docker_package wangliwen 2023-01-06 16:56:37 +0800
  • 2613f89efd Merge branch 'dev' wangliwen 2023-01-06 16:56:30 +0800
  • 85a0d391ec 调整赋能场景数据库字段长度 wangliwen 2023-01-06 16:56:23 +0800
  • feb23ec133 Merge branch 'master' into docker_package wangliwen 2023-01-06 11:06:34 +0800
  • eaeaae9b00 Merge branch 'dev' wangliwen 2023-01-06 11:06:27 +0800
  • 5dab800614 fix HIQDUCS-220 共享门户-能力分类:基础设施和应用资源中类别跟能力集市的顺序不一致 wangliwen 2023-01-06 11:06:19 +0800
  • 23300d6ff7 Merge branch 'master' into docker_package wangliwen 2023-01-05 17:36:58 +0800
  • e70ef99201 Merge branch 'dev' wangliwen 2023-01-05 17:36:50 +0800
  • c0042b8adc ... wangliwen 2023-01-05 14:07:14 +0800
  • 8d8238d7e6 Merge branch 'master' into docker_package wangliwen 2023-01-05 09:44:42 +0800
  • 2f2558a849 Merge branch 'dev' wangliwen 2023-01-05 09:44:34 +0800
  • f05d6e6965 异步减少环比用时 wangliwen 2023-01-05 09:44:26 +0800
  • a30f3b121e Merge branch 'master' into docker_package wangliwen 2023-01-05 09:12:07 +0800