From 47a751cb301d05276ae5d75145d57b2d090fe4e1 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期一, 01 七月 2024 10:58:35 +0800
Subject: [PATCH] change
---
src/main/java/com/nanometer/smartlab/entity/OpeOrder.java | 140 +++++-----------------------------------------
1 files changed, 16 insertions(+), 124 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/OpeOrder.java b/src/main/java/com/nanometer/smartlab/entity/OpeOrder.java
index 9d4beb3..ed0eb8d 100644
--- a/src/main/java/com/nanometer/smartlab/entity/OpeOrder.java
+++ b/src/main/java/com/nanometer/smartlab/entity/OpeOrder.java
@@ -1,7 +1,10 @@
package com.nanometer.smartlab.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.nanometer.smartlab.entity.enumtype.ApplyStatus;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
+import lombok.Getter;
+import lombok.Setter;
import java.io.Serializable;
import java.sql.Timestamp;
@@ -9,9 +12,12 @@
/**
* Created by johnny on 17/11/23.
*/
+@Getter
+@Setter
+@JsonIgnoreProperties(value = {"handler"})
public class OpeOrder implements Serializable {
- private String id;
+ private Long id;
private String orderCode;
private String orderName;
private ApplyStatus status;
@@ -19,134 +25,20 @@
private Timestamp updateTime;
private ValidFlag validFlag;
private String memo;
- private String consigneeUserId;
- private String orderUserId;
+ private Long consigneeUserId;
+ private Long orderUserId;
+ private Long supplierId;
+ private String supplierName;
private Timestamp arrivalTime;
+ private Integer destoryFlag;
+
+
+ //非数据库字段
private String orderUserName;
private String consigneeUserName;
- private String supplyId;
+
- private String supplyName;
- public String getId() {
- return id;
- }
- public void setId(String id) {
- this.id = id;
- }
-
- public String getOrderCode() {
- return orderCode;
- }
-
- public void setOrderCode(String orderCode) {
- this.orderCode = orderCode;
- }
-
- public String getOrderName() {
- return orderName;
- }
-
- public void setOrderName(String orderName) {
- this.orderName = orderName;
- }
-
- public ApplyStatus getStatus() {
- return status;
- }
-
- public void setStatus(ApplyStatus status) {
- this.status = status;
- }
-
- public Timestamp getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Timestamp createTime) {
- this.createTime = createTime;
- }
-
- public Timestamp getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Timestamp updateTime) {
- this.updateTime = updateTime;
- }
-
- public ValidFlag getValidFlag() {
- return validFlag;
- }
-
- public void setValidFlag(ValidFlag validFlag) {
- this.validFlag = validFlag;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public String getConsigneeUserId() {
- return consigneeUserId;
- }
-
- public void setConsigneeUserId(String consigneeUserId) {
- this.consigneeUserId = consigneeUserId;
- }
-
- public String getOrderUserId() {
- return orderUserId;
- }
-
- public void setOrderUserId(String orderUserId) {
- this.orderUserId = orderUserId;
- }
-
- public Timestamp getArrivalTime() {
- return arrivalTime;
- }
-
- public void setArrivalTime(Timestamp arrivalTime) {
- this.arrivalTime = arrivalTime;
- }
-
- public String getOrderUserName() {
- return orderUserName;
- }
-
- public void setOrderUserName(String orderUserName) {
- this.orderUserName = orderUserName;
- }
-
- public String getConsigneeUserName() {
- return consigneeUserName;
- }
-
- public void setConsigneeUserName(String consigneeUserName) {
- this.consigneeUserName = consigneeUserName;
- }
-
- public String getSupplyId() {
- return supplyId;
- }
-
- public void setSupplyId(String supplyId) {
- this.supplyId = supplyId;
- }
-
- public String getSupplyName() {
- return supplyName;
- }
-
- public void setSupplyName(String supplyName) {
- this.supplyName = supplyName;
- }
-
}
--
Gitblit v1.9.2