Merge branch 'master' into test6.5.5

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