Merge remote-tracking branch 'origin/master'

cloud-model/src/main/java/com/hssx/cloudmodel/entity/vo/PartVO.java

@@ -2,6 +2,7 @@ package com.hssx.cloudmodel.entity.vo;
 
 import com.hssx.cloudmodel.entity.MouldFile;
 import com.hssx.cloudmodel.entity.Part;
+import lombok.Data;
 
 /**
  * Author: 吴涛涛 cuiyi@itany.com
@@ -9,6 +10,7 @@ import com.hssx.cloudmodel.entity.Part;
  * Description:<描述>
  * Version: 1.0
  */
+@Data
 public class PartVO extends Part {
     private MouldFile part2dFile;
     private MouldFile part3dFile;

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/PartServiceImpl.java

@@ -75,12 +75,14 @@ public class PartServiceImpl extends ServiceImpl<PartMapper, Part> implements Pa
                 // 故从第二行开始遍历拿数据（如果有标题的话，则从第三行开始拿数据）
                 for (int j = 1; j < sheet.getLastRowNum() + 1; j++) {
                     XSSFRow row = sheet.getRow(j);
+                    System.out.println("row====>"+row);
                     //新建零件
                     Part part = new Part();
                     part.setMouldId(mould.getId());
                     // 遍历所有的列，下面的10是excle表格里共有10列即对应了10个字段
                     for (int y = 0; y < 2; y++) {
                         XSSFCell cell = row.getCell(y);
+                        System.out.println("cell====>"+row);
                         cell.setCellType(Cell.CELL_TYPE_STRING);
                         //取出当前列的值
                         String value = cell.getStringCellValue();