Merge branch 'refs/heads/dev_New' into dev_New_kthg

liding

14 小时以前 1a3f5db043fd381b60a0a5f40687136274a2cbd1

 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;