From e1c7f150792a5085dd64e86e6af82820ab34dc05 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 03 九月 2024 08:06:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-2' into tzskasrs-2
---
src/main/java/com/zy/asrs/entity/MatCodeCountDto.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
index 592f751..ede3d2d 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodeCountDto.java
@@ -1,35 +1,30 @@
package com.zy.asrs.entity;
+import lombok.Data;
+
/**
* Created by vincent on 2020/6/12
*/
+@Data
public class MatCodeCountDto {
private String matNo;
- private int count;
+ private String batch;
+
+ private Double count;
public MatCodeCountDto() {
}
- public MatCodeCountDto(String matNo, int count) {
+ public MatCodeCountDto(String matNo, Double count) {
this.matNo = matNo;
this.count = count;
}
- public String getMatNo() {
- return matNo;
- }
-
- public void setMatNo(String matNo) {
+ public MatCodeCountDto(String matNo, String batch, Double count) {
this.matNo = matNo;
- }
-
- public int getCount() {
- return count;
- }
-
- public void setCount(int count) {
+ this.batch = batch;
this.count = count;
}
}
--
Gitblit v1.9.1