Merge branch 'dev' of http://47.244.231.31:8099/zhl/globalso-v6 into dev

@@ -18,7 +18,7 @@ class Base extends Model
     public function lists($map, $p, $row, $order = 'id', $fields = ['*']){
     public function lists($map, $p, $row, $order = 'id', $fields = ['*']){
         //TODO::where(['id'=>'','name'=>''])
         //TODO::where(['id'=>'','name'=>''])
         $lists = $this->select($fields)->where($map)->forPage($p,$row)->orderBy($order)->get();
         $lists = $this->select($fields)->where($map)->forPage($p,$row)->orderBy($order)->get();
-        if ($lists->isEmpty() !== false) {
+        if (empty($lists)) {
             return false;
             return false;
         }
         }
         $lists = $lists->toArray();
         $lists = $lists->toArray();
@@ -38,7 +38,7 @@ class Base extends Model
      */
      */
     public function list($map,$order = 'id',$fields = ['*']){
     public function list($map,$order = 'id',$fields = ['*']){
         $lists = $this->select($fields)->where($map)->orderBy($order)->get();
         $lists = $this->select($fields)->where($map)->orderBy($order)->get();
-        if ($lists->isEmpty() !== false) {
+        if (empty($lists)) {
             return false;
             return false;
         }
         }
         $lists = $lists->toArray();
         $lists = $lists->toArray();
@@ -54,7 +54,7 @@ class Base extends Model
     public function read($condition,$files = ['*'])
     public function read($condition,$files = ['*'])
     {
     {
         $info = $this->select($files)->where($condition)->first();
         $info = $this->select($files)->where($condition)->first();
-        if ($info->isEmpty() !== false) {
+        if (empty($info)) {
             return false;
             return false;
         }
         }
         $info = $info->toArray();
         $info = $info->toArray();

@@ -8,4 +8,5 @@ class Manager extends Base
     protected $table = 'manager';
     protected $table = 'manager';
     //自动维护create_at创建时间 updated_at修改时间
     //自动维护create_at创建时间 updated_at修改时间
     public $timestamps = true;
     public $timestamps = true;
+
 }
 }

@@ -8,4 +8,5 @@ class Product extends Base
     protected $table = 'gl_product';
     protected $table = 'gl_product';
     //自动维护create_at创建时间 updated_at修改时间
     //自动维护create_at创建时间 updated_at修改时间
     public $timestamps = true;
     public $timestamps = true;
+
 }
 }

@@ -10,6 +10,7 @@ class Project extends Base
     protected $table = 'gl_project';
     protected $table = 'gl_project';
     //自动维护create_at创建时间 updated_at修改时间
     //自动维护create_at创建时间 updated_at修改时间
     public $timestamps = true;
     public $timestamps = true;
+    protected $dateFormat = 'Y-m-d';
 
 
     /**
     /**
      * @name:获取当前对象不分页列表
      * @name:获取当前对象不分页列表