From b042540b20c3b7d377b2ab33a97f9de4d498c7ae Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 31 三月 2025 12:42:25 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
index 9d1b124..d677b37 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
@@ -3,15 +3,13 @@
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -19,9 +17,9 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
-import java.util.Date;
@Data
+@Accessors(chain = true)
@TableName("man_qly_ispt_item")
public class QlyIsptItem implements Serializable {
@@ -39,6 +37,9 @@
*/
@ApiModelProperty(value= "涓诲崟ID")
private Long ispectId;
+
+ @ApiModelProperty("鍗曟嵁鏄庣粏ID")
+ private Long asnItemId;
/**
* 缂栧彿
@@ -58,7 +59,7 @@
@ApiModelProperty(value= "鏍囩")
private String label;
- /**
+ /**鈭�
* 渚涘簲鍟嗗悕绉�
*/
@ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
@@ -106,6 +107,9 @@
@ApiModelProperty(value= "鍥剧墖璺緞")
private String picPath;
+ @ApiModelProperty("璐ㄦ缁撹")
+ private String isptResult;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
--
Gitblit v1.9.1