From e70689e688fdc7d228e1bbdc2aa6b0ab96665423 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 24 七月 2024 19:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
index f69a142..0c6ae56 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java
@@ -35,22 +35,22 @@
/**
* 娴佺▼鍗＄幓鐠冪被鍨�
*/
- private String glassType;
+ private Integer glassType;
/**
* 瀹�
*/
- private Double width;
+ private double width;
/**
* 楂�
*/
- private Double height;
+ private double height;
/**
* 鍘氬害
*/
- private Double thickness;
+ private double thickness;
/**
* 鑶滅郴
@@ -70,12 +70,12 @@
/**
* 纾ㄥ墠瀹�
*/
- private Double edgWidth;
+ private double edgWidth;
/**
* 纾ㄥ墠楂�
*/
- private Double edgHeight;
+ private double edgHeight;
/**
* 鏄惁閰嶇墖
@@ -85,12 +85,12 @@
/**
* 閰嶇墖鏈�澶у
*/
- private Double maxWidth;
+ private double maxWidth;
/**
* 閰嶇墖鏈�澶ч珮
*/
- private Double maxHeight;
+ private double maxHeight;
/**
* 閽㈠寲鏄惁鎺ュ彈妯斁
@@ -125,7 +125,7 @@
/**
* 鏃嬭浆瑙掑害锛堥�嗘椂閽堬級
*/
- private Integer angle;
+ private double angle;
/**
* 宸ョ▼鍙�
--
Gitblit v1.8.0