Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentRouteOrderServiceImpl.java

@@ -502,6 +502,7 @@ public class StudentPaymentRouteOrderServiceImpl extends BaseServiceImpl<Long, S
                     if (StringUtils.isEmpty(goodsIds)) {
                         throw new BizException("导入失败：有销售金额时商品编号必填");
                     }
+                    goodsIds = goodsIds.replace("\n","");
                     List<String> goodsIdList = new ArrayList(Arrays.asList(goodsIds.split(",")));
                     List<String> goodsNumList = new ArrayList(Arrays.asList(goodsNums.split(",")));
                     if (goodsIdList.size() != goodsNumList.size()) {