Merge branch 'qs_local_cs' into develop

# Conflicts:
#	.gitignore

app/Admin/Controllers/LanzuCsInfoController.php

@@ -92,8 +92,9 @@ class LanzuCsInfoController extends AdminController
     {
         return Form::make(new LanzuCsInfo(), function (Form $form) {
             $form->display('id');
-            $form->text('name', '名称')->required();
-            $form->text('user_id', '用户ID')->required();
+            $form->text('person_id','拓展专员懒ID')->required();
+            $form->text('name', '名称')->required()->placeholder('输入社区站点名称');
+            $form->text('user_id', '用户懒ID')->required();
             $form->mobile('phone')->required();
             $form->select('market_id', '所属市场')->options(ImsCjdcMarket::getMarket())->required();
             $form->text('address', '社区地址')->required();
@@ -102,7 +103,11 @@ class LanzuCsInfoController extends AdminController
                 //检验用户user_id 是否存在
                 $count = ImsCjdcUser::where('id', $form->user_id)->count();
                 if (!$count) {
-                    return $form->error('用户ID不存在');
+                    return $form->error('用户懒ID不存在');
+                }
+                $count = ImsCjdcUser::where('id', $form->person_id)->count();
+                if (!$count) {
+                    return $form->error('拓展专员懒ID不存在');
                 }
             });