From cf85daf81a60f2c686535e4dacca59ce78f0b2f2 Mon Sep 17 00:00:00 2001
From: oldrind <1401019000@qq.com>
Date: Wed, 13 Jan 2016 13:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=5Fauto=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E5=92=8C=5Fvalidate=E5=B1=9E=E6=80=A7=E7=9A=84=E4=B8=8B?=
 =?UTF-8?q?=E5=88=92=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/traits/model/Auto.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/library/traits/model/Auto.php b/library/traits/model/Auto.php
index ef961572..73e64b98 100644
--- a/library/traits/model/Auto.php
+++ b/library/traits/model/Auto.php
@@ -146,12 +146,12 @@ trait Auto
             } else {
                 $_auto = $this->options['auto'];
                 unset($this->options['auto']);
-                if (empty($_auto) && !empty($this->_auto)) {
-                    $_auto = $this->_auto;
+                if (empty($_auto) && !empty($this->auto)) {
+                    $_auto = $this->auto;
                 }
             }
-        } elseif (!empty($this->_auto)) {
-            $_auto = $this->_auto;
+        } elseif (!empty($this->auto)) {
+            $_auto = $this->auto;
         }
         // 自动填充
         if (!empty($_auto)) {
@@ -248,12 +248,12 @@ trait Auto
             } else {
                 $_validate = $this->options['validate'];
                 unset($this->options['validate']);
-                if (empty($_validate) && !empty($this->_validate)) {
-                    $_validate = $this->_validate;
+                if (empty($_validate) && !empty($this->validate)) {
+                    $_validate = $this->validate;
                 }
             }
-        } elseif (!empty($this->_validate)) {
-            $_validate = $this->_validate;
+        } elseif (!empty($this->validate)) {
+            $_validate = $this->validate;
         }
         // 属性验证
         if (!empty($_validate)) {