解决合并冲突

xichongSys/src/http/moudules/getlist.js

@@ -139,5 +139,11 @@ export const listAllBaseInfo = (data) => {
       data
     })
   }
-  
-  
+//领取人员查询
+export const getGrantList = (data) => {
\ No newline at end of file
+  return axios({
+    url: '/grantInfo/getGrantList',
+    method: 'post',
+    data
+  })
+}