Merge branch 'master' into feature/2034-brook-calcBonus

backendApi/modules/v1/controllers/ShopController.php

@@ -413,6 +413,9 @@ class ShopController extends BaseController {
             'MOBILE'=> 'O.MOBILE',
             'PERIOD_NUM'=> 'O.PERIOD_NUM',
             'CREATED_AT'=> 'O.CREATED_AT',
+            'ORDER_TYPE'=> 'O.ORDER_TYPE',
+            'STATUS' => 'O.STATUS',
+            'IS_AUTO' => 'O.IS_AUTO'
         ]);
         $filter['condition'] = !$filter['condition'] ? '1=1 AND O.IS_DELETE=0' : ('O.IS_DELETE=0 ' . $filter['condition']);
         $form = new ShopExportForm();