From 5741383ca0a6b2ecf84980eb7f44164a56483bc8 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 06 九月 2023 16:52:18 +0800
Subject: [PATCH] 1、增加 vuex 路由标签切换 ，并且保留页面数据 2、PlcParameter.java Plcaction.java 增加读写分开 ， 睡眠间隔时间不同 3、增加权限列表中英文json 以及提示框、弹窗等
---
springboot-vue3/src/main/java/com/example/springboot/entity/OrderOut.java | 18 ------------------
1 files changed, 0 insertions(+), 18 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..044d19b 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,17 +11,11 @@
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