Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

ZengTao

2023-12-04 1479f77b88e355ce2c7c073458d919c8e06baa18

 springboot-vue3/src/main/java/com/example/springboot/entity/Out_slice.java

@@ -8,6 +8,16 @@
    private double glassheight;
    private int state;
    private String time;
    private int sequence;
    private String position;

    public String getPosition() {
        return position;
    }

    public void setPosition(String position) {
        this.position = position;
    }

    private north_glass_buffer1 north_glass_buffer1s;

@@ -78,7 +88,7 @@
        this.glassId = glassId;
    }

public void setBarCode(String barCode) {
    public void setBarCode(String barCode) {
        barcode = barCode;
    }

@@ -98,4 +108,11 @@
        this.time = time;
    }
    
    public int getSequence() {
        return sequence;
    }

    public void setSequence(int sequence) {
        this.sequence = sequence;
    }
}