From 3e82c2c5fcb1095266ba9a92d4a7c564c988aa97 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 09 十月 2024 15:37:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
index 5fd3c47..0266265 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/OptimizeGlassinfo.java
@@ -102,7 +102,11 @@
/**
* 璁㈠崟搴忓彿
*/
- private String orderSort;
+ private Integer orderSort;
+ /**
+ * 鏄惁鍚堝苟
+ */
+ private Integer combine;
/**
* 鏃嬭浆瑙掑害
*/
--
Gitblit v1.8.0