Commit 4226626f015f0f6ae13c70949d523eb3efef671b

Authored by 曾国涛
2 parents ef46f36b de4ea95b

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/pages/Invoice/Invoice/index.tsx
#	src/pages/Invoice/constant.tsx
src/pages/Invoice/constant.tsx
@@ -176,7 +176,7 @@ export const INVOICE_COLUMNS = [ @@ -176,7 +176,7 @@ export const INVOICE_COLUMNS = [
176 { 176 {
177 title: '开票日期', 177 title: '开票日期',
178 dataIndex: 'invoicingTime', 178 dataIndex: 'invoicingTime',
179 - valueType: 'dateRange', 179 + valueType: 'date',
180 width: 150, 180 width: 150,
181 search: { 181 search: {
182 transform: (value) => { 182 transform: (value) => {