|
@@ -503,7 +503,7 @@ class ShopController extends BaseController {
|
|
|
'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS',
|
|
'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS',
|
|
|
'PAY_AT' => 'O.PAY_AT',
|
|
'PAY_AT' => 'O.PAY_AT',
|
|
|
'CONSIGNEE' => 'O.CONSIGNEE',
|
|
'CONSIGNEE' => 'O.CONSIGNEE',
|
|
|
- 'GOODS_TITLE' => 'O.GOODS_TITLE',
|
|
|
|
|
|
|
+ 'GOODS_TITLE' => 'OG.GOODS_TITLE',
|
|
|
'CREATE_USER' => 'O.CREATE_USER',
|
|
'CREATE_USER' => 'O.CREATE_USER',
|
|
|
'DEC_USER_NAME' => 'O.DEC_USER_ID',
|
|
'DEC_USER_NAME' => 'O.DEC_USER_ID',
|
|
|
'INVOICE_NO' => 'O.INVOICE_NO',
|
|
'INVOICE_NO' => 'O.INVOICE_NO',
|
|
@@ -554,7 +554,7 @@ class ShopController extends BaseController {
|
|
|
'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS',
|
|
'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS',
|
|
|
'PAY_AT' => 'O.PAY_AT',
|
|
'PAY_AT' => 'O.PAY_AT',
|
|
|
'CONSIGNEE' => 'O.CONSIGNEE',
|
|
'CONSIGNEE' => 'O.CONSIGNEE',
|
|
|
- 'GOODS_TITLE' => 'O.GOODS_TITLE',
|
|
|
|
|
|
|
+ 'GOODS_TITLE' => 'OG.GOODS_TITLE',
|
|
|
'CREATE_USER' => 'O.CREATE_USER',
|
|
'CREATE_USER' => 'O.CREATE_USER',
|
|
|
'DEC_USER_NAME' => 'O.DEC_USER_ID',
|
|
'DEC_USER_NAME' => 'O.DEC_USER_ID',
|
|
|
'INVOICE_NO' => 'O.INVOICE_NO',
|
|
'INVOICE_NO' => 'O.INVOICE_NO',
|
ryan