Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-18 b5a63b29313463d1c2fd1b5678a2d6b2bb8a7044

 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;

}