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

zss

昨天 e2c5b3a68bf3da47f5c1adf217ca96c7ec9a0076

 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;