Merge branch 'cherry-pick-2d3f637b' into 'v2-220318'

Merge branch 'chore-v2' into 'v2' See merge request linkseeks-design/pro-platform!305 (cherry picked from commit 53205c481f713ab502864beb1729face0d6cd441) 39eaa01b Merge branch 'chore-v2' into 'v2'

Merge branch 'cherry-pick-2d3f637b' into 'v2-220318'
2230b002 · Bill · 5fbf69b1 · 2230b002
Commit 2230b002 authored Apr 14, 2022 by Bill
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

index.tsx ...ngAbility/merchantCoupon/components/RunningInfo/index.tsx +1 -0

No files found.
--- a/src/pages/transaction/marketingAbility/merchantCoupon/components/RunningInfo/index.tsx
+++ b/src/pages/transaction/marketingAbility/merchantCoupon/components/RunningInfo/index.tsx
@@ -201,6 +201,7 @@ const RunningInfo: React.FC<IProps> = (props) => {
    {
      title: `${intl.formatMessage({ id: 'merchantCoupon.OrderUseTime' })}`,
      dataIndex: 'useTime',
+      render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
    },
    {
      title: `${intl.formatMessage({ id: 'merchantCoupon.Mall'})}`,