From a93a3f1532d33849187dcd1a372c315ec4511e04 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 04 十二月 2023 09:04:01 +0800
Subject: [PATCH] 理片笼逻辑和界面更改
---
springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java | 22 ++--------------------
1 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java b/springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java
index 1a1ada5..209de27 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java
@@ -4,24 +4,18 @@
public class OrderOut {
private Integer id;
- private String orderid;
- private Integer state;
+ private String orderid;//璁㈠崟id
+ private Integer state;//鐘舵��
private Date modtime;
public Integer id() {
return id;
}
-<<<<<<< HEAD
- public void setId(Integer id) {
- this.id = id;
- }
-=======
public void setId(Integer id) {
this.id = id;
}
->>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
public Integer getId() {
return id;
}
@@ -29,10 +23,6 @@
public void setOrderId(String orderid) {
this.orderid = orderid;
}
-<<<<<<< HEAD
-=======
-
->>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
public String getOrderId() {
return orderid;
}
@@ -40,10 +30,6 @@
public void setState(Integer state) {
this.state = state;
}
-<<<<<<< HEAD
-=======
-
->>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
public Integer getState() {
return state;
}
@@ -51,10 +37,6 @@
public void setModTime(Date modtime) {
this.modtime = modtime;
}
-<<<<<<< HEAD
-=======
-
->>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
public Date getModTime() {
return modtime;
}
--
Gitblit v1.8.0