Merge branch 'master' of xwh/kmall-pt-general into master

kmall-admin/src/main/webapp/WEB-INF/page/shop/goodsexportpdf.html

@@ -48,7 +48,7 @@
                     <i-button type="ghost" icon="ios-cloud-upload-outline">标签pdf制作模板导入</i-button>
                 </Upload>
             </i-col>
-            &nbsp;&nbsp;&nbsp;<a href="../statics/file/pdf_goods_export_yyyy_mm_dd_v1.0.0.xls">标签pdf制作模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+            &nbsp;&nbsp;&nbsp;<a href="../statics/file/pdf_goods_export_yyyy_mm_dd_v1.0.0.xlsx">标签pdf制作模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
             <i-col span="3">
                 <i-select v-model="q.storeId" placeholder="门店" filterable label-in-value>
                     <i-option v-for="store in stores" :value="store.id"