From 5ed5f51d479989d5b2149b09c82b6b3ea495b589 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 23 七月 2024 16:21:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java
index 7659b81..e3af79f 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsFiber.java
@@ -1,19 +1,15 @@
package com.yuanchu.mom.pojo;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
+import com.baomidou.mybatisplus.annotation.*;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
/**
* <p>
@@ -48,9 +44,6 @@
@ValueTableShow(5)
private String standard;
- @ApiModelProperty("鍏宠仈 妫�娴嬮」鐩甶d")
- private Integer insProductId;
-
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -68,4 +61,7 @@
@ApiModelProperty("鍏宠仈 鍏夌氦甯﹁〃id")
private Integer insFibersId;
+
+ @TableField(exist = false,select = false)
+ private Integer state;
}
--
Gitblit v1.9.3