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

zss

昨天 609dc04b7262c229653775015ecd4334f679589b

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

@@ -54,4 +54,7 @@
    @JsonFormat(pattern = "yyyy-MM-dd")
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    private LocalDate deliveryDate;

    //是否发货(台账页面颜色控制)
    private Boolean isFh;
}