From 52d368a851e039c1591b70385c47e57dcb438913 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sat, 2 Jan 2016 21:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=B3=BB=E7=BB=9Ftraits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/traits/model/adv.php      | 12 +++++-------
 library/traits/model/auto.php     |  4 ++--
 library/traits/model/relation.php |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/library/traits/model/adv.php b/library/traits/model/adv.php
index 8bc55c6a..e8d776bd 100644
--- a/library/traits/model/adv.php
+++ b/library/traits/model/adv.php
@@ -13,11 +13,10 @@ namespace traits\model;
 
 trait Adv
 {
-    protected $optimLock      = 'lock_version';
-    protected $returnType     = 'array';
-    protected $serializeField = [];
-    protected $readonlyField  = [];
-    protected $partition      = [];
+    protected $optimLock = 'lock_version';
+    //protected $serializeField = [];
+    //protected $readonlyField  = [];
+    //protected $partition      = [];
 
     /**
      * 利用__call方法重载 实现一些特殊的Model方法 （魔术方法）
@@ -219,9 +218,8 @@ trait Adv
      * @param string $type 返回类型 默认为数组
      * @return mixed
      */
-    public function returnResult($data, $type = '')
+    public function returnResult($data, $type = 'array')
     {
-        $type = $type ?: $this->returnType;
 
         switch ($type) {
             case 'array':
diff --git a/library/traits/model/auto.php b/library/traits/model/auto.php
index 99d51214..533cc16d 100644
--- a/library/traits/model/auto.php
+++ b/library/traits/model/auto.php
@@ -15,8 +15,8 @@ use think\Lang;
 
 trait Auto
 {
-    protected $validate = []; // 自动验证定义
-    protected $auto     = []; // 自动完成定义
+    //protected $validate = []; // 自动验证定义
+    //protected $auto     = []; // 自动完成定义
 
     /**
      * 创建数据对象 但不保存到数据库
diff --git a/library/traits/model/relation.php b/library/traits/model/relation.php
index 9bfa4f57..2df6ff7c 100644
--- a/library/traits/model/relation.php
+++ b/library/traits/model/relation.php
@@ -19,7 +19,7 @@ define('MANY_TO_MANY', 4);
 trait Relation
 {
     // 关联定义
-    protected $link = [];
+    //protected $link = [];
 
     /**
      * 得到关联的数据表名