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

云

18 小时以前 d48849cfcc2e45340921edab4685a8f260793b50

 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;