merge code pull

src/api/recruit/recruitstudentsignup.ts

@@ -433,6 +433,19 @@ export const changeMajor = (obj: any) => {
 	});
 };
 
+/**
+ * 退档恢复
+ * @param obj
+ */
+export const resetSign = (obj: any) => {
+	return request({
+		url: '/recruit/recruitstudentsignup/resetSign',
+		method: 'post',
+		data: obj,
+	});
+};
+
+
 /**
  * 重新推送
  * @param obj
@@ -550,3 +563,11 @@ export const interview = (obj: any) => {
 		data: obj,
 	});
 };
+
+
+export const queryAllRecruitUser = () => {
+	return request({
+		url: '/recruit/recruitstudentsignup/queryAllRecruitUser',
+		method: 'get'
+	});
+};

src/api/recruit/recruitstudentsignupturnover.ts

@@ -52,8 +52,8 @@ export const delObj = (id: string | number) => {
  */
 export const putObj = (obj: any) => {
 	return request({
-		url: '/recruit/recruitstudentsignupturnover',
-		method: 'put',
+		url: '/recruit/recruitstudentsignupturnover/edit',
+		method: 'post',
 		data: obj,
 	});
 };