From 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期日, 24 九月 2023 21:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 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..3dc9130 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,10 +32,18 @@
@TableId(type = IdType.AUTO)
private Integer id;
+ @ApiModelProperty(value = "1锛氭垚鍝佹楠屽崟锛�2鍗婃垚鍝佹楠屽崟锛�0锛氬師鏉愭枡妫�楠屽崟")
+ private Integer type;
+
/**
* 缂洪櫡鍚嶇О(鐞嗙敱)
**/
private String reason;
+
+ /**
+ * 鏁伴噺
+ **/
+ private Integer number;
/**
* 澶勭悊鐘舵�� 0锛氬緟澶勭悊锛�1锛氬凡澶勭悊
@@ -54,13 +62,23 @@
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date dealTime;
+ /**
+ * 鐜拌薄鎻忚堪
+ **/
+ private String tell;
+
+ @ApiModelProperty(value = "澶勭悊鏂瑰紡 1锛氳繑宸ヨ繑淇紱2锛氳姝ユ帴鏀讹紱3锛氭帴鏀讹紱4锛氶檷绾т娇鐢紱5锛氭姤搴�;6:閫�璐� 7:鎹㈣揣")
+ private Integer way;
+
+ @ApiModelProperty(value = "澶勭悊鎰忚")
+ private String opinionTell;
+
+ @ApiModelProperty(value = "鐟曠柕鍝� 1:鐟曠柕鍝侊紱鍏朵粬锛氱┖")
+ private Integer faultyMaterials;
+
@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")
@@ -75,16 +93,5 @@
* 鍏宠仈 妫�楠屽崟id
**/
private Integer rawInspectId;
-
- /**
- * 0锛氭垚鍝侊紱1锛氳繃绋嬶紱2锛氬師鏉愭枡
- **/
- private Integer type;
-
-
- /**
- * 鐜拌薄鎻忚堪
- **/
- private String tell;
}
--
Gitblit v1.9.3