Merge branch 'master' of http://git.dever.cc:3000/dever-package/pay

database/yspay_cash.php

@@ -267,5 +267,35 @@ return array(
             'order' => array('id' => 'desc'),
             'col' => '*',
         ),
+        'getOtherList' => array(
+            'option' => array(
+                'start' => array('yes-cdate', '>='),
+                'end' => array('yes-cdate', '<='),
+                'source_order_num' => array('yes', 'like'),
+                'merchant_id' => 'yes',
+                'status' => 'yes',
+                'fenzhang_status' => 'yes',
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'page' => array(20, 'list'),
+            'order' => array('id' => 'desc'),
+            'col' => '*',
+        ),
+        'getOtherListExcel' => array(
+            'option' => array(
+                'start' => array('yes-cdate', '>='),
+                'end' => array('yes-cdate', '<='),
+                'source_order_num' => array('yes', 'like'),
+                'merchant_id' => 'yes',
+                'status' => 'yes',
+                'fenzhang_status' => 'yes',
+                'state' => 1,
+            ),
+            'type' => 'all',
+            'page' => array(20, 'list'),
+            'order' => array('id' => 'desc'),
+            'col' => '*',
+        ),
     ),
 );