Merge branch 'master' into dev

app-ghs/controllers/CgRefundController.php

@@ -111,6 +111,11 @@ class CgRefundController extends BaseController
         if ($status > -1) {
             $where['status'] = $status;
         }
+        // sameDay：-1全部 1当天售后 0隔天售后（与销售售后列表对齐）
+        $sameDay = isset($get['sameDay']) ? intval($get['sameDay']) : -1;
+        if ($sameDay === 0 || $sameDay === 1) {
+            $where['sameDay'] = $sameDay;
+        }
 
         $export = $get['export'] ?? 0;
         if ($export == 1) {