Merge remote-tracking branch 'origin/master'

wu

2024-07-04 5e82a6f55d6f306a15fbf5d3f1855a647df7a105

 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/entity/DownWorkstionAndDownGlassinfo.java

@@ -6,8 +6,6 @@
import lombok.Data;

import lombok.EqualsAndHashCode;



import java.io.Serializable;



/**

 * <p>

 *

@@ -70,19 +68,19 @@
    /**

     * 宽

     */

    private Double width;

    private double width;



    /**

     * 高

     */

    private Double height;

    private Double totalwidth;

    private double height;

    private double totalwidth;



    private Double totalheight;

    private double totalheight;

    /**

     * 厚度

     */

    private Double thickness;

    private double thickness;





    private String Filmsid;