From 9c860a46c008b00179d68421f23ffced53b1ea4e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 09 九月 2024 08:34:27 +0800
Subject: [PATCH] 1、新增字典类型表接字典详情表 2、钢化前任务已设置完成，带联调
---
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..d7d5958 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 merge;
/**
* 鏃嬭浆瑙掑害
*/
--
Gitblit v1.8.0