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/LGoodsWhRecord.java |   70 ++++++++++++-----------------------
 1 files changed, 24 insertions(+), 46 deletions(-)

diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsWhRecord.java b/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsWhRecord.java
index 3c50152..97921d3 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsWhRecord.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/LGoodsWhRecord.java
@@ -20,21 +20,17 @@
     protected boolean isset_id = false;
 
     // 灞炴�у垪琛�
-    private Long lWarehouseFlowId = null;
+    private Long warehouseFlowId = null;
     @JsonIgnore
-    protected boolean isset_lWarehouseFlowId = false;
+    protected boolean isset_warehouseFlowId = false;
 
-    private Long lWhGoodsId = null;
+    private Long whGoodsId = null;
     @JsonIgnore
-    protected boolean isset_lWhGoodsId = false;
+    protected boolean isset_whGoodsId = false;
 
     private Long warehouseId = null;
     @JsonIgnore
     protected boolean isset_warehouseId = false;
-
-    private Integer parentId = null;
-    @JsonIgnore
-    protected boolean isset_parentId = false;
 
     private Long dealTime = null;
     @JsonIgnore
@@ -75,32 +71,32 @@
         return this.id == null;
     }
 
-    public Long getLWarehouseFlowId() {
-        return this.lWarehouseFlowId;
+    public Long getWarehouseFlowId() {
+        return this.warehouseFlowId;
     }
 
-    public void setLWarehouseFlowId(Long lWarehouseFlowId) {
-        this.lWarehouseFlowId = lWarehouseFlowId;
-        this.isset_lWarehouseFlowId = true;
+    public void setWarehouseFlowId(Long warehouseFlowId) {
+        this.warehouseFlowId = warehouseFlowId;
+        this.isset_warehouseFlowId = true;
     }
 
     @JsonIgnore
-    public boolean isEmptyLWarehouseFlowId() {
-        return this.lWarehouseFlowId == null;
+    public boolean isEmptyWarehouseFlowId() {
+        return this.warehouseFlowId == null;
     }
 
-    public Long getLWhGoodsId() {
-        return this.lWhGoodsId;
+    public Long getWhGoodsId() {
+        return this.whGoodsId;
     }
 
-    public void setLWhGoodsId(Long lWhGoodsId) {
-        this.lWhGoodsId = lWhGoodsId;
-        this.isset_lWhGoodsId = true;
+    public void setWhGoodsId(Long whGoodsId) {
+        this.whGoodsId = whGoodsId;
+        this.isset_whGoodsId = true;
     }
 
     @JsonIgnore
-    public boolean isEmptyLWhGoodsId() {
-        return this.lWhGoodsId == null;
+    public boolean isEmptyWhGoodsId() {
+        return this.whGoodsId == null;
     }
 
     public Long getWarehouseId() {
@@ -115,20 +111,6 @@
     @JsonIgnore
     public boolean isEmptyWarehouseId() {
         return this.warehouseId == null;
-    }
-
-    public Integer getParentId() {
-        return this.parentId;
-    }
-
-    public void setParentId(Integer parentId) {
-        this.parentId = parentId;
-        this.isset_parentId = true;
-    }
-
-    @JsonIgnore
-    public boolean isEmptyParentId() {
-        return this.parentId == null;
     }
 
     public Long getDealTime() {
@@ -152,10 +134,9 @@
     public String toString() {
         return new StringBuilder()
                 .append("id=").append(this.id)
-                .append("lWarehouseFlowId=").append(this.lWarehouseFlowId)
-                .append("lWhGoodsId=").append(this.lWhGoodsId)
+                .append("warehouseFlowId=").append(this.warehouseFlowId)
+                .append("whGoodsId=").append(this.whGoodsId)
                 .append("warehouseId=").append(this.warehouseId)
-                .append("parentId=").append(this.parentId)
                 .append("dealTime=").append(this.dealTime)
                 .toString();
     }
@@ -174,17 +155,14 @@
             l_goods_wh_record.setId(this.getId());
         }
         // 鏅�氬睘鎬�
-        if (this.isset_lWarehouseFlowId) {
-            l_goods_wh_record.setLWarehouseFlowId(this.getLWarehouseFlowId());
+        if (this.isset_warehouseFlowId) {
+            l_goods_wh_record.setWarehouseFlowId(this.getWarehouseFlowId());
         }
-        if (this.isset_lWhGoodsId) {
-            l_goods_wh_record.setLWhGoodsId(this.getLWhGoodsId());
+        if (this.isset_whGoodsId) {
+            l_goods_wh_record.setWhGoodsId(this.getWhGoodsId());
         }
         if (this.isset_warehouseId) {
             l_goods_wh_record.setWarehouseId(this.getWarehouseId());
-        }
-        if (this.isset_parentId) {
-            l_goods_wh_record.setParentId(this.getParentId());
         }
         if (this.isset_dealTime) {
             l_goods_wh_record.setDealTime(this.getDealTime());

--
Gitblit v1.9.1