Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg

liyong

14 小时以前 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47

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

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