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

ZengTao

2023-12-04 ff6fd31ba5a4b6a6e74096786ff6d61293d15c73

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

@@ -9,6 +9,15 @@
    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;