From 032b976ab803a263e734dcdca3ceadaed48f1070 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 27 七月 2023 16:51:08 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-27下班合并代码
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
index 104c16a..8afabf1 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/pojo/InspectionProductList.java
@@ -52,9 +52,11 @@
private String internal;
@ApiModelProperty(value = "寮�濮嬫棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime startTime;
@ApiModelProperty(value = "缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime endTime;
@TableLogic(value = "1", delval = "0")
@@ -73,12 +75,12 @@
private Integer version;
- @ApiModelProperty(value = "鍏宠仈 鎶ユid")
+ @ApiModelProperty(value = "鍏宠仈 鎶ユ鐗╂枡id")
private int inspectionMaterialListId;
@ApiModelProperty(value = "鍏宠仈 鐢ㄦ埛id 璇曢獙鍛�")
private Integer userId;
@ApiModelProperty(value = "鍏宠仈 璁惧id")
- private Integer instrument_id;
+ private Integer instrumentId;
}
--
Gitblit v1.9.3