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

buhuazhen

6 天以前 4e833109c2105bf6895ac985205ce30da37c70d6

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

@@ -65,6 +65,14 @@
    @ApiModelProperty(value = "工序")
    @Excel(name = "工序")
    private String process;


    /**
     * 产线
     */
    @ApiModelProperty(value = "产线")
    @Excel(name = "产线")
    private String productionLine;
    /**
     * 排产日期
     */