Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 b0b8ca4b383c5c3a2373200ca1872c20ee9ff999

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

@@ -18,12 +18,10 @@

    @ApiModelProperty(value = "当前页", example = "1", required = true)
    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;
}