From d2048c247c446be08598abf8e1bc11a4ea77be32 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期三, 25 十月 2023 16:41:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord.java |   46 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord.java
index 6e5f7b7..e3db5c0 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWhGoodsRecord.java
@@ -20,9 +20,9 @@
     protected boolean isset_id = false;
 
     // 灞炴�у垪琛�
-    private Long lWarehouseFlowId = null;
+    private Long warehouseId = null;
     @JsonIgnore
-    protected boolean isset_lWarehouseFlowId = false;
+    protected boolean isset_warehouseId = false;
 
     private Long warehouseFlowId = null;
     @JsonIgnore
@@ -60,6 +60,10 @@
     @JsonIgnore
     protected boolean isset_baseGoodsModelsName = false;
 
+    private Long dealTime = null;
+    @JsonIgnore
+    protected boolean isset_dealTime = false;
+
     /**
      * 榛樿鏋勯�犲嚱鏁�
      */
@@ -95,18 +99,18 @@
         return this.id == null;
     }
 
-    public Long getLWarehouseFlowId() {
-        return this.lWarehouseFlowId;
+    public Long getWarehouseId() {
+        return this.warehouseId;
     }
 
-    public void setLWarehouseFlowId(Long lWarehouseFlowId) {
-        this.lWarehouseFlowId = lWarehouseFlowId;
-        this.isset_lWarehouseFlowId = true;
+    public void setWarehouseId(Long warehouseId) {
+        this.warehouseId = warehouseId;
+        this.isset_warehouseId = true;
     }
 
     @JsonIgnore
-    public boolean isEmptyLWarehouseFlowId() {
-        return this.lWarehouseFlowId == null;
+    public boolean isEmptyWarehouseId() {
+        return this.warehouseId == null;
     }
 
     public Long getWarehouseFlowId() {
@@ -235,6 +239,20 @@
         return this.baseGoodsModelsName == null || this.baseGoodsModelsName.length() == 0;
     }
 
+    public Long getDealTime() {
+        return this.dealTime;
+    }
+
+    public void setDealTime(Long dealTime) {
+        this.dealTime = dealTime;
+        this.isset_dealTime = true;
+    }
+
+    @JsonIgnore
+    public boolean isEmptyDealTime() {
+        return this.dealTime == null;
+    }
+
     /**
      * 閲嶅啓 toString() 鏂规硶
      */
@@ -242,7 +260,7 @@
     public String toString() {
         return new StringBuilder()
                 .append("id=").append(this.id)
-                .append("lWarehouseFlowId=").append(this.lWarehouseFlowId)
+                .append("warehouseId=").append(this.warehouseId)
                 .append("warehouseFlowId=").append(this.warehouseFlowId)
                 .append("initialCount=").append(this.initialCount)
                 .append("thisType=").append(this.thisType)
@@ -252,6 +270,7 @@
                 .append("goodsTemplateName=").append(this.goodsTemplateName)
                 .append("baseGoodsModelsId=").append(this.baseGoodsModelsId)
                 .append("baseGoodsModelsName=").append(this.baseGoodsModelsName)
+                .append("dealTime=").append(this.dealTime)
                 .toString();
     }
 
@@ -269,8 +288,8 @@
             l_wh_goods_record.setId(this.getId());
         }
         // 鏅�氬睘鎬�
-        if (this.isset_lWarehouseFlowId) {
-            l_wh_goods_record.setLWarehouseFlowId(this.getLWarehouseFlowId());
+        if (this.isset_warehouseId) {
+            l_wh_goods_record.setWarehouseId(this.getWarehouseId());
         }
         if (this.isset_warehouseFlowId) {
             l_wh_goods_record.setWarehouseFlowId(this.getWarehouseFlowId());
@@ -299,6 +318,9 @@
         if (this.isset_baseGoodsModelsName) {
             l_wh_goods_record.setBaseGoodsModelsName(this.getBaseGoodsModelsName());
         }
+        if (this.isset_dealTime) {
+            l_wh_goods_record.setDealTime(this.getDealTime());
+        }
         return l_wh_goods_record;
     }
 }

--
Gitblit v1.9.1