Merge branch 'master' of http://git.9026.com/swdz-WangHaijun/BaoMa

# Conflicts:
#	app/Admin/Actions/Community/Docter/Chat.php
#	app/Community/routes.php

app/Admin/Actions/Community/Docter/Chat.php

@@ -10,6 +10,6 @@ class Chat extends RowAction
     public $name = '查看';
     public function href()
     {
-        return '/cdms/docter_chat/1/edit';
+        return '/cdms/docter_chats/1/edit';
     }
 }

app/Community/routes.php

@@ -14,9 +14,11 @@ Route::resource('docter_org', DocterOrgController::class);
 Route::resource('docter_verifies', DocterVerifyController::class);
 Route::resource('cdms_roles', PermissionController::class);
 Route::resource('docter_account', DocterAccountController::class);
-Route::resource('docter_chat', DocterChatController::class);
-
-
+Route::resource('docter_chats', DocterChatController::class);
+Route::resource('notices', NoticeController::class);
+Route::get('send_notices', 'NoticeController@send');
+Route::resource('/docter_chats', DocterChatController::class);
+Route::get('/chats', 'DocterChatController@chats');
 //api
 Route::get('/api/getDocter', 'ApiController@getDocter');
 Route::put('/api/paitent_remark', 'ApiController@paitent_remark');