增加租户的功能

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

@@ -754,6 +754,66 @@ public class OrgaUserRelExample {
             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/Organization.java

@@ -123,6 +123,14 @@ public class Organization {
      */
     private Date orgStopTime;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_organization.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_organization.id
@@ -482,4 +490,28 @@ public class Organization {
     public void setOrgStopTime(Date orgStopTime) {
         this.orgStopTime = orgStopTime;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_organization.tenant_id
+     *
+     * @return the value of jsh_organization.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_organization.tenant_id
+     *
+     * @param tenantId the value for jsh_organization.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/OrganizationExample.java

@@ -1174,6 +1174,66 @@ public class OrganizationExample {
             addCriterion("org_stop_time not between", value1, value2, "orgStopTime");
             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/Person.java

@@ -25,6 +25,14 @@ public class Person {
      */
     private String name;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_person.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_person.Id
@@ -96,4 +104,28 @@ public class Person {
     public void setName(String name) {
         this.name = name == null ? null : name.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_person.tenant_id
+     *
+     * @return the value of jsh_person.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_person.tenant_id
+     *
+     * @param tenantId the value for jsh_person.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/PersonExample.java

@@ -393,6 +393,66 @@ public class PersonExample {
             addCriterion("Name not between", value1, value2, "name");
             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/Role.java

@@ -41,6 +41,14 @@ public class Role {
      */
     private String description;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_role.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_role.Id
@@ -160,4 +168,28 @@ public class Role {
     public void setDescription(String description) {
         this.description = description == null ? null : description.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_role.tenant_id
+     *
+     * @return the value of jsh_role.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_role.tenant_id
+     *
+     * @param tenantId the value for jsh_role.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/RoleExample.java

@@ -533,6 +533,66 @@ public class RoleExample {
             addCriterion("description not between", value1, value2, "description");
             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/SerialNumber.java

@@ -82,11 +82,23 @@ public class SerialNumber {
      * @mbggenerated
      */
     private Long updater;
+
     /**
-     * 单据主表id，用于跟踪序列号流向
-     * */
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_serial_number.depothead_Id
+     *
+     * @mbggenerated
+     */
     private Long depotheadId;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_serial_number.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_serial_number.id
@@ -180,7 +192,7 @@ public class SerialNumber {
      * @mbggenerated
      */
     public void setIsSell(String isSell) {
-        this.isSell = isSell;
+        this.isSell = isSell == null ? null : isSell.trim();
     }
 
     /**
@@ -228,7 +240,7 @@ public class SerialNumber {
      * @mbggenerated
      */
     public void setDeleteFlag(String deleteFlag) {
-        this.deleteFlag = deleteFlag;
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
     }
 
     /**
@@ -327,12 +339,51 @@ public class SerialNumber {
         this.updater = updater;
     }
 
-
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_serial_number.depothead_Id
+     *
+     * @return the value of jsh_serial_number.depothead_Id
+     *
+     * @mbggenerated
+     */
     public Long getDepotheadId() {
         return depotheadId;
     }
 
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_serial_number.depothead_Id
+     *
+     * @param depotheadId the value for jsh_serial_number.depothead_Id
+     *
+     * @mbggenerated
+     */
     public void setDepotheadId(Long depotheadId) {
         this.depotheadId = depotheadId;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_serial_number.tenant_id
+     *
+     * @return the value of jsh_serial_number.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_serial_number.tenant_id
+     *
+     * @param tenantId the value for jsh_serial_number.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/SerialNumberExample.java

@@ -426,11 +426,12 @@ public class SerialNumberExample {
         }
 
         public Criteria andIsSellLike(String value) {
-            addCriterion("isSell like", value, "isSell");
+            addCriterion("is_Sell like", value, "isSell");
             return (Criteria) this;
         }
+
         public Criteria andIsSellNotLike(String value) {
-            addCriterion("isSell not like", value, "isSell");
+            addCriterion("is_Sell not like", value, "isSell");
             return (Criteria) this;
         }
 
@@ -563,14 +564,17 @@ public class SerialNumberExample {
             addCriterion("delete_Flag <=", value, "deleteFlag");
             return (Criteria) this;
         }
+
         public Criteria andDeleteFlagLike(String value) {
-            addCriterion("deleteFlag like", value, "deleteFlag");
+            addCriterion("delete_Flag like", value, "deleteFlag");
             return (Criteria) this;
         }
+
         public Criteria andDeleteFlagNotLike(String value) {
-            addCriterion("deleteFlag not like", value, "deleteFlag");
+            addCriterion("delete_Flag not like", value, "deleteFlag");
             return (Criteria) this;
         }
+
         public Criteria andDeleteFlagIn(List<String> values) {
             addCriterion("delete_Flag in", values, "deleteFlag");
             return (Criteria) this;
@@ -830,68 +834,126 @@ public class SerialNumberExample {
             addCriterion("updater not between", value1, value2, "updater");
             return (Criteria) this;
         }
+
         public Criteria andDepotheadIdIsNull() {
-            addCriterion("depotheadId is null");
+            addCriterion("depothead_Id is null");
             return (Criteria) this;
         }
 
         public Criteria andDepotheadIdIsNotNull() {
-            addCriterion("depotheadId is not null");
+            addCriterion("depothead_Id is not null");
             return (Criteria) this;
         }
 
         public Criteria andDepotheadIdEqualTo(Long value) {
-            addCriterion("depotheadId =", value, "depotheadId");
+            addCriterion("depothead_Id =", value, "depotheadId");
             return (Criteria) this;
         }
 
         public Criteria andDepotheadIdNotEqualTo(Long value) {
-            addCriterion("depotheadId <>", value, "depotheadId");
+            addCriterion("depothead_Id <>", value, "depotheadId");
             return (Criteria) this;
         }
 
         public Criteria andDepotheadIdGreaterThan(Long value) {
-            addCriterion("depotheadId >", value, "depotheadId");
+            addCriterion("depothead_Id >", value, "depotheadId");
             return (Criteria) this;
         }
 
         public Criteria andDepotheadIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("depotheadId >=", value, "depotheadId");
+            addCriterion("depothead_Id >=", value, "depotheadId");
             return (Criteria) this;
         }
 
         public Criteria andDepotheadIdLessThan(Long value) {
-            addCriterion("depotheadId <", value, "depotheadId");
+            addCriterion("depothead_Id <", value, "depotheadId");
             return (Criteria) this;
         }
 
         public Criteria andDepotheadIdLessThanOrEqualTo(Long value) {
-            addCriterion("depotheadId <=", value, "depotheadId");
+            addCriterion("depothead_Id <=", value, "depotheadId");
             return (Criteria) this;
         }
 
         public Criteria andDepotheadIdIn(List<Long> values) {
-            addCriterion("depotheadId in", values, "depotheadId");
+            addCriterion("depothead_Id in", values, "depotheadId");
             return (Criteria) this;
         }
 
         public Criteria andDepotheadIdNotIn(List<Long> values) {
-            addCriterion("depotheadId not in", values, "depotheadId");
+            addCriterion("depothead_Id not in", values, "depotheadId");
             return (Criteria) this;
         }
 
         public Criteria andDepotheadIdBetween(Long value1, Long value2) {
-            addCriterion("depotheadId between", value1, value2, "depotheadId");
+            addCriterion("depothead_Id between", value1, value2, "depotheadId");
             return (Criteria) this;
         }
 
         public Criteria andDepotheadIdNotBetween(Long value1, Long value2) {
-            addCriterion("depotheadId not between", value1, value2, "depotheadId");
+            addCriterion("depothead_Id not between", value1, value2, "depotheadId");
+            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/Supplier.java

@@ -171,6 +171,14 @@ public class Supplier {
      */
     private BigDecimal taxrate;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_supplier.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_supplier.id
@@ -674,4 +682,28 @@ public class Supplier {
     public void setTaxrate(BigDecimal taxrate) {
         this.taxrate = taxrate;
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_supplier.tenant_id
+     *
+     * @return the value of jsh_supplier.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_supplier.tenant_id
+     *
+     * @param tenantId the value for jsh_supplier.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/SupplierExample.java

@@ -1574,6 +1574,66 @@ public class SupplierExample {
             addCriterion("taxRate not between", value1, value2, "taxrate");
             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/SystemConfig.java

@@ -57,6 +57,14 @@ public class SystemConfig {
      */
     private String companyPostCode;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_systemconfig.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_systemconfig.id
@@ -224,4 +232,28 @@ public class SystemConfig {
     public void setCompanyPostCode(String companyPostCode) {
         this.companyPostCode = companyPostCode == null ? null : companyPostCode.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_systemconfig.tenant_id
+     *
+     * @return the value of jsh_systemconfig.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_systemconfig.tenant_id
+     *
+     * @param tenantId the value for jsh_systemconfig.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/SystemConfigExample.java

@@ -673,6 +673,66 @@ public class SystemConfigExample {
             addCriterion("company_post_code not between", value1, value2, "companyPostCode");
             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/Unit.java

@@ -17,6 +17,14 @@ public class Unit {
      */
     private String uname;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_unit.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_unit.id
@@ -64,4 +72,28 @@ public class Unit {
     public void setUname(String uname) {
         this.uname = uname == null ? null : uname.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_unit.tenant_id
+     *
+     * @return the value of jsh_unit.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_unit.tenant_id
+     *
+     * @param tenantId the value for jsh_unit.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/UnitExample.java

@@ -323,6 +323,66 @@ public class UnitExample {
             addCriterion("UName not between", value1, value2, "uname");
             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/User.java

@@ -83,7 +83,7 @@ public class User {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_user.status
+     * This field corresponds to the database column jsh_user.Status
      *
      * @mbggenerated
      */
@@ -105,6 +105,14 @@ public class User {
      */
     private String remark;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_user.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_user.id
@@ -347,9 +355,9 @@ public class User {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_user.status
+     * This method returns the value of the database column jsh_user.Status
      *
-     * @return the value of jsh_user.status
+     * @return the value of jsh_user.Status
      *
      * @mbggenerated
      */
@@ -359,9 +367,9 @@ public class User {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_user.status
+     * This method sets the value of the database column jsh_user.Status
      *
-     * @param status the value for jsh_user.status
+     * @param status the value for jsh_user.Status
      *
      * @mbggenerated
      */
@@ -416,4 +424,28 @@ public class User {
     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_user.tenant_id
+     *
+     * @return the value of jsh_user.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_user.tenant_id
+     *
+     * @param tenantId the value for jsh_user.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/UserExample.java

@@ -865,62 +865,62 @@ public class UserExample {
         }
 
         public Criteria andStatusIsNull() {
-            addCriterion("status is null");
+            addCriterion("Status is null");
             return (Criteria) this;
         }
 
         public Criteria andStatusIsNotNull() {
-            addCriterion("status is not null");
+            addCriterion("Status is not null");
             return (Criteria) this;
         }
 
         public Criteria andStatusEqualTo(Byte value) {
-            addCriterion("status =", value, "status");
+            addCriterion("Status =", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusNotEqualTo(Byte value) {
-            addCriterion("status <>", value, "status");
+            addCriterion("Status <>", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusGreaterThan(Byte value) {
-            addCriterion("status >", value, "status");
+            addCriterion("Status >", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
-            addCriterion("status >=", value, "status");
+            addCriterion("Status >=", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusLessThan(Byte value) {
-            addCriterion("status <", value, "status");
+            addCriterion("Status <", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusLessThanOrEqualTo(Byte value) {
-            addCriterion("status <=", value, "status");
+            addCriterion("Status <=", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusIn(List<Byte> values) {
-            addCriterion("status in", values, "status");
+            addCriterion("Status in", values, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusNotIn(List<Byte> values) {
-            addCriterion("status not in", values, "status");
+            addCriterion("Status not in", values, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusBetween(Byte value1, Byte value2) {
-            addCriterion("status between", value1, value2, "status");
+            addCriterion("Status between", value1, value2, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusNotBetween(Byte value1, Byte value2) {
-            addCriterion("status not between", value1, value2, "status");
+            addCriterion("Status not between", value1, value2, "status");
             return (Criteria) this;
         }
 
@@ -1063,6 +1063,66 @@ public class UserExample {
             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/mappers/AccountHeadMapper.java

@@ -2,11 +2,7 @@ package com.jsh.erp.datasource.mappers;
 
 import com.jsh.erp.datasource.entities.AccountHead;
 import com.jsh.erp.datasource.entities.AccountHeadExample;
-
-import java.math.BigDecimal;
 import java.util.List;
-
-import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx;
 import org.apache.ibatis.annotations.Param;
 
 public interface AccountHeadMapper {

src/main/java/com/jsh/erp/datasource/mappers/AccountItemMapper.java

@@ -3,8 +3,6 @@ package com.jsh.erp.datasource.mappers;
 import com.jsh.erp.datasource.entities.AccountItem;
 import com.jsh.erp.datasource.entities.AccountItemExample;
 import java.util.List;
-
-import com.jsh.erp.datasource.vo.AccountItemVo4List;
 import org.apache.ibatis.annotations.Param;
 
 public interface AccountItemMapper {

src/main/java/com/jsh/erp/datasource/mappers/AccountMapper.java

@@ -3,9 +3,6 @@ package com.jsh.erp.datasource.mappers;
 import com.jsh.erp.datasource.entities.Account;
 import com.jsh.erp.datasource.entities.AccountExample;
 import java.util.List;
-
-import com.jsh.erp.datasource.vo.AccountVo4InOutList;
-import com.jsh.erp.datasource.vo.AccountVo4List;
 import org.apache.ibatis.annotations.Param;
 
 public interface AccountMapper {