Merge branch 'zjl_erp_syn_20190514' into development

resources/views/layouts/navigation.blade.php

@@ -4,7 +4,7 @@
       <li class="nav-header">
         <div class="feed-element profile-element">
           <a class="pull-left">
-            <img alt="image" class="img-circle" src="{{ $header }}" onerror="this.src='/img/missing_face.png';" style="width:40px;"/>
+            <img alt="image" class="img-circle" src="{{ str_replace('http:', '', $header) }}" onerror="this.src='/img/missing_face.png';" style="width:40px;"/>
           </a>
           <div class="media-body">
             <strong class="font-bold" style="color:#FFF" >{{ $username }}</strong>