Merge remote-tracking branch 'origin/master'

k94314517

2023-08-18 f317a559955ed75e2f29b7084faaa1c145f6efef

 server/src/main/java/doumeemes/dao/ext/dto/QueryRouteProcedureExtDTO.java

@@ -197,5 +197,7 @@

    @ApiModelProperty(value = "工序信息表设备收集层次 0设备 1组", example = "1")
    private Integer pmodelLevel;
    @ApiModelProperty(value = "成品计划编码", example = "1")
    private Integer workPlanId;

}