Merge branch 'mhy' into 'master'

Mhy

See merge request !17

xichongSys/src/http/moudules/getlist.js

@@ -125,8 +125,16 @@ export const seledysqdc = (data) => {
 }
 //覆盖人员查询
 export const listAllBaseInfo = (data) => {
+    return axios({
+      url: '/baseInfo/getAllBaseInfo',
+      method: 'post',
+      data
+    })
+  }
+//领取人员查询
+export const getGrantList = (data) => {
   return axios({
-    url: '/baseInfo/getAllBaseInfo',
+    url: '/grantInfo/getGrantList',
     method: 'post',
     data
   })