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

liding

4 天以前 1d915922d8197aa5d5dc3e40e3088d983dd6e141

 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;