Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-08-20 74173fd310569a79104bfe1beb97e73890c4cda9

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java

@@ -35,22 +35,24 @@
    /**
     * 宽
     */
    private double width;
    private String width;
    /**
     * 高
     */
    private double height;
    private String height;

    /**
     * 面积
     */
    private double area;


    /**
     * 数量
     * 包装方式
     */
    private Integer quantity;
    /**
     * 加工方式
     * 状态
     */
    private String processingNote;
    /**