From f9e06198cfbccf337b53c0fa6cb3404455ceb0ba Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 09 九月 2023 09:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
index 360f0d4..0aaa0e6 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
@@ -32,6 +32,9 @@
@TableId(type = IdType.AUTO)
private Integer id;
+ @ApiModelProperty(value = "1锛氭垚鍝佹楠屽崟锛�2鍗婃垚鍝佹楠屽崟锛�0锛氬師鏉愭枡妫�楠屽崟")
+ private Integer type;
+
/**
* 缂洪櫡鍚嶇О(鐞嗙敱)
**/
@@ -55,12 +58,9 @@
private Date dealTime;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- @TableLogic(value = "1", delval = "0")
private Integer state;
- /**
- * ${column.comment}
- **/
+
@TableField(fill = FieldFill.INSERT)
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@@ -76,10 +76,6 @@
**/
private Integer rawInspectId;
- /**
- * 0锛氭垚鍝侊紱1锛氳繃绋嬶紱2锛氬師鏉愭枡
- **/
- private Integer type;
/**
--
Gitblit v1.9.3