Commit Graph

2742 Commits

Author SHA1 Message Date
wangliwen 4a438a4ecb Merge branch 'master' into docker_package 2023-01-10 11:39:58 +08:00
wangliwen b30439de67 Merge branch 'dev' 2023-01-10 11:39:52 +08:00
wangliwen 9f9c631f77 过滤能力资源不存在的申请供评分 2023-01-10 11:39:45 +08:00
wangliwen ccfcdf1769 Merge branch 'master' into docker_package 2023-01-10 11:36:36 +08:00
wangliwen 848f0fd3c2 Merge branch 'dev' 2023-01-10 11:36:28 +08:00
wangliwen 4ac19db323 ... 2023-01-10 11:36:21 +08:00
wangliwen d574c7b99c 所有部门补充会客厅填入的部门名 、过滤掉未通过的申请 2023-01-10 11:33:29 +08:00
wangliwen 7d82b523dc Merge branch 'master' into docker_package 2023-01-10 10:26:08 +08:00
wangliwen 26dc0e0c6d Merge branch 'dev' 2023-01-10 10:26:02 +08:00
wangliwen 3721c336c3 查询部门时 若未进行云资源统计 填充0 2023-01-10 10:25:54 +08:00
wangliwen 22b103c5a0 Merge branch 'master' into docker_package 2023-01-10 10:05:50 +08:00
wangliwen cc1ae60000 Merge branch 'dev' 2023-01-10 10:05:42 +08:00
wangliwen 36fe1f08e2 ... 2023-01-10 10:05:13 +08:00
wangliwen 02efbd6131 Merge branch 'master' into docker_package 2023-01-09 16:26:02 +08:00
wangliwen 2d07184435 Merge branch 'dev' 2023-01-09 16:25:53 +08:00
wangliwen 40a8d4f525 按照是否评分分页查询申请个人申请 2023-01-09 16:00:54 +08:00
wangliwen afc2e0c292 Merge branch 'master' into docker_package 2023-01-09 11:53:49 +08:00
wangliwen e59dbd413d Merge branch 'dev' 2023-01-09 11:53:27 +08:00
wangliwen 80bb545457 回显问题 2023-01-09 11:53:16 +08:00
wangliwen 5ac81177a5 Merge branch 'master' into docker_package 2023-01-09 11:18:08 +08:00
wangliwen 5c8824eaae Merge branch 'dev' 2023-01-09 11:18:01 +08:00
wangliwen 00d59f3e54 能力申请后的评分内容增加字段 2023-01-09 11:15:50 +08:00
wangliwen c9a5332fdb Merge branch 'master' into docker_package 2023-01-09 10:13:17 +08:00
wangliwen 4bfdfbb72d Merge branch 'dev' 2023-01-09 10:13:09 +08:00
wangliwen acd84f2b4e ... 2023-01-09 10:13:01 +08:00
wangliwen 2a315cbbe6 Merge branch 'master' into docker_package 2023-01-09 09:34:33 +08:00
wangliwen 5a88fb6847 Merge branch 'dev' 2023-01-09 09:34:25 +08:00
wangliwen fe6ee21c7c ... 2023-01-09 09:34:17 +08:00
wangliwen e3bb49b72d Merge branch 'master' into docker_package 2023-01-06 17:29:09 +08:00
wangliwen 3d496eebff Merge branch 'dev' 2023-01-06 17:29:02 +08:00
wangliwen 477468b2e5 ... 2023-01-06 17:28:55 +08:00
wangliwen 8d433b5492 Merge branch 'master' into docker_package 2023-01-06 16:56:37 +08:00
wangliwen 2613f89efd Merge branch 'dev' 2023-01-06 16:56:30 +08:00
wangliwen 85a0d391ec 调整赋能场景数据库字段长度 2023-01-06 16:56:23 +08:00
wangliwen feb23ec133 Merge branch 'master' into docker_package 2023-01-06 11:06:34 +08:00
wangliwen eaeaae9b00 Merge branch 'dev' 2023-01-06 11:06:27 +08:00
wangliwen 5dab800614 fix HIQDUCS-220 共享门户-能力分类:基础设施和应用资源中类别跟能力集市的顺序不一致 2023-01-06 11:06:19 +08:00
wangliwen 23300d6ff7 Merge branch 'master' into docker_package 2023-01-05 17:36:58 +08:00
wangliwen e70ef99201 Merge branch 'dev' 2023-01-05 17:36:50 +08:00
wangliwen c0042b8adc ... 2023-01-05 14:07:14 +08:00
wangliwen 8d8238d7e6 Merge branch 'master' into docker_package 2023-01-05 09:44:42 +08:00
wangliwen 2f2558a849 Merge branch 'dev' 2023-01-05 09:44:34 +08:00
wangliwen f05d6e6965 异步减少环比用时 2023-01-05 09:44:26 +08:00
wangliwen a30f3b121e Merge branch 'master' into docker_package 2023-01-05 09:12:07 +08:00
wangliwen 5094bf1368 Merge branch 'dev' 2023-01-05 09:12:00 +08:00
wangliwen 51becaaae9 补充市级、区级 部门数量 2023-01-05 09:11:53 +08:00
wangliwen adee09981e Merge branch 'master' into docker_package 2023-01-05 09:02:17 +08:00
wangliwen 2d4595fd95 Merge branch 'dev' 2023-01-05 09:02:07 +08:00
wangliwen 11f38631c1 ... 2023-01-05 09:01:57 +08:00
wangliwen de9210a34f Merge branch 'master' into docker_package 2023-01-04 17:43:16 +08:00