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

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

@@ -34,8 +34,8 @@
                 <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
                 #end
                 #if($shiro.hasPermission("mallpaymentorderdata:down"))
-                <a href="../statics/file/wx.xls">微信账单模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
-                <a href="../statics/file/ali.xls">支付宝账单模版下载</a>
+                <a href="../statics/file/wx_yyyy_mm_dd_v1.0.0.xls">微信账单模板下载</a>&nbsp;&nbsp;&nbsp;&nbsp;
+                <a href="../statics/file/ali_yyyy_mm_dd_v1.0.0.xls">支付宝账单模版下载</a>
                 #end
                 #if($shiro.hasPermission("mallpaymentorderdata:exportDataFormat"))
                 <i-button type="primary" @click="exportDataFormat"><i class="fa fa-cloud-download"></i>&nbsp;导出数据</i-button>