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

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

 src/main/java/com/ruoyi/technology/bean/dto/TechnologyRoutingOperationDto.java

@@ -2,6 +2,7 @@

import com.ruoyi.technology.pojo.TechnologyRoutingOperation;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

@@ -9,4 +10,7 @@
@Data
@ApiModel(value = "TechnologyRoutingOperationDto对象", description = "工艺路线工序查询参数")
public class TechnologyRoutingOperationDto extends TechnologyRoutingOperation {

    @ApiModelProperty("工艺路线id（兼容旧参数 routeId）")
    private Long routeId;
}