内核更新

2017-02-14 09:41:34 +08:00
parent 689376a5d9
commit b355535009
43 changed files with 330 additions and 100 deletions
--- a/core/library/traits/model/SoftDelete.php
+++ b/core/library/traits/model/SoftDelete.php
@@ -142,7 +142,7 @@ trait SoftDelete
    {
        $field = isset($this->deleteTime) ? $this->deleteTime : 'delete_time';
        if (!strpos($field, '.')) {
-            $field = $this->db(false)->getTable() . '.' . $field;
+            $field = '__TABLE__.' . $field;
        }
        if (!$read && strpos($field, '.')) {
            $array = explode('.', $field);