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

zss

3 天以前 f9c5f3e02cd32d201428ef0700411f7c421b25fa

 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;
    /**
     * 排产日期
     */