Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-30 b0b8ca4b383c5c3a2373200ca1872c20ee9ff999

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

@@ -36,6 +36,8 @@
    @ApiModelProperty(value = "结束日期", example = "2023-07-06", required = true, dataType = "date")
    private Date endTime;

    private String unit;

    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd", iso = DateTimeFormat.ISO.DATE_TIME)
    private Date createTime;