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

liyong

2026-04-30 a6ff41048bbdd5b8519a3e21e9232a152d179dfc

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

@@ -30,7 +30,6 @@
    @ApiModelProperty(value = "排产数量")
    private BigDecimal schedulingNum;


    /**
     * 工时定额
     */
@@ -38,10 +37,18 @@
    private BigDecimal workHours;

    /**
     * 产线
     */
    @ApiModelProperty(value = "产线")
    private String productionLine;

    /**
     * 工序
     */
    @ApiModelProperty(value = "工序")
    private String process;


    /**
     * 排产日期
     */