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/ModifyPakoutParam.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/ModifyPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/ModifyPakoutParam.java
index 805f8d4..5ad6c5d 100644
--- a/src/main/java/com/zy/asrs/entity/param/ModifyPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/ModifyPakoutParam.java
@@ -6,9 +6,9 @@
@Data
public class ModifyPakoutParam {
- //鎵樼洏鐮�
+ //璐ф灦鐮�
String barcode;
- //鏂欑鍙栧嚭鐨勬暟閲�
+ //璐ф灦鍙栧嚭鐨勬暟閲�
List<CA> params;
@Data
--
Gitblit v1.9.1