Merge branch 'master' into feat/aging2.1

* master:
  Feat/aging2.0

# Conflicts:
#	src/pages/AfterSaleManage/Pending/index.jsx
#	src/pages/GoodsManage/service.js

src/pages/AfterSaleManage/Pending/index.jsx

@@ -3,7 +3,6 @@ import { notification, Button, Popconfirm, Modal } from 'antd';
 import ProTable from '@ant-design/pro-table';
 import moment from 'moment';
 import _ from 'lodash';
-import { da } from 'date-fns/locale';
 import { searchList, auditInfoApi, orderDetail, logisticsIntercept, getOpLog } from '../services';
 import { columnSticData, appealType } from '../data';
 import AuditModal from '../components/auditModal';

src/pages/GoodsManage/service.js

@@ -181,7 +181,10 @@ export async function queryAllAfterAddress() {
   };
   const data = request.post('/api/kdsp/supplier/after-sales-addrs-page', {
     prefix: kdspApi,
-    data: params,
+    data: stringify(_.omitBy(params, v => !v)),
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
   });
   return data;
 }