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/MesBuyPakinReportParam.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/MesBuyPakinReportParam.java b/src/main/java/com/zy/asrs/entity/param/MesBuyPakinReportParam.java
index 4f90311..e4cdc08 100644
--- a/src/main/java/com/zy/asrs/entity/param/MesBuyPakinReportParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/MesBuyPakinReportParam.java
@@ -27,6 +27,8 @@
private Double amount;
//澶囨敞
private String remark;
+ //鍗曚綅鍚嶇О
+ private String unit;
//渚涘簲鍟嗙紪鍙�
private String supplierCode;
//饧婂簱浣嶇疆
--
Gitblit v1.9.1