Merge remote-tracking branch 'origin/master'

zhoushihao

2024-07-24 c1b6a6157b8cd13192f9a9f5a819150504d08701

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

@@ -44,7 +44,7 @@
    /**
     * 面积
     */
    private Double area;
    private double area;


    /**