Merge branch 'v2-220418' into 'v2-220418'

src/pages/priceManage/priceLibrary/detailLibrary.tsx

@@ -5,6 +5,7 @@ import StandardTable from '@/components/StandardTable';
 import { ColumnType } from 'antd/lib/table/interface';
 import { getIntl, history } from 'umi';
 import { getProductPriceManagementGetGoodsPriceHistory } from '@/services/ProductV2Api';
+import moment from 'moment';
 
 const DetailLibrary: React.FC<{}> = () => {
   const ref = useRef<any>({});
@@ -36,16 +37,16 @@ const DetailLibrary: React.FC<{}> = () => {
       title: getIntl().formatMessage({
         id: 'priceManage.schema.formProduct.pinlei',
       }),
-      dataIndex: 'customerCategory',
-      key: 'customerCategory',
+      dataIndex: 'categoryName',
+      key: 'categoryName',
       render: text => text?.name,
     },
     {
       title: getIntl().formatMessage({
         id: 'priceManage.schema.formProduct.pinpai',
       }),
-      dataIndex: 'unitName',
-      key: 'unitName',
+      dataIndex: 'brandName',
+      key: 'brandName',
       render: text => text?.name,
     },
     {
@@ -103,6 +104,9 @@ const DetailLibrary: React.FC<{}> = () => {
       }),
       dataIndex: 'effectiveStartTime',
       key: 'effectiveStartTime',
+      render: text => {
+        return text ? moment(text).format('YYYY-MM-DD') : undefined;
+      },
     },
     {
       title: getIntl().formatMessage({
@@ -110,6 +114,9 @@ const DetailLibrary: React.FC<{}> = () => {
       }),
       dataIndex: 'effectiveEndTime',
       key: 'effectiveEndTime',
+      render: text => {
+        return text ? moment(text).format('YYYY-MM-DD') : undefined;
+      },
     },
   ];
   const fetchData = (params: any) => {