Merge branch 'zjl_iteration_20190416' into development

resources/views/addOtherOrder/content.blade.php

@@ -228,7 +228,7 @@
 
                 <div class="batch-btn">
                     <a class="btn btn-success goods_import" data-type="2">批量导入物料</a>
-                    <a class="btn btn-info" href="http://img.ichunt.com/doc/excel/template/%E8%87%AA%E8%90%A5%E8%AE%A2%E5%8D%95%E6%89%B9%E9%87%8F%E6%B7%BB%E5%8A%A0%E6%A8%A1%E6%9D%BF.xlsx">自营物料模板下载</a>
+                    <a class="btn btn-info" href="http://img.ichunt.com/doc/excel/template/%E8%87%AA%E8%90%A5%E8%AE%A2%E5%8D%95%E6%89%B9%E9%87%8F%E6%B7%BB%E5%8A%A0%E6%A8%A1%E6%9D%BF.csv">自营物料模板下载</a>
                 </div>
             </div>   
         </div>