Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/itempriceadjust/ItempriceadjustItemprice.java

@@ -300,7 +300,7 @@ public class ItempriceadjustItemprice extends Controller {
                     continue;
                 } else {
                     String itemno = row.getString("itemno");
-                    if (itemnoList.indexOf(itemno) != itemnoList.lastIndexOf("itemno")) {
+                    if (itemnoList.indexOf(itemno) != itemnoList.lastIndexOf(itemno)) {
                         iserr = true;
                         row.put("msg", "错误信息:导入文件存在相同编码的商品");
                         rowserr.add(row);