Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

zss

3 天以前 9d42f647f5589e4a560d745d6b359ae6c273bd8d

 src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java

@@ -121,6 +121,9 @@
                ProductModel item = productModelList.get(i);
                int rowNum = i + 2;

                if (StringUtils.isEmpty(item.getProductCode())) {
                    return AjaxResult.error("第 " + rowNum + " 行导入失败: [产品编码] 不能为空");
                }
                if (StringUtils.isEmpty(item.getModel())) {
                    return AjaxResult.error("第 " + rowNum + " 行导入失败: [规格型号] 不能为空");
                }