|
|
@@ -549,14 +549,14 @@ class ShopController extends BaseController {
|
|
|
'COUNTRY' => 'O.COUNTRY_ID',
|
|
|
'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE',
|
|
|
'PAY_TYPE' => 'O.PAY_TYPE',
|
|
|
- 'CREATE_USER_NAME' => 'O.CREATE_USER_NAME',
|
|
|
+ 'CREATE_USER_NAME' => 'O.CREATE_USER',
|
|
|
'SKU_CODE' => 'O.SKU_CODE',
|
|
|
'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS_NAME',
|
|
|
'PAY_AT' => 'O.PAY_AT',
|
|
|
'CONSIGNEE' => 'O.CONSIGNEE',
|
|
|
'GOODS_TITLE' => 'O.GOODS_TITLE',
|
|
|
'CREATE_USER' => 'O.CREATE_USER',
|
|
|
- 'DEC_USER_NAME' => 'O.DEC_USER_NAME',
|
|
|
+ 'DEC_USER_NAME' => 'O.DEC_USER_ID|O.ORDER_DEC_ID',
|
|
|
'INVOICE_NO' => 'O.INVOICE_NO',
|
|
|
]);
|
|
|
|
ryan