Merge branch 'master-new' into master-new-dev-wf

app/admin/controller/GoodOfflineLog.php

@@ -32,7 +32,7 @@ class GoodOfflineLog extends Base
             $hand = resign_hand_user($this->uid, 0);
             if (!empty($role[DataGroupModel::$type_全部])) {
                 $arr = array_unique(array_merge($hand, $role[DataGroupModel::$type_全部]));
-                $where[] = ['createrid', 'in', $arr];
+                $where[] = ['a.createrid', 'in', $arr];
             }
         }