Merge branch 'zjl_sample_20190925' into development

resources/views/detail/content.blade.php

@@ -559,6 +559,13 @@
                             <td colspan="10">{{$order_temp_info['kefu_remark']}}</td>
                         </tr>
                     @endif
+
+                    @if ($order_info['order_goods_type'] == 2 && $order_temp_info['business_type'] == 1)
+                        <tr>
+                            <td>项目需求描述：</td>
+                            <td colspan="10">{{$order_temp_info['sample_demand_desc']}}</td>
+                        </tr>
+                    @endif
                 </tfoot>
             </table>