From c2931ed46d16d6e01baac76c9ab97bb8b7788abf Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 25 十月 2023 17:32:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 consum-model-pojo/src/main/java/com/consum/model/po/BaseGoodsTemplate.java |   96 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 70 insertions(+), 26 deletions(-)

diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/BaseGoodsTemplate.java b/consum-model-pojo/src/main/java/com/consum/model/po/BaseGoodsTemplate.java
index 1100e5a..1be32be 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/BaseGoodsTemplate.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/BaseGoodsTemplate.java
@@ -28,7 +28,7 @@
     @JsonIgnore
     protected boolean isset_goodsName = false;
 
-    private Integer classification = null;
+    private String classification = null;
     @JsonIgnore
     protected boolean isset_classification = false;
 
@@ -39,10 +39,6 @@
     private Long categoryId = null;
     @JsonIgnore
     protected boolean isset_categoryId = false;
-
-    private String unit = null;
-    @JsonIgnore
-    protected boolean isset_unit = false;
 
     private Long fAgencyId = null;
     @JsonIgnore
@@ -75,6 +71,18 @@
     private Long createDate = null;
     @JsonIgnore
     protected boolean isset_createDate = false;
+
+    private Long dTime = null;
+    @JsonIgnore
+    protected boolean isset_dTime = false;
+
+    private Long dUserId = null;
+    @JsonIgnore
+    protected boolean isset_dUserId = false;
+
+    private String dUserName = null;
+    @JsonIgnore
+    protected boolean isset_dUserName = false;
 
     /**
      * 榛樿鏋勯�犲嚱鏁�
@@ -139,18 +147,18 @@
         return this.goodsName == null || this.goodsName.length() == 0;
     }
 
-    public Integer getClassification() {
+    public String getClassification() {
         return this.classification;
     }
 
-    public void setClassification(Integer classification) {
+    public void setClassification(String classification) {
         this.classification = classification;
         this.isset_classification = true;
     }
 
     @JsonIgnore
     public boolean isEmptyClassification() {
-        return this.classification == null;
+        return this.classification == null || this.classification.length() == 0;
     }
 
     public Integer getStates() {
@@ -179,20 +187,6 @@
     @JsonIgnore
     public boolean isEmptyCategoryId() {
         return this.categoryId == null;
-    }
-
-    public String getUnit() {
-        return this.unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-        this.isset_unit = true;
-    }
-
-    @JsonIgnore
-    public boolean isEmptyUnit() {
-        return this.unit == null || this.unit.length() == 0;
     }
 
     public Long getFAgencyId() {
@@ -307,6 +301,48 @@
         return this.createDate == null;
     }
 
+    public Long getDTime() {
+        return this.dTime;
+    }
+
+    public void setDTime(Long dTime) {
+        this.dTime = dTime;
+        this.isset_dTime = true;
+    }
+
+    @JsonIgnore
+    public boolean isEmptyDTime() {
+        return this.dTime == null;
+    }
+
+    public Long getDUserId() {
+        return this.dUserId;
+    }
+
+    public void setDUserId(Long dUserId) {
+        this.dUserId = dUserId;
+        this.isset_dUserId = true;
+    }
+
+    @JsonIgnore
+    public boolean isEmptyDUserId() {
+        return this.dUserId == null;
+    }
+
+    public String getDUserName() {
+        return this.dUserName;
+    }
+
+    public void setDUserName(String dUserName) {
+        this.dUserName = dUserName;
+        this.isset_dUserName = true;
+    }
+
+    @JsonIgnore
+    public boolean isEmptyDUserName() {
+        return this.dUserName == null || this.dUserName.length() == 0;
+    }
+
     /**
      * 閲嶅啓 toString() 鏂规硶
      */
@@ -319,7 +355,6 @@
                 .append("classification=").append(this.classification)
                 .append("states=").append(this.states)
                 .append("categoryId=").append(this.categoryId)
-                .append("unit=").append(this.unit)
                 .append("fAgencyId=").append(this.fAgencyId)
                 .append("sAgencyId=").append(this.sAgencyId)
                 .append("tAgencyId=").append(this.tAgencyId)
@@ -328,6 +363,9 @@
                 .append("agencyId=").append(this.agencyId)
                 .append("agencyName=").append(this.agencyName)
                 .append("createDate=").append(this.createDate)
+                .append("dTime=").append(this.dTime)
+                .append("dUserId=").append(this.dUserId)
+                .append("dUserName=").append(this.dUserName)
                 .toString();
     }
 
@@ -360,9 +398,6 @@
         if (this.isset_categoryId) {
             base_goods_template.setCategoryId(this.getCategoryId());
         }
-        if (this.isset_unit) {
-            base_goods_template.setUnit(this.getUnit());
-        }
         if (this.isset_fAgencyId) {
             base_goods_template.setFAgencyId(this.getFAgencyId());
         }
@@ -387,6 +422,15 @@
         if (this.isset_createDate) {
             base_goods_template.setCreateDate(this.getCreateDate());
         }
+        if (this.isset_dTime) {
+            base_goods_template.setDTime(this.getDTime());
+        }
+        if (this.isset_dUserId) {
+            base_goods_template.setDUserId(this.getDUserId());
+        }
+        if (this.isset_dUserName) {
+            base_goods_template.setDUserName(this.getDUserName());
+        }
         return base_goods_template;
     }
 }

--
Gitblit v1.9.1