Merge branch 'qs_local_mp' into develop

app/Admin/Controllers/ImsCjdcMarketController.php

@@ -52,7 +52,9 @@ class ImsCjdcMarketController extends AdminController
                 }
             });
             $grid->address;
-            $grid->column('addtime', '创建时间');
+            $grid->created_at->display(function ($time){
+                return date('Y-m-d H:i:s',$time);
+            });
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
             });
@@ -170,7 +172,6 @@ class ImsCjdcMarketController extends AdminController
                 if ($form->isCreating()){
                     $coordinates = explode(',',$form->coordinates);
                     $form->coordinates = implode(',',[$coordinates[1],$coordinates[0]]);
-                    $form->addtime = date('Y-m-d H:i:s',time());
                 }else{
                     if ($form->coordinates&&$form->coordinates!=$form->model()->coordinates){
                         $coordinates = explode(',',$form->coordinates);