Commit 97c917dc authored by Bill's avatar Bill

Merge branch 'cherry-pick-53205c48' into 'v2-220418'

Merge branch 'cherry-pick-2d3f637b' into 'v2-220418' See merge request linkseeks-design/pro-platform!306
parents 5fbf69b1 2230b002
...@@ -201,6 +201,7 @@ const RunningInfo: React.FC<IProps> = (props) => { ...@@ -201,6 +201,7 @@ const RunningInfo: React.FC<IProps> = (props) => {
{ {
title: `${intl.formatMessage({ id: 'merchantCoupon.OrderUseTime' })}`, title: `${intl.formatMessage({ id: 'merchantCoupon.OrderUseTime' })}`,
dataIndex: 'useTime', dataIndex: 'useTime',
render: (text) => text ? moment(text).format('YYYY-MM-DD HH:mm:ss') : '',
}, },
{ {
title: `${intl.formatMessage({ id: 'merchantCoupon.Mall'})}`, title: `${intl.formatMessage({ id: 'merchantCoupon.Mall'})}`,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment