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

maven

4 天以前 5a5df7b6529a62233bd2541a9abbb7bd588e9a4d

 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;