Merge branch 'zjl_hide_sendbtn_0301' into 'master'

去掉ERP下单时间

See merge request !13

resources/views/erpOrder/content.blade.php

@@ -180,7 +180,7 @@
                                     京东
                                 @endif
                             </td>
-                            <td class="show-list">{{date('Y-m-d H:i:s', $v['create_time'])}}</td>
+                            <td class="show-list">{{date('Y-m-d', $v['create_time'])}}</td>
                             <td>
                                 <div class="btn-group btn-group-xs">
 	                                    <a class="btn btn-primary" href="/details/{{$v['order_id']}}?tags=erp">详情</a>