Merge branch 'dev_2.2' into test

xuhongyun
Commit d7200522ba276c1d49d344bb015f3f2f374ab37a 2 parents 5c909293 e0303711
Showing 1 changed file with 1 additions and 1 deletions
code/apps/goods/views/netsale/Batch.html
--- a/code/apps/goods/views/netsale/Batch.html
View file @d720052
+++ b/code/apps/goods/views/netsale/Batch.html
View file @d720052
@@ -44,7 +44,7 @@
                     <td>说明：</td>
                     <td colspan="2">
                         1、上传文件必须是<span style="color:red;">.xlsx</span>文件<br>
-                        2、Excel表头为：<span style="color: #67D267;">SKN、操作下架(1)</span><br>
+                        2、Excel表头为：<span style="color: #67D267;">SKN、操作(下架:1)</span><br>
                         3、第一行为表头内容，第二行开始为正式内容<br>
                         4、每个文件控制在500行以内<br>
                         5、<a href="/ajax/link/offShelveSkn">下载样例</a>