Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-26 eb34edfc7cf46e5cb5e3969d04315e6129dcbbd2

 laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/dto/SelectMeteringPlanDto.java

@@ -20,10 +20,6 @@
    private Long currentPage;
    @ApiModelProperty(value = "每页多少条", example = "10", required = true)
    private Long pageSize;
    @ApiModelProperty(value = "仪器编码",  required = false)
    private String code;
    @ApiModelProperty(value = "仪器名称",  required = false)
    private String name;
    @ApiModelProperty(value = "计量单位",  required = false)
    private String unit;
    @ApiModelProperty(value = "计划单号",  required = false)
    private String plannedOrderNumber;
}