From baef763e1319d58eda668a5cac6edd8a150defd8 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 05 九月 2023 17:00:59 +0800
Subject: [PATCH] Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 2c21e99..1a1ada5 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
@@ -11,9 +11,17 @@
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;
}
@@ -21,6 +29,10 @@
public void setOrderId(String orderid) {
this.orderid = orderid;
}
+<<<<<<< HEAD
+=======
+
+>>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
public String getOrderId() {
return orderid;
}
@@ -28,6 +40,10 @@
public void setState(Integer state) {
this.state = state;
}
+<<<<<<< HEAD
+=======
+
+>>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
public Integer getState() {
return state;
}
@@ -35,6 +51,10 @@
public void setModTime(Date modtime) {
this.modtime = modtime;
}
+<<<<<<< HEAD
+=======
+
+>>>>>>> 7870c2d4fd6da5269a87f53d584a36628fd8ef12
public Date getModTime() {
return modtime;
}
--
Gitblit v1.8.0