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

wu

2023-10-30 68d56160c32384f8d939df0bd25bdc9c50b042b9

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

@@ -2,7 +2,7 @@

public class Glass{
    private Integer id;
    private Short orderId;
    private String orderId;
    private double glassWidth;
    private double glassHeight;
    private String glassId;
@@ -19,11 +19,11 @@
        return id;
    }

    public Short getOrderId() {
    public String getOrderId() {
        return orderId;
    }

    public void setOrderId(Short orderId) {
    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }