From a83eeabe948a953290062e5dcedb0d33f01defef Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 五月 2024 16:59:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
index 9af7847..2b4415b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/openapi/entity/param/CombParam.java
@@ -22,9 +22,6 @@
//缁勬墭鐗╂枡
private List<CombMat> combMats;
- //浠撳簱ID
- private Long hostId;
-
@Data
public static class CombMat {
@@ -52,6 +49,8 @@
// 瑙勬牸
private String specs;
+ private String zpallet;
+
}
}
--
Gitblit v1.9.1