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/common/service/erp/entity/VoucherDetail.java | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/erp/entity/VoucherDetail.java b/src/main/java/com/zy/common/service/erp/entity/VoucherDetail.java
index e484248..ff4be0d 100644
--- a/src/main/java/com/zy/common/service/erp/entity/VoucherDetail.java
+++ b/src/main/java/com/zy/common/service/erp/entity/VoucherDetail.java
@@ -10,12 +10,10 @@
private String VoucherID;
- private String BarCode;
+ private String Barcode;
private String PickID;
private String LastUpdatedDate;
-
- private Integer IsGetData;
}
--
Gitblit v1.9.1