From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master
---
src/main/java/com/zy/asrs/entity/LocNormal.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocNormal.java b/src/main/java/com/zy/asrs/entity/LocNormal.java
index 92cbee5..453c3a6 100644
--- a/src/main/java/com/zy/asrs/entity/LocNormal.java
+++ b/src/main/java/com/zy/asrs/entity/LocNormal.java
@@ -13,6 +13,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -21,6 +22,9 @@
public class LocNormal implements Serializable {
private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "鑷ID")
+ private Integer id;
@ApiModelProperty(value= "鐗╂枡")
@TableId(value = "matnr", type = IdType.INPUT)
@@ -48,7 +52,7 @@
private String brand;
@ApiModelProperty(value= "鏁伴噺")
- private Double anfme;
+ private BigDecimal anfme;
@ApiModelProperty(value= "鍗曚綅")
private String altme;
@@ -79,6 +83,9 @@
@TableField("state")
private String state;
+ @TableField(exist = false)
+ private BigDecimal anfmeOut;
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
--
Gitblit v1.9.1