Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/jyh/index.ts

src/api/jyh/index.ts

@@ -136,6 +136,28 @@ export function getVulnerabilityList() {
   });
 }
 
+// 获取漏洞数据
+export const getVulnList = (data): Promise<any> => {
+  return reqCatchV2(() =>
+    request({
+      url: `/api/v1/repo/vulnerability/page`,
+      method: 'post',
+      data,
+    })
+  );
+}
+
+// 获取漏洞数据
+export const getVulnDetail = (data): Promise<any> => {
+  return reqCatchV2(() =>
+    request({
+      url: `/api/v1/repo/vulnerability/info`,
+      method: 'POST',
+      data,
+    })
+  );
+}
+
 // 迁移批量导入
 export function repoImport(data: types.commonRepoReqType){
   return reqCatchV2(() =>