Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

gongchunyi

5 天以前 9f5813763a54f7fde8b472b0da305d635a624e8f

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

@@ -55,6 +55,8 @@
    private LocalDate schedulingDate;
    private String schedulingUserName;
    private String customerName;
    //工序
    @Excel(name = "工序")
    private String process;
    private BigDecimal workHours;
    private BigDecimal wages;