Merge branch 'dev_衡阳_鹏创电子' of http://114.132.189.42:9002/r/product-inventor...

chenhj

18 小时以前 1c9e78c43281fa6435d75852319c2b919b8894d4

 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java

@@ -10,7 +10,6 @@

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;

@Data
@ExcelIgnoreUnannotated
@@ -61,5 +60,8 @@
    private BigDecimal workHours;
    private BigDecimal wages;

    // 其他数据
    private String otherData;


}