增加租户的功能

src/main/java/com/jsh/erp/datasource/entities/AssetName.java

@@ -41,6 +41,14 @@ public class AssetName {
      */
     private Short isconsumables;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_assetname.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column jsh_assetname.description
@@ -169,6 +177,30 @@ public class AssetName {
         this.isconsumables = isconsumables;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_assetname.tenant_id
+     *
+     * @return the value of jsh_assetname.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_assetname.tenant_id
+     *
+     * @param tenantId the value for jsh_assetname.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_assetname.description

src/main/java/com/jsh/erp/datasource/entities/AssetNameExample.java

@@ -503,6 +503,66 @@ public class AssetNameExample {
             addCriterion("isconsumables not between", value1, value2, "isconsumables");
             return (Criteria) this;
         }
+
+        public Criteria andTenantIdIsNull() {
+            addCriterion("tenant_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIsNotNull() {
+            addCriterion("tenant_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdEqualTo(Long value) {
+            addCriterion("tenant_id =", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotEqualTo(Long value) {
+            addCriterion("tenant_id <>", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThan(Long value) {
+            addCriterion("tenant_id >", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("tenant_id >=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThan(Long value) {
+            addCriterion("tenant_id <", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThanOrEqualTo(Long value) {
+            addCriterion("tenant_id <=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIn(List<Long> values) {
+            addCriterion("tenant_id in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotIn(List<Long> values) {
+            addCriterion("tenant_id not in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdBetween(Long value1, Long value2) {
+            addCriterion("tenant_id between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotBetween(Long value1, Long value2) {
+            addCriterion("tenant_id not between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/Depot.java

@@ -75,6 +75,14 @@ public class Depot {
      */
     private Long principal;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_depot.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_depot.id
@@ -290,4 +298,28 @@ public class Depot {
     public void setPrincipal(Long principal) {
         this.principal = principal;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_depot.tenant_id
+     *
+     * @return the value of jsh_depot.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_depot.tenant_id
+     *
+     * @param tenantId the value for jsh_depot.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/DepotExample.java

@@ -774,6 +774,66 @@ public class DepotExample {
             addCriterion("principal not between", value1, value2, "principal");
             return (Criteria) this;
         }
+
+        public Criteria andTenantIdIsNull() {
+            addCriterion("tenant_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIsNotNull() {
+            addCriterion("tenant_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdEqualTo(Long value) {
+            addCriterion("tenant_id =", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotEqualTo(Long value) {
+            addCriterion("tenant_id <>", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThan(Long value) {
+            addCriterion("tenant_id >", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("tenant_id >=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThan(Long value) {
+            addCriterion("tenant_id <", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThanOrEqualTo(Long value) {
+            addCriterion("tenant_id <=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIn(List<Long> values) {
+            addCriterion("tenant_id in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotIn(List<Long> values) {
+            addCriterion("tenant_id not in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdBetween(Long value1, Long value2) {
+            addCriterion("tenant_id between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotBetween(Long value1, Long value2) {
+            addCriterion("tenant_id not between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/DepotHead.java

@@ -236,6 +236,14 @@ public class DepotHead {
      */
     private String linknumber;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_depothead.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_depothead.Id
@@ -931,4 +939,28 @@ public class DepotHead {
     public void setLinknumber(String linknumber) {
         this.linknumber = linknumber == null ? null : linknumber.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_depothead.tenant_id
+     *
+     * @return the value of jsh_depothead.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_depothead.tenant_id
+     *
+     * @param tenantId the value for jsh_depothead.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/DepotHeadExample.java

@@ -2075,6 +2075,66 @@ public class DepotHeadExample {
             addCriterion("LinkNumber not between", value1, value2, "linknumber");
             return (Criteria) this;
         }
+
+        public Criteria andTenantIdIsNull() {
+            addCriterion("tenant_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIsNotNull() {
+            addCriterion("tenant_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdEqualTo(Long value) {
+            addCriterion("tenant_id =", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotEqualTo(Long value) {
+            addCriterion("tenant_id <>", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThan(Long value) {
+            addCriterion("tenant_id >", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("tenant_id >=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThan(Long value) {
+            addCriterion("tenant_id <", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThanOrEqualTo(Long value) {
+            addCriterion("tenant_id <=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIn(List<Long> values) {
+            addCriterion("tenant_id in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotIn(List<Long> values) {
+            addCriterion("tenant_id not in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdBetween(Long value1, Long value2) {
+            addCriterion("tenant_id between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotBetween(Long value1, Long value2) {
+            addCriterion("tenant_id not between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/DepotItem.java

@@ -187,6 +187,14 @@ public class DepotItem {
      */
     private String mtype;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_depotitem.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_depotitem.Id
@@ -738,4 +746,28 @@ public class DepotItem {
     public void setMtype(String mtype) {
         this.mtype = mtype == null ? null : mtype.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_depotitem.tenant_id
+     *
+     * @return the value of jsh_depotitem.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_depotitem.tenant_id
+     *
+     * @param tenantId the value for jsh_depotitem.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/DepotItemExample.java

@@ -1664,6 +1664,66 @@ public class DepotItemExample {
             addCriterion("MType not between", value1, value2, "mtype");
             return (Criteria) this;
         }
+
+        public Criteria andTenantIdIsNull() {
+            addCriterion("tenant_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIsNotNull() {
+            addCriterion("tenant_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdEqualTo(Long value) {
+            addCriterion("tenant_id =", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotEqualTo(Long value) {
+            addCriterion("tenant_id <>", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThan(Long value) {
+            addCriterion("tenant_id >", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("tenant_id >=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThan(Long value) {
+            addCriterion("tenant_id <", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThanOrEqualTo(Long value) {
+            addCriterion("tenant_id <=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIn(List<Long> values) {
+            addCriterion("tenant_id in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotIn(List<Long> values) {
+            addCriterion("tenant_id not in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdBetween(Long value1, Long value2) {
+            addCriterion("tenant_id between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotBetween(Long value1, Long value2) {
+            addCriterion("tenant_id not between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4Material.java

@@ -3,242 +3,12 @@ package com.jsh.erp.datasource.entities;
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class DepotItemVo4Material {
-
-    private Long id;
-
-    private Long headerid;
-
-    private Long materialid;
-
-    private String munit;
-
-    private BigDecimal opernumber;
-
-    private BigDecimal basicnumber;
-
-    private BigDecimal unitprice;
-
-    private BigDecimal taxunitprice;
-
-    private BigDecimal allprice;
-
-    private String remark;
-
-    private String img;
-
-    private BigDecimal incidentals;
-
-    private Long depotid;
-
-    private Long anotherdepotid;
-
-    private BigDecimal taxrate;
-
-    private BigDecimal taxmoney;
-
-    private BigDecimal taxlastmoney;
-
-    private String otherfield1;
-
-    private String otherfield2;
-
-    private String otherfield3;
-
-    private String otherfield4;
-
-    private String otherfield5;
-
-    private String mtype;
+public class DepotItemVo4Material extends DepotItem{
 
     private String mname;
 
     private String mmodel;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getHeaderid() {
-        return headerid;
-    }
-
-    public void setHeaderid(Long headerid) {
-        this.headerid = headerid;
-    }
-
-    public Long getMaterialid() {
-        return materialid;
-    }
-
-    public void setMaterialid(Long materialid) {
-        this.materialid = materialid;
-    }
-
-    public String getMunit() {
-        return munit;
-    }
-
-    public void setMunit(String munit) {
-        this.munit = munit;
-    }
-
-    public BigDecimal getOpernumber() {
-        return opernumber;
-    }
-
-    public void setOpernumber(BigDecimal opernumber) {
-        this.opernumber = opernumber;
-    }
-
-    public BigDecimal getBasicnumber() {
-        return basicnumber;
-    }
-
-    public void setBasicnumber(BigDecimal basicnumber) {
-        this.basicnumber = basicnumber;
-    }
-
-    public BigDecimal getUnitprice() {
-        return unitprice;
-    }
-
-    public void setUnitprice(BigDecimal unitprice) {
-        this.unitprice = unitprice;
-    }
-
-    public BigDecimal getTaxunitprice() {
-        return taxunitprice;
-    }
-
-    public void setTaxunitprice(BigDecimal taxunitprice) {
-        this.taxunitprice = taxunitprice;
-    }
-
-    public BigDecimal getAllprice() {
-        return allprice;
-    }
-
-    public void setAllprice(BigDecimal allprice) {
-        this.allprice = allprice;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getImg() {
-        return img;
-    }
-
-    public void setImg(String img) {
-        this.img = img;
-    }
-
-    public BigDecimal getIncidentals() {
-        return incidentals;
-    }
-
-    public void setIncidentals(BigDecimal incidentals) {
-        this.incidentals = incidentals;
-    }
-
-    public Long getDepotid() {
-        return depotid;
-    }
-
-    public void setDepotid(Long depotid) {
-        this.depotid = depotid;
-    }
-
-    public Long getAnotherdepotid() {
-        return anotherdepotid;
-    }
-
-    public void setAnotherdepotid(Long anotherdepotid) {
-        this.anotherdepotid = anotherdepotid;
-    }
-
-    public BigDecimal getTaxrate() {
-        return taxrate;
-    }
-
-    public void setTaxrate(BigDecimal taxrate) {
-        this.taxrate = taxrate;
-    }
-
-    public BigDecimal getTaxmoney() {
-        return taxmoney;
-    }
-
-    public void setTaxmoney(BigDecimal taxmoney) {
-        this.taxmoney = taxmoney;
-    }
-
-    public BigDecimal getTaxlastmoney() {
-        return taxlastmoney;
-    }
-
-    public void setTaxlastmoney(BigDecimal taxlastmoney) {
-        this.taxlastmoney = taxlastmoney;
-    }
-
-    public String getOtherfield1() {
-        return otherfield1;
-    }
-
-    public void setOtherfield1(String otherfield1) {
-        this.otherfield1 = otherfield1;
-    }
-
-    public String getOtherfield2() {
-        return otherfield2;
-    }
-
-    public void setOtherfield2(String otherfield2) {
-        this.otherfield2 = otherfield2;
-    }
-
-    public String getOtherfield3() {
-        return otherfield3;
-    }
-
-    public void setOtherfield3(String otherfield3) {
-        this.otherfield3 = otherfield3;
-    }
-
-    public String getOtherfield4() {
-        return otherfield4;
-    }
-
-    public void setOtherfield4(String otherfield4) {
-        this.otherfield4 = otherfield4;
-    }
-
-    public String getOtherfield5() {
-        return otherfield5;
-    }
-
-    public void setOtherfield5(String otherfield5) {
-        this.otherfield5 = otherfield5;
-    }
-
-    public String getMtype() {
-        return mtype;
-    }
-
-    public void setMtype(String mtype) {
-        this.mtype = mtype;
-    }
-
     public String getMname() {
         return mname;
     }

src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java

 package com.jsh.erp.datasource.entities;
 
-import java.math.BigDecimal;
-
-public class DepotItemVo4WithInfoEx {
-
-    private Long id;
-
-    private Long headerid;
-
-    private Long materialid;
-
-    private String munit;
-
-    private BigDecimal opernumber;
-
-    private BigDecimal basicnumber;
-
-    private BigDecimal unitprice;
-
-    private BigDecimal taxunitprice;
-
-    private BigDecimal allprice;
-
-    private String remark;
-
-    private String img;
-
-    private BigDecimal incidentals;
-
-    private Long depotid;
-
-    private Long anotherdepotid;
-
-    private BigDecimal taxrate;
-
-    private BigDecimal taxmoney;
-
-    private BigDecimal taxlastmoney;
-
-    private String otherfield1;
-
-    private String otherfield2;
-
-    private String otherfield3;
-
-    private String otherfield4;
-
-    private String otherfield5;
-
-    private String mtype;
+public class DepotItemVo4WithInfoEx extends DepotItem{
 
     private Long MId;
 
@@ -78,190 +30,6 @@ public class DepotItemVo4WithInfoEx {
 
     private String UName;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getHeaderid() {
-        return headerid;
-    }
-
-    public void setHeaderid(Long headerid) {
-        this.headerid = headerid;
-    }
-
-    public Long getMaterialid() {
-        return materialid;
-    }
-
-    public void setMaterialid(Long materialid) {
-        this.materialid = materialid;
-    }
-
-    public String getMunit() {
-        return munit;
-    }
-
-    public void setMunit(String munit) {
-        this.munit = munit;
-    }
-
-    public BigDecimal getOpernumber() {
-        return opernumber;
-    }
-
-    public void setOpernumber(BigDecimal opernumber) {
-        this.opernumber = opernumber;
-    }
-
-    public BigDecimal getBasicnumber() {
-        return basicnumber;
-    }
-
-    public void setBasicnumber(BigDecimal basicnumber) {
-        this.basicnumber = basicnumber;
-    }
-
-    public BigDecimal getUnitprice() {
-        return unitprice;
-    }
-
-    public void setUnitprice(BigDecimal unitprice) {
-        this.unitprice = unitprice;
-    }
-
-    public BigDecimal getTaxunitprice() {
-        return taxunitprice;
-    }
-
-    public void setTaxunitprice(BigDecimal taxunitprice) {
-        this.taxunitprice = taxunitprice;
-    }
-
-    public BigDecimal getAllprice() {
-        return allprice;
-    }
-
-    public void setAllprice(BigDecimal allprice) {
-        this.allprice = allprice;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getImg() {
-        return img;
-    }
-
-    public void setImg(String img) {
-        this.img = img;
-    }
-
-    public BigDecimal getIncidentals() {
-        return incidentals;
-    }
-
-    public void setIncidentals(BigDecimal incidentals) {
-        this.incidentals = incidentals;
-    }
-
-    public Long getDepotid() {
-        return depotid;
-    }
-
-    public void setDepotid(Long depotid) {
-        this.depotid = depotid;
-    }
-
-    public Long getAnotherdepotid() {
-        return anotherdepotid;
-    }
-
-    public void setAnotherdepotid(Long anotherdepotid) {
-        this.anotherdepotid = anotherdepotid;
-    }
-
-    public BigDecimal getTaxrate() {
-        return taxrate;
-    }
-
-    public void setTaxrate(BigDecimal taxrate) {
-        this.taxrate = taxrate;
-    }
-
-    public BigDecimal getTaxmoney() {
-        return taxmoney;
-    }
-
-    public void setTaxmoney(BigDecimal taxmoney) {
-        this.taxmoney = taxmoney;
-    }
-
-    public BigDecimal getTaxlastmoney() {
-        return taxlastmoney;
-    }
-
-    public void setTaxlastmoney(BigDecimal taxlastmoney) {
-        this.taxlastmoney = taxlastmoney;
-    }
-
-    public String getOtherfield1() {
-        return otherfield1;
-    }
-
-    public void setOtherfield1(String otherfield1) {
-        this.otherfield1 = otherfield1;
-    }
-
-    public String getOtherfield2() {
-        return otherfield2;
-    }
-
-    public void setOtherfield2(String otherfield2) {
-        this.otherfield2 = otherfield2;
-    }
-
-    public String getOtherfield3() {
-        return otherfield3;
-    }
-
-    public void setOtherfield3(String otherfield3) {
-        this.otherfield3 = otherfield3;
-    }
-
-    public String getOtherfield4() {
-        return otherfield4;
-    }
-
-    public void setOtherfield4(String otherfield4) {
-        this.otherfield4 = otherfield4;
-    }
-
-    public String getOtherfield5() {
-        return otherfield5;
-    }
-
-    public void setOtherfield5(String otherfield5) {
-        this.otherfield5 = otherfield5;
-    }
-
-    public String getMtype() {
-        return mtype;
-    }
-
-    public void setMtype(String mtype) {
-        this.mtype = mtype;
-    }
-
     public Long getMId() {
         return MId;
     }

src/main/java/com/jsh/erp/datasource/entities/InOutItem.java

@@ -33,6 +33,14 @@ public class InOutItem {
      */
     private String remark;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_inoutitem.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_inoutitem.Id
@@ -128,4 +136,28 @@ public class InOutItem {
     public void setRemark(String remark) {
         this.remark = remark == null ? null : remark.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_inoutitem.tenant_id
+     *
+     * @return the value of jsh_inoutitem.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_inoutitem.tenant_id
+     *
+     * @param tenantId the value for jsh_inoutitem.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/InOutItemExample.java

@@ -463,6 +463,66 @@ public class InOutItemExample {
             addCriterion("Remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
+
+        public Criteria andTenantIdIsNull() {
+            addCriterion("tenant_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIsNotNull() {
+            addCriterion("tenant_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdEqualTo(Long value) {
+            addCriterion("tenant_id =", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotEqualTo(Long value) {
+            addCriterion("tenant_id <>", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThan(Long value) {
+            addCriterion("tenant_id >", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("tenant_id >=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThan(Long value) {
+            addCriterion("tenant_id <", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThanOrEqualTo(Long value) {
+            addCriterion("tenant_id <=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIn(List<Long> values) {
+            addCriterion("tenant_id in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotIn(List<Long> values) {
+            addCriterion("tenant_id not in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdBetween(Long value1, Long value2) {
+            addCriterion("tenant_id between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotBetween(Long value1, Long value2) {
+            addCriterion("tenant_id not between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/Log.java

@@ -67,6 +67,14 @@ public class Log {
      */
     private String remark;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_log.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_log.id
@@ -258,4 +266,28 @@ public class Log {
     public void setRemark(String remark) {
         this.remark = remark == null ? null : remark.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_log.tenant_id
+     *
+     * @return the value of jsh_log.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_log.tenant_id
+     *
+     * @param tenantId the value for jsh_log.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/LogExample.java

@@ -714,6 +714,66 @@ public class LogExample {
             addCriterion("remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
+
+        public Criteria andTenantIdIsNull() {
+            addCriterion("tenant_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIsNotNull() {
+            addCriterion("tenant_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdEqualTo(Long value) {
+            addCriterion("tenant_id =", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotEqualTo(Long value) {
+            addCriterion("tenant_id <>", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThan(Long value) {
+            addCriterion("tenant_id >", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("tenant_id >=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThan(Long value) {
+            addCriterion("tenant_id <", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThanOrEqualTo(Long value) {
+            addCriterion("tenant_id <=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIn(List<Long> values) {
+            addCriterion("tenant_id in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotIn(List<Long> values) {
+            addCriterion("tenant_id not in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdBetween(Long value1, Long value2) {
+            addCriterion("tenant_id between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotBetween(Long value1, Long value2) {
+            addCriterion("tenant_id not between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/Material.java

@@ -186,11 +186,22 @@ public class Material {
      * @mbggenerated
      */
     private String otherfield3;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_material.enableSerialNumber
+     *
+     * @mbggenerated
+     */
+    private String enableserialnumber;
+
     /**
-     * 2019-01-21新增字段enableSerialNumber
-     *是否开启序列号
-     * */
-    private String enableSerialNumber;
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_material.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
 
     /**
      * This method was generated by MyBatis Generator.
@@ -744,11 +755,51 @@ public class Material {
         this.otherfield3 = otherfield3 == null ? null : otherfield3.trim();
     }
 
-    public String getEnableSerialNumber() {
-        return enableSerialNumber;
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_material.enableSerialNumber
+     *
+     * @return the value of jsh_material.enableSerialNumber
+     *
+     * @mbggenerated
+     */
+    public String getEnableserialnumber() {
+        return enableserialnumber;
     }
 
-    public void setEnableSerialNumber(String enableSerialNumber) {
-        this.enableSerialNumber = enableSerialNumber;
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_material.enableSerialNumber
+     *
+     * @param enableserialnumber the value for jsh_material.enableSerialNumber
+     *
+     * @mbggenerated
+     */
+    public void setEnableserialnumber(String enableserialnumber) {
+        this.enableserialnumber = enableserialnumber == null ? null : enableserialnumber.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_material.tenant_id
+     *
+     * @return the value of jsh_material.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_material.tenant_id
+     *
+     * @param tenantId the value for jsh_material.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
     }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/MaterialCategory.java

@@ -99,6 +99,14 @@ public class MaterialCategory {
      */
     private Long updater;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_materialcategory.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_materialcategory.Id
@@ -386,4 +394,28 @@ public class MaterialCategory {
     public void setUpdater(Long updater) {
         this.updater = updater;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_materialcategory.tenant_id
+     *
+     * @return the value of jsh_materialcategory.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_materialcategory.tenant_id
+     *
+     * @param tenantId the value for jsh_materialcategory.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/MaterialCategoryExample.java

@@ -964,6 +964,66 @@ public class MaterialCategoryExample {
             addCriterion("updater not between", value1, value2, "updater");
             return (Criteria) this;
         }
+
+        public Criteria andTenantIdIsNull() {
+            addCriterion("tenant_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIsNotNull() {
+            addCriterion("tenant_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdEqualTo(Long value) {
+            addCriterion("tenant_id =", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotEqualTo(Long value) {
+            addCriterion("tenant_id <>", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThan(Long value) {
+            addCriterion("tenant_id >", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("tenant_id >=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThan(Long value) {
+            addCriterion("tenant_id <", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThanOrEqualTo(Long value) {
+            addCriterion("tenant_id <=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIn(List<Long> values) {
+            addCriterion("tenant_id in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotIn(List<Long> values) {
+            addCriterion("tenant_id not in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdBetween(Long value1, Long value2) {
+            addCriterion("tenant_id between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotBetween(Long value1, Long value2) {
+            addCriterion("tenant_id not between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
     }
 
     /**

src/main/java/com/jsh/erp/datasource/entities/MaterialExample.java

@@ -1704,70 +1704,134 @@ public class MaterialExample {
             addCriterion("OtherField3 not between", value1, value2, "otherfield3");
             return (Criteria) this;
         }
-        public Criteria andEnableSerialNumberIsNull() {
+
+        public Criteria andEnableserialnumberIsNull() {
             addCriterion("enableSerialNumber is null");
             return (Criteria) this;
         }
 
-        public Criteria andEnableSerialNumberIsNotNull() {
+        public Criteria andEnableserialnumberIsNotNull() {
             addCriterion("enableSerialNumber is not null");
             return (Criteria) this;
         }
 
-        public Criteria andEnableSerialNumberEqualTo(String value) {
-            addCriterion("enableSerialNumber =", value, "enableSerialNumber");
+        public Criteria andEnableserialnumberEqualTo(String value) {
+            addCriterion("enableSerialNumber =", value, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableserialnumberNotEqualTo(String value) {
+            addCriterion("enableSerialNumber <>", value, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableserialnumberGreaterThan(String value) {
+            addCriterion("enableSerialNumber >", value, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableserialnumberGreaterThanOrEqualTo(String value) {
+            addCriterion("enableSerialNumber >=", value, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableserialnumberLessThan(String value) {
+            addCriterion("enableSerialNumber <", value, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableserialnumberLessThanOrEqualTo(String value) {
+            addCriterion("enableSerialNumber <=", value, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableserialnumberLike(String value) {
+            addCriterion("enableSerialNumber like", value, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableserialnumberNotLike(String value) {
+            addCriterion("enableSerialNumber not like", value, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableserialnumberIn(List<String> values) {
+            addCriterion("enableSerialNumber in", values, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableserialnumberNotIn(List<String> values) {
+            addCriterion("enableSerialNumber not in", values, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableserialnumberBetween(String value1, String value2) {
+            addCriterion("enableSerialNumber between", value1, value2, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andEnableserialnumberNotBetween(String value1, String value2) {
+            addCriterion("enableSerialNumber not between", value1, value2, "enableserialnumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIsNull() {
+            addCriterion("tenant_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andEnableSerialNumberNotEqualTo(String value) {
-            addCriterion("enableSerialNumber <>", value, "enableSerialNumber");
+        public Criteria andTenantIdIsNotNull() {
+            addCriterion("tenant_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andEnableSerialNumberGreaterThan(String value) {
-            addCriterion("enableSerialNumber >", value, "enableSerialNumber");
+        public Criteria andTenantIdEqualTo(Long value) {
+            addCriterion("tenant_id =", value, "tenantId");
             return (Criteria) this;
         }
 
-        public Criteria andEnableSerialNumberGreaterThanOrEqualTo(String value) {
-            addCriterion("enableSerialNumber >=", value, "enableSerialNumber");
+        public Criteria andTenantIdNotEqualTo(Long value) {
+            addCriterion("tenant_id <>", value, "tenantId");
             return (Criteria) this;
         }
 
-        public Criteria andEnableSerialNumberLessThan(String value) {
-            addCriterion("enableSerialNumber <", value, "enableSerialNumber");
+        public Criteria andTenantIdGreaterThan(Long value) {
+            addCriterion("tenant_id >", value, "tenantId");
             return (Criteria) this;
         }
 
-        public Criteria andEnableSerialNumberLessThanOrEqualTo(String value) {
-            addCriterion("enableSerialNumber <=", value, "enableSerialNumber");
+        public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("tenant_id >=", value, "tenantId");
             return (Criteria) this;
         }
-        public Criteria andEnableSerialNumberLike(String value) {
-            addCriterion("enableSerialNumber like", value, "enableSerialNumber");
+
+        public Criteria andTenantIdLessThan(Long value) {
+            addCriterion("tenant_id <", value, "tenantId");
             return (Criteria) this;
         }
-        public Criteria andEnableSerialNumberNotLike(String value) {
-            addCriterion("enableSerialNumber not like", value, "enableSerialNumber");
+
+        public Criteria andTenantIdLessThanOrEqualTo(Long value) {
+            addCriterion("tenant_id <=", value, "tenantId");
             return (Criteria) this;
         }
-        public Criteria andEnableSerialNumberIn(List<String> values) {
-            addCriterion("enableSerialNumber in", values, "enableSerialNumber");
+
+        public Criteria andTenantIdIn(List<Long> values) {
+            addCriterion("tenant_id in", values, "tenantId");
             return (Criteria) this;
         }
 
-        public Criteria andEnableSerialNumberNotIn(List<String> values) {
-            addCriterion("enableSerialNumber not in", values, "enableSerialNumber");
+        public Criteria andTenantIdNotIn(List<Long> values) {
+            addCriterion("tenant_id not in", values, "tenantId");
             return (Criteria) this;
         }
 
-        public Criteria andEnableSerialNumberBetween(String value1, String value2) {
-            addCriterion("enableSerialNumber between", value1, value2, "enableSerialNumber");
+        public Criteria andTenantIdBetween(Long value1, Long value2) {
+            addCriterion("tenant_id between", value1, value2, "tenantId");
             return (Criteria) this;
         }
 
-        public Criteria andEnableSerialNumberNotBetween(String value1, String value2) {
-            addCriterion("enableSerialNumber not between", value1, value2, "enableSerialNumber");
+        public Criteria andTenantIdNotBetween(Long value1, Long value2) {
+            addCriterion("tenant_id not between", value1, value2, "tenantId");
             return (Criteria) this;
         }
     }

src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java

@@ -2,248 +2,13 @@ package com.jsh.erp.datasource.entities;
 
 import java.math.BigDecimal;
 
-public class MaterialVo4Unit {
-
-    private Long id;
-
-    private Long categoryid;
-
-    private String name;
-
-    private String mfrs;
-
-    private BigDecimal packing;
-
-    private BigDecimal safetystock;
-
-    private String model;
-
-    private String standard;
-
-    private String color;
-
-    private String unit;
-
-    private String remark;
-
-    private BigDecimal retailprice;
-
-    private BigDecimal lowprice;
-
-    private BigDecimal presetpriceone;
-
-    private BigDecimal presetpricetwo;
-
-    private Long unitid;
-
-    private String firstoutunit;
-
-    private String firstinunit;
-
-    private String pricestrategy;
-
-    private Boolean enabled;
-
-    private String otherfield1;
-
-    private String otherfield2;
-
-    private String otherfield3;
+public class MaterialVo4Unit extends Material{
 
     private String unitName;
 
     private String categoryName;
 
     private String materialOther;
-    /**
-     * 2019-01-21新增字段enableSerialNumber
-     *是否开启序列号
-     * */
-    private String enableSerialNumber;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getCategoryid() {
-        return categoryid;
-    }
-
-    public void setCategoryid(Long categoryid) {
-        this.categoryid = categoryid;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getMfrs() {
-        return mfrs;
-    }
-
-    public void setMfrs(String mfrs) {
-        this.mfrs = mfrs;
-    }
-
-    public BigDecimal getPacking() {
-        return packing;
-    }
-
-    public void setPacking(BigDecimal packing) {
-        this.packing = packing;
-    }
-
-    public BigDecimal getSafetystock() {
-        return safetystock;
-    }
-
-    public void setSafetystock(BigDecimal safetystock) {
-        this.safetystock = safetystock;
-    }
-
-    public String getModel() {
-        return model;
-    }
-
-    public void setModel(String model) {
-        this.model = model;
-    }
-
-    public String getStandard() {
-        return standard;
-    }
-
-    public void setStandard(String standard) {
-        this.standard = standard;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public String getUnit() {
-        return unit;
-    }
-
-    public void setUnit(String unit) {
-        this.unit = unit;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public BigDecimal getRetailprice() {
-        return retailprice;
-    }
-
-    public void setRetailprice(BigDecimal retailprice) {
-        this.retailprice = retailprice;
-    }
-
-    public BigDecimal getLowprice() {
-        return lowprice;
-    }
-
-    public void setLowprice(BigDecimal lowprice) {
-        this.lowprice = lowprice;
-    }
-
-    public BigDecimal getPresetpriceone() {
-        return presetpriceone;
-    }
-
-    public void setPresetpriceone(BigDecimal presetpriceone) {
-        this.presetpriceone = presetpriceone;
-    }
-
-    public BigDecimal getPresetpricetwo() {
-        return presetpricetwo;
-    }
-
-    public void setPresetpricetwo(BigDecimal presetpricetwo) {
-        this.presetpricetwo = presetpricetwo;
-    }
-
-    public Long getUnitid() {
-        return unitid;
-    }
-
-    public void setUnitid(Long unitid) {
-        this.unitid = unitid;
-    }
-
-    public String getFirstoutunit() {
-        return firstoutunit;
-    }
-
-    public void setFirstoutunit(String firstoutunit) {
-        this.firstoutunit = firstoutunit;
-    }
-
-    public String getFirstinunit() {
-        return firstinunit;
-    }
-
-    public void setFirstinunit(String firstinunit) {
-        this.firstinunit = firstinunit;
-    }
-
-    public String getPricestrategy() {
-        return pricestrategy;
-    }
-
-    public void setPricestrategy(String pricestrategy) {
-        this.pricestrategy = pricestrategy;
-    }
-
-    public Boolean getEnabled() {
-        return enabled;
-    }
-
-    public void setEnabled(Boolean enabled) {
-        this.enabled = enabled;
-    }
-
-    public String getOtherfield1() {
-        return otherfield1;
-    }
-
-    public void setOtherfield1(String otherfield1) {
-        this.otherfield1 = otherfield1;
-    }
-
-    public String getOtherfield2() {
-        return otherfield2;
-    }
-
-    public void setOtherfield2(String otherfield2) {
-        this.otherfield2 = otherfield2;
-    }
-
-    public String getOtherfield3() {
-        return otherfield3;
-    }
-
-    public void setOtherfield3(String otherfield3) {
-        this.otherfield3 = otherfield3;
-    }
 
     public String getUnitName() {
         return unitName;
@@ -268,12 +33,4 @@ public class MaterialVo4Unit {
     public void setMaterialOther(String materialOther) {
         this.materialOther = materialOther;
     }
-
-    public String getEnableSerialNumber() {
-        return enableSerialNumber;
-    }
-
-    public void setEnableSerialNumber(String enableSerialNumber) {
-        this.enableSerialNumber = enableSerialNumber;
-    }
 }
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/entities/OrgaUserRel.java

@@ -75,6 +75,14 @@ public class OrgaUserRel {
      */
     private Long updater;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_orga_user_rel.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_orga_user_rel.id
@@ -290,4 +298,28 @@ public class OrgaUserRel {
     public void setUpdater(Long updater) {
         this.updater = updater;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_orga_user_rel.tenant_id
+     *
+     * @return the value of jsh_orga_user_rel.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_orga_user_rel.tenant_id
+     *
+     * @param tenantId the value for jsh_orga_user_rel.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }
\ No newline at end of file