Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/java/com/iamberry/rst/utils/ExcelUtil.java

@@ -415,7 +415,7 @@ public class ExcelUtil {
             } else if (tel.equals(cell.getStringCellValue().trim())) {
                 // 匹配电话
                 telColumnIndex = cell.getColumnIndex();
-            } else if (productName.equals(cell.getStringCellValue().trim())) {
+            } else if (productName.trim().equals(cell.getStringCellValue().trim())) {
                 // 匹配产品列
                 productColumnIndex = cell.getColumnIndex();
             } else if (num.equals(cell.getStringCellValue().trim())) {