Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/project-demand/index.js
#	src/views/projectdemand/demandcollection/add.vue

src/api/project-demand/index.js

@@ -19,6 +19,12 @@ export const getInfo = (requirementId) => {
     method: "get"
   });
 };
+export const getFormInfo = (requirementId) => {
+  return request({
+    url: `/workflow/mosr/requirement/form/${requirementId}`,
+    method: "get"
+  });
+};
 export const agreeTask = (data) => {
   return request({
     url: `/workflow/mosr/process/task/agree`,
@@ -41,6 +47,13 @@ export const addRequirement = (data) => {
     data: data
   });
 };
+export const resubmit = (data) => {
+  return request({
+    url: '/workflow/mosr/requirement/resubmit',
+    method: "post",
+    data: data
+  });
+};
 export const resubmitRequirement = (data) => {
   return request({
     url: '/workflow/mosr/requirement/resubmit',