Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/jyh/index.ts
#	src/components/AdvanceSearch/index.vue

src/api/jyh/index.ts

@@ -1,3 +1,4 @@
+import { reqCatchV2, type catchRt } from '@/utils/catch';
 import request from '@/utils/request';
 
 // 详情-获取版本信息
@@ -17,3 +18,24 @@ export function releasePage(data): Promise<any> {
     data
   });
 }
+
+// 获取用户信息
+export function getInviteListData(): catchRt<any> {
+  return reqCatchV2(() => request({
+    url: '/api/v1/group/member/invite/list',
+    method: 'get'
+  }, {
+    customError: true
+  }));
+}
+
+// 获取用户信息
+export function acceptInvite(params): catchRt<any> {
+  return reqCatchV2(() => request({
+    url: '/api/v1/group/member/invite/accept',
+    method: 'post',
+    data: params,
+  }, {
+    customError: true
+  }));
+}