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

ZengTao

2023-11-27 3f98ccf49e7ffc098689c37237bd1dceed651ca1

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

@@ -8,8 +8,28 @@
    private String barcode;//玻璃id
    private double glasslength;//玻璃宽
    private double glassheight;//玻璃高
    private double glasslength_mm;//玻璃宽mm
    private double glassheight_mm;//玻璃高mm
    private double glasslengthMm;//玻璃宽mm
    private double glassheightMm;//玻璃高mm

    private StorageCage storageCage;

    public void setstorageCage(StorageCage storageCage) {
        this.storageCage = storageCage;
    }
    
    public StorageCage getstorageCage() {
        return storageCage;
    }

    private Out_slice out_slice;

    public void setOut_slice(Out_slice out_slice) {
        this.out_slice = out_slice;
    }
    
    public Out_slice getOut_slice() {
        return out_slice;
    }

    public Integer id() {
        return id;
@@ -65,18 +85,18 @@
        this.glassheight = glassheight;
    }

    public Double getglasslength_mm() {
        return glasslength_mm;
    public Double getglasslengthMm() {
        return glasslengthMm;
    }
    public void setglasslength_mm(Double glasslength_mm) {
        this.glasslength_mm = glasslength_mm;
    public void setglasslengthMm(Double glasslengthMm) {
        this.glasslengthMm = glasslengthMm;
    }

    public Double glassheight_mm() {
        return glassheight_mm;
    public Double getglassheightMm() {
        return glassheightMm;
    }
    public void setglassheight_mm(Double glassheight_mm) {
        this.glassheight_mm = glassheight_mm;
    public void setglassheight_mm(Double glassheightMm) {
        this.glassheightMm = glassheightMm;
    }