From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码,解决冲突

---
 src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java b/src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java
index 4642453..24a35ab 100644
--- a/src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MesOrderReportParam.java
@@ -4,6 +4,9 @@
 
 import java.util.List;
 
+/**
+ * MES璋冩嫧鍙傛暟
+ */
 @Data
 public class MesOrderReportParam {
     //缂栫爜

--
Gitblit v1.9.1