Merge branch 'zjl_assign_20190812' into development

761929ec · 朱继来 · 4482582f · 04bcbcc4 · 761929ec
Commit 761929ec authored Aug 21, 2019 by 朱继来
Showing with 2 additions and 1 deletions
app/Model/KefuModel.php
--- a/app/Model/KefuModel.php
+++ b/app/Model/KefuModel.php
@@ -57,7 +57,8 @@ class KefuModel extends Model
                    }
                })
                ->select($field)
-                ->orderBy('status', 'desc');
+                ->orderBy('status', 'desc')
+                ->orderBy('id', 'asc');

        if ($export) {
            $list = $list->get()->toArray();