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

liyong

8 天以前 fe82da7485601580104c058f382405cc0cc9e043

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

@@ -35,6 +35,10 @@
    @Excel(name = "生产炒机")
    private String speculativeTradingName;

    @ApiModelProperty(value = "产线")
    @Excel(name = "产线")
    private String productionLine;

    @ApiModelProperty(value = "开始时间")
    private String entryDateStart;