From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/asrs/entity/param/MesPakoutReportParam.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/MesPakoutReportParam.java b/src/main/java/com/zy/asrs/entity/param/MesPakoutReportParam.java
index cd63e2d..ec501ad 100644
--- a/src/main/java/com/zy/asrs/entity/param/MesPakoutReportParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MesPakoutReportParam.java
@@ -4,6 +4,9 @@
import java.util.List;
+/**
+ * MES鍑哄簱涓婃姤鍙傛暟
+ */
@Data
public class MesPakoutReportParam {
//鐗╂枡缂栫爜
--
Gitblit v1.9.1