From ef5dda6db97f89c09a714b9304f302c00ee4ac6c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 16 一月 2024 13:53:07 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java b/springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java
index 51c5233..4195abe 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java
@@ -16,6 +16,8 @@
     private String boxId;//绠卞瓙id
     private double glasswidthmm;//鐜荤拑瀹絤m
     private double glassheightmm;//鐜荤拑楂榤m
+    private String position_x;//x鍧愭爣
+    private int framestate;//y鍧愭爣
 
     public String getPosition() {
         return position;
@@ -168,4 +170,12 @@
     public void setBoxno(String boxId) {
         this.boxId = boxId;
     }
+    
+    public int getFrameState() {
+        return framestate;
+    }
+
+    public void SetFrameState(int framestate) {
+        this.framestate = framestate;
+    }
 }

--
Gitblit v1.8.0