优化表结构

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

 package com.jsh.erp.datasource.entities;
 
 public class Role {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_role.Id
-     *
-     * @mbggenerated
-     */
     private Long id;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_role.Name
-     *
-     * @mbggenerated
-     */
     private String name;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_role.type
-     *
-     * @mbggenerated
-     */
     private String type;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_role.value
-     *
-     * @mbggenerated
-     */
     private String value;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_role.description
-     *
-     * @mbggenerated
-     */
     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 field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_role.delete_Flag
-     *
-     * @mbggenerated
-     */
     private String deleteFlag;
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_role.Id
-     *
-     * @return the value of jsh_role.Id
-     *
-     * @mbggenerated
-     */
     public Long getId() {
         return id;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_role.Id
-     *
-     * @param id the value for jsh_role.Id
-     *
-     * @mbggenerated
-     */
     public void setId(Long id) {
         this.id = id;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_role.Name
-     *
-     * @return the value of jsh_role.Name
-     *
-     * @mbggenerated
-     */
     public String getName() {
         return name;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_role.Name
-     *
-     * @param name the value for jsh_role.Name
-     *
-     * @mbggenerated
-     */
     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_role.type
-     *
-     * @return the value of jsh_role.type
-     *
-     * @mbggenerated
-     */
     public String getType() {
         return type;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_role.type
-     *
-     * @param type the value for jsh_role.type
-     *
-     * @mbggenerated
-     */
     public void setType(String type) {
         this.type = type == null ? null : type.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_role.value
-     *
-     * @return the value of jsh_role.value
-     *
-     * @mbggenerated
-     */
     public String getValue() {
         return value;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_role.value
-     *
-     * @param value the value for jsh_role.value
-     *
-     * @mbggenerated
-     */
     public void setValue(String value) {
         this.value = value == null ? null : value.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_role.description
-     *
-     * @return the value of jsh_role.description
-     *
-     * @mbggenerated
-     */
     public String getDescription() {
         return description;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_role.description
-     *
-     * @param description the value for jsh_role.description
-     *
-     * @mbggenerated
-     */
     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;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_role.delete_Flag
-     *
-     * @return the value of jsh_role.delete_Flag
-     *
-     * @mbggenerated
-     */
     public String getDeleteFlag() {
         return deleteFlag;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_role.delete_Flag
-     *
-     * @param deleteFlag the value for jsh_role.delete_Flag
-     *
-     * @mbggenerated
-     */
     public void setDeleteFlag(String deleteFlag) {
         this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
     }

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

@@ -4,118 +4,46 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class RoleExample {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     protected String orderByClause;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     protected boolean distinct;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     protected List<Criteria> oredCriteria;
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     public RoleExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     public String getOrderByClause() {
         return orderByClause;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     public boolean isDistinct() {
         return distinct;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
         oredCriteria.add(criteria);
         return criteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
         if (oredCriteria.size() == 0) {
@@ -124,41 +52,23 @@ public class RoleExample {
         return criteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
         return criteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     public void clear() {
         oredCriteria.clear();
         orderByClause = null;
         distinct = false;
     }
 
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -195,132 +105,132 @@ public class RoleExample {
         }
 
         public Criteria andIdIsNull() {
-            addCriterion("Id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
         public Criteria andIdIsNotNull() {
-            addCriterion("Id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
         public Criteria andIdEqualTo(Long value) {
-            addCriterion("Id =", value, "id");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdNotEqualTo(Long value) {
-            addCriterion("Id <>", value, "id");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdGreaterThan(Long value) {
-            addCriterion("Id >", value, "id");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("Id >=", value, "id");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdLessThan(Long value) {
-            addCriterion("Id <", value, "id");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdLessThanOrEqualTo(Long value) {
-            addCriterion("Id <=", value, "id");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdIn(List<Long> values) {
-            addCriterion("Id in", values, "id");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdNotIn(List<Long> values) {
-            addCriterion("Id not in", values, "id");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdBetween(Long value1, Long value2) {
-            addCriterion("Id between", value1, value2, "id");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdNotBetween(Long value1, Long value2) {
-            addCriterion("Id not between", value1, value2, "id");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
 
         public Criteria andNameIsNull() {
-            addCriterion("Name is null");
+            addCriterion("name is null");
             return (Criteria) this;
         }
 
         public Criteria andNameIsNotNull() {
-            addCriterion("Name is not null");
+            addCriterion("name is not null");
             return (Criteria) this;
         }
 
         public Criteria andNameEqualTo(String value) {
-            addCriterion("Name =", value, "name");
+            addCriterion("name =", value, "name");
             return (Criteria) this;
         }
 
         public Criteria andNameNotEqualTo(String value) {
-            addCriterion("Name <>", value, "name");
+            addCriterion("name <>", value, "name");
             return (Criteria) this;
         }
 
         public Criteria andNameGreaterThan(String value) {
-            addCriterion("Name >", value, "name");
+            addCriterion("name >", value, "name");
             return (Criteria) this;
         }
 
         public Criteria andNameGreaterThanOrEqualTo(String value) {
-            addCriterion("Name >=", value, "name");
+            addCriterion("name >=", value, "name");
             return (Criteria) this;
         }
 
         public Criteria andNameLessThan(String value) {
-            addCriterion("Name <", value, "name");
+            addCriterion("name <", value, "name");
             return (Criteria) this;
         }
 
         public Criteria andNameLessThanOrEqualTo(String value) {
-            addCriterion("Name <=", value, "name");
+            addCriterion("name <=", value, "name");
             return (Criteria) this;
         }
 
         public Criteria andNameLike(String value) {
-            addCriterion("Name like", value, "name");
+            addCriterion("name like", value, "name");
             return (Criteria) this;
         }
 
         public Criteria andNameNotLike(String value) {
-            addCriterion("Name not like", value, "name");
+            addCriterion("name not like", value, "name");
             return (Criteria) this;
         }
 
         public Criteria andNameIn(List<String> values) {
-            addCriterion("Name in", values, "name");
+            addCriterion("name in", values, "name");
             return (Criteria) this;
         }
 
         public Criteria andNameNotIn(List<String> values) {
-            addCriterion("Name not in", values, "name");
+            addCriterion("name not in", values, "name");
             return (Criteria) this;
         }
 
         public Criteria andNameBetween(String value1, String value2) {
-            addCriterion("Name between", value1, value2, "name");
+            addCriterion("name between", value1, value2, "name");
             return (Criteria) this;
         }
 
         public Criteria andNameNotBetween(String value1, String value2) {
-            addCriterion("Name not between", value1, value2, "name");
+            addCriterion("name not between", value1, value2, "name");
             return (Criteria) this;
         }
 
@@ -595,95 +505,82 @@ public class RoleExample {
         }
 
         public Criteria andDeleteFlagIsNull() {
-            addCriterion("delete_Flag is null");
+            addCriterion("delete_flag is null");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagIsNotNull() {
-            addCriterion("delete_Flag is not null");
+            addCriterion("delete_flag is not null");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagEqualTo(String value) {
-            addCriterion("delete_Flag =", value, "deleteFlag");
+            addCriterion("delete_flag =", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotEqualTo(String value) {
-            addCriterion("delete_Flag <>", value, "deleteFlag");
+            addCriterion("delete_flag <>", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagGreaterThan(String value) {
-            addCriterion("delete_Flag >", value, "deleteFlag");
+            addCriterion("delete_flag >", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
-            addCriterion("delete_Flag >=", value, "deleteFlag");
+            addCriterion("delete_flag >=", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLessThan(String value) {
-            addCriterion("delete_Flag <", value, "deleteFlag");
+            addCriterion("delete_flag <", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
-            addCriterion("delete_Flag <=", value, "deleteFlag");
+            addCriterion("delete_flag <=", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLike(String value) {
-            addCriterion("delete_Flag like", value, "deleteFlag");
+            addCriterion("delete_flag like", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotLike(String value) {
-            addCriterion("delete_Flag 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");
+            addCriterion("delete_flag in", values, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotIn(List<String> values) {
-            addCriterion("delete_Flag not in", values, "deleteFlag");
+            addCriterion("delete_flag not in", values, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagBetween(String value1, String value2) {
-            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            addCriterion("delete_flag between", value1, value2, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotBetween(String value1, String value2) {
-            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            addCriterion("delete_flag not between", value1, value2, "deleteFlag");
             return (Criteria) this;
         }
     }
 
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table jsh_role
-     *
-     * @mbggenerated do_not_delete_during_merge
-     */
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }
     }
 
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     public static class Criterion {
         private String condition;
 

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

@@ -3,386 +3,122 @@ package com.jsh.erp.datasource.entities;
 import java.util.Date;
 
 public class SerialNumber {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.id
-     *
-     * @mbggenerated
-     */
     private Long id;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.material_Id
-     *
-     * @mbggenerated
-     */
     private Long materialId;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.serial_Number
-     *
-     * @mbggenerated
-     */
     private String serialNumber;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.is_Sell
-     *
-     * @mbggenerated
-     */
     private String isSell;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.remark
-     *
-     * @mbggenerated
-     */
     private String remark;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.delete_Flag
-     *
-     * @mbggenerated
-     */
     private String deleteFlag;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.create_Time
-     *
-     * @mbggenerated
-     */
     private Date createTime;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.creator
-     *
-     * @mbggenerated
-     */
     private Long creator;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.update_Time
-     *
-     * @mbggenerated
-     */
     private Date updateTime;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.updater
-     *
-     * @mbggenerated
-     */
     private Long updater;
 
-    /**
-     * 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 depotHeadId;
+
     private Long tenantId;
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.id
-     *
-     * @return the value of jsh_serial_number.id
-     *
-     * @mbggenerated
-     */
     public Long getId() {
         return id;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.id
-     *
-     * @param id the value for jsh_serial_number.id
-     *
-     * @mbggenerated
-     */
     public void setId(Long id) {
         this.id = id;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.material_Id
-     *
-     * @return the value of jsh_serial_number.material_Id
-     *
-     * @mbggenerated
-     */
     public Long getMaterialId() {
         return materialId;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.material_Id
-     *
-     * @param materialId the value for jsh_serial_number.material_Id
-     *
-     * @mbggenerated
-     */
     public void setMaterialId(Long materialId) {
         this.materialId = materialId;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.serial_Number
-     *
-     * @return the value of jsh_serial_number.serial_Number
-     *
-     * @mbggenerated
-     */
     public String getSerialNumber() {
         return serialNumber;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.serial_Number
-     *
-     * @param serialNumber the value for jsh_serial_number.serial_Number
-     *
-     * @mbggenerated
-     */
     public void setSerialNumber(String serialNumber) {
         this.serialNumber = serialNumber == null ? null : serialNumber.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.is_Sell
-     *
-     * @return the value of jsh_serial_number.is_Sell
-     *
-     * @mbggenerated
-     */
     public String getIsSell() {
         return isSell;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.is_Sell
-     *
-     * @param isSell the value for jsh_serial_number.is_Sell
-     *
-     * @mbggenerated
-     */
     public void setIsSell(String isSell) {
         this.isSell = isSell == null ? null : isSell.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.remark
-     *
-     * @return the value of jsh_serial_number.remark
-     *
-     * @mbggenerated
-     */
     public String getRemark() {
         return remark;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.remark
-     *
-     * @param remark the value for jsh_serial_number.remark
-     *
-     * @mbggenerated
-     */
     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_serial_number.delete_Flag
-     *
-     * @return the value of jsh_serial_number.delete_Flag
-     *
-     * @mbggenerated
-     */
     public String getDeleteFlag() {
         return deleteFlag;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.delete_Flag
-     *
-     * @param deleteFlag the value for jsh_serial_number.delete_Flag
-     *
-     * @mbggenerated
-     */
     public void setDeleteFlag(String deleteFlag) {
         this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.create_Time
-     *
-     * @return the value of jsh_serial_number.create_Time
-     *
-     * @mbggenerated
-     */
     public Date getCreateTime() {
         return createTime;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.create_Time
-     *
-     * @param createTime the value for jsh_serial_number.create_Time
-     *
-     * @mbggenerated
-     */
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.creator
-     *
-     * @return the value of jsh_serial_number.creator
-     *
-     * @mbggenerated
-     */
     public Long getCreator() {
         return creator;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.creator
-     *
-     * @param creator the value for jsh_serial_number.creator
-     *
-     * @mbggenerated
-     */
     public void setCreator(Long creator) {
         this.creator = creator;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.update_Time
-     *
-     * @return the value of jsh_serial_number.update_Time
-     *
-     * @mbggenerated
-     */
     public Date getUpdateTime() {
         return updateTime;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.update_Time
-     *
-     * @param updateTime the value for jsh_serial_number.update_Time
-     *
-     * @mbggenerated
-     */
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.updater
-     *
-     * @return the value of jsh_serial_number.updater
-     *
-     * @mbggenerated
-     */
     public Long getUpdater() {
         return updater;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.updater
-     *
-     * @param updater the value for jsh_serial_number.updater
-     *
-     * @mbggenerated
-     */
     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_serial_number.depothead_Id
-     *
-     * @return the value of jsh_serial_number.depothead_Id
-     *
-     * @mbggenerated
-     */
-    public Long getDepotheadId() {
-        return depotheadId;
+    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;
+    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;
     }

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

@@ -5,118 +5,46 @@ import java.util.Date;
 import java.util.List;
 
 public class SerialNumberExample {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     protected String orderByClause;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     protected boolean distinct;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     protected List<Criteria> oredCriteria;
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     public SerialNumberExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     public String getOrderByClause() {
         return orderByClause;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     public boolean isDistinct() {
         return distinct;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
         oredCriteria.add(criteria);
         return criteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
         if (oredCriteria.size() == 0) {
@@ -125,41 +53,23 @@ public class SerialNumberExample {
         return criteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
         return criteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     public void clear() {
         oredCriteria.clear();
         orderByClause = null;
         distinct = false;
     }
 
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -256,202 +166,202 @@ public class SerialNumberExample {
         }
 
         public Criteria andMaterialIdIsNull() {
-            addCriterion("material_Id is null");
+            addCriterion("material_id is null");
             return (Criteria) this;
         }
 
         public Criteria andMaterialIdIsNotNull() {
-            addCriterion("material_Id is not null");
+            addCriterion("material_id is not null");
             return (Criteria) this;
         }
 
         public Criteria andMaterialIdEqualTo(Long value) {
-            addCriterion("material_Id =", value, "materialId");
+            addCriterion("material_id =", value, "materialId");
             return (Criteria) this;
         }
 
         public Criteria andMaterialIdNotEqualTo(Long value) {
-            addCriterion("material_Id <>", value, "materialId");
+            addCriterion("material_id <>", value, "materialId");
             return (Criteria) this;
         }
 
         public Criteria andMaterialIdGreaterThan(Long value) {
-            addCriterion("material_Id >", value, "materialId");
+            addCriterion("material_id >", value, "materialId");
             return (Criteria) this;
         }
 
         public Criteria andMaterialIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("material_Id >=", value, "materialId");
+            addCriterion("material_id >=", value, "materialId");
             return (Criteria) this;
         }
 
         public Criteria andMaterialIdLessThan(Long value) {
-            addCriterion("material_Id <", value, "materialId");
+            addCriterion("material_id <", value, "materialId");
             return (Criteria) this;
         }
 
         public Criteria andMaterialIdLessThanOrEqualTo(Long value) {
-            addCriterion("material_Id <=", value, "materialId");
+            addCriterion("material_id <=", value, "materialId");
             return (Criteria) this;
         }
 
         public Criteria andMaterialIdIn(List<Long> values) {
-            addCriterion("material_Id in", values, "materialId");
+            addCriterion("material_id in", values, "materialId");
             return (Criteria) this;
         }
 
         public Criteria andMaterialIdNotIn(List<Long> values) {
-            addCriterion("material_Id not in", values, "materialId");
+            addCriterion("material_id not in", values, "materialId");
             return (Criteria) this;
         }
 
         public Criteria andMaterialIdBetween(Long value1, Long value2) {
-            addCriterion("material_Id between", value1, value2, "materialId");
+            addCriterion("material_id between", value1, value2, "materialId");
             return (Criteria) this;
         }
 
         public Criteria andMaterialIdNotBetween(Long value1, Long value2) {
-            addCriterion("material_Id not between", value1, value2, "materialId");
+            addCriterion("material_id not between", value1, value2, "materialId");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberIsNull() {
-            addCriterion("serial_Number is null");
+            addCriterion("serial_number is null");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberIsNotNull() {
-            addCriterion("serial_Number is not null");
+            addCriterion("serial_number is not null");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberEqualTo(String value) {
-            addCriterion("serial_Number =", value, "serialNumber");
+            addCriterion("serial_number =", value, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberNotEqualTo(String value) {
-            addCriterion("serial_Number <>", value, "serialNumber");
+            addCriterion("serial_number <>", value, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberGreaterThan(String value) {
-            addCriterion("serial_Number >", value, "serialNumber");
+            addCriterion("serial_number >", value, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberGreaterThanOrEqualTo(String value) {
-            addCriterion("serial_Number >=", value, "serialNumber");
+            addCriterion("serial_number >=", value, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberLessThan(String value) {
-            addCriterion("serial_Number <", value, "serialNumber");
+            addCriterion("serial_number <", value, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberLessThanOrEqualTo(String value) {
-            addCriterion("serial_Number <=", value, "serialNumber");
+            addCriterion("serial_number <=", value, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberLike(String value) {
-            addCriterion("serial_Number like", value, "serialNumber");
+            addCriterion("serial_number like", value, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberNotLike(String value) {
-            addCriterion("serial_Number not like", value, "serialNumber");
+            addCriterion("serial_number not like", value, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberIn(List<String> values) {
-            addCriterion("serial_Number in", values, "serialNumber");
+            addCriterion("serial_number in", values, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberNotIn(List<String> values) {
-            addCriterion("serial_Number not in", values, "serialNumber");
+            addCriterion("serial_number not in", values, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberBetween(String value1, String value2) {
-            addCriterion("serial_Number between", value1, value2, "serialNumber");
+            addCriterion("serial_number between", value1, value2, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andSerialNumberNotBetween(String value1, String value2) {
-            addCriterion("serial_Number not between", value1, value2, "serialNumber");
+            addCriterion("serial_number not between", value1, value2, "serialNumber");
             return (Criteria) this;
         }
 
         public Criteria andIsSellIsNull() {
-            addCriterion("is_Sell is null");
+            addCriterion("is_sell is null");
             return (Criteria) this;
         }
 
         public Criteria andIsSellIsNotNull() {
-            addCriterion("is_Sell is not null");
+            addCriterion("is_sell is not null");
             return (Criteria) this;
         }
 
         public Criteria andIsSellEqualTo(String value) {
-            addCriterion("is_Sell =", value, "isSell");
+            addCriterion("is_sell =", value, "isSell");
             return (Criteria) this;
         }
 
         public Criteria andIsSellNotEqualTo(String value) {
-            addCriterion("is_Sell <>", value, "isSell");
+            addCriterion("is_sell <>", value, "isSell");
             return (Criteria) this;
         }
 
         public Criteria andIsSellGreaterThan(String value) {
-            addCriterion("is_Sell >", value, "isSell");
+            addCriterion("is_sell >", value, "isSell");
             return (Criteria) this;
         }
 
         public Criteria andIsSellGreaterThanOrEqualTo(String value) {
-            addCriterion("is_Sell >=", value, "isSell");
+            addCriterion("is_sell >=", value, "isSell");
             return (Criteria) this;
         }
 
         public Criteria andIsSellLessThan(String value) {
-            addCriterion("is_Sell <", value, "isSell");
+            addCriterion("is_sell <", value, "isSell");
             return (Criteria) this;
         }
 
         public Criteria andIsSellLessThanOrEqualTo(String value) {
-            addCriterion("is_Sell <=", value, "isSell");
+            addCriterion("is_sell <=", value, "isSell");
             return (Criteria) this;
         }
 
         public Criteria andIsSellLike(String value) {
-            addCriterion("is_Sell like", value, "isSell");
+            addCriterion("is_sell like", value, "isSell");
             return (Criteria) this;
         }
 
         public Criteria andIsSellNotLike(String value) {
-            addCriterion("is_Sell not like", value, "isSell");
+            addCriterion("is_sell not like", value, "isSell");
             return (Criteria) this;
         }
 
         public Criteria andIsSellIn(List<String> values) {
-            addCriterion("is_Sell in", values, "isSell");
+            addCriterion("is_sell in", values, "isSell");
             return (Criteria) this;
         }
 
         public Criteria andIsSellNotIn(List<String> values) {
-            addCriterion("is_Sell not in", values, "isSell");
+            addCriterion("is_sell not in", values, "isSell");
             return (Criteria) this;
         }
 
         public Criteria andIsSellBetween(String value1, String value2) {
-            addCriterion("is_Sell between", value1, value2, "isSell");
+            addCriterion("is_sell between", value1, value2, "isSell");
             return (Criteria) this;
         }
 
         public Criteria andIsSellNotBetween(String value1, String value2) {
-            addCriterion("is_Sell not between", value1, value2, "isSell");
+            addCriterion("is_sell not between", value1, value2, "isSell");
             return (Criteria) this;
         }
 
@@ -526,132 +436,132 @@ public class SerialNumberExample {
         }
 
         public Criteria andDeleteFlagIsNull() {
-            addCriterion("delete_Flag is null");
+            addCriterion("delete_flag is null");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagIsNotNull() {
-            addCriterion("delete_Flag is not null");
+            addCriterion("delete_flag is not null");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagEqualTo(String value) {
-            addCriterion("delete_Flag =", value, "deleteFlag");
+            addCriterion("delete_flag =", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotEqualTo(String value) {
-            addCriterion("delete_Flag <>", value, "deleteFlag");
+            addCriterion("delete_flag <>", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagGreaterThan(String value) {
-            addCriterion("delete_Flag >", value, "deleteFlag");
+            addCriterion("delete_flag >", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
-            addCriterion("delete_Flag >=", value, "deleteFlag");
+            addCriterion("delete_flag >=", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLessThan(String value) {
-            addCriterion("delete_Flag <", value, "deleteFlag");
+            addCriterion("delete_flag <", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
-            addCriterion("delete_Flag <=", value, "deleteFlag");
+            addCriterion("delete_flag <=", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLike(String value) {
-            addCriterion("delete_Flag like", value, "deleteFlag");
+            addCriterion("delete_flag like", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotLike(String value) {
-            addCriterion("delete_Flag 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");
+            addCriterion("delete_flag in", values, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotIn(List<String> values) {
-            addCriterion("delete_Flag not in", values, "deleteFlag");
+            addCriterion("delete_flag not in", values, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagBetween(String value1, String value2) {
-            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            addCriterion("delete_flag between", value1, value2, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotBetween(String value1, String value2) {
-            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            addCriterion("delete_flag not between", value1, value2, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeIsNull() {
-            addCriterion("create_Time is null");
+            addCriterion("create_time is null");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeIsNotNull() {
-            addCriterion("create_Time is not null");
+            addCriterion("create_time is not null");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeEqualTo(Date value) {
-            addCriterion("create_Time =", value, "createTime");
+            addCriterion("create_time =", value, "createTime");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeNotEqualTo(Date value) {
-            addCriterion("create_Time <>", value, "createTime");
+            addCriterion("create_time <>", value, "createTime");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeGreaterThan(Date value) {
-            addCriterion("create_Time >", value, "createTime");
+            addCriterion("create_time >", value, "createTime");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("create_Time >=", value, "createTime");
+            addCriterion("create_time >=", value, "createTime");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeLessThan(Date value) {
-            addCriterion("create_Time <", value, "createTime");
+            addCriterion("create_time <", value, "createTime");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("create_Time <=", value, "createTime");
+            addCriterion("create_time <=", value, "createTime");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeIn(List<Date> values) {
-            addCriterion("create_Time in", values, "createTime");
+            addCriterion("create_time in", values, "createTime");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeNotIn(List<Date> values) {
-            addCriterion("create_Time not in", values, "createTime");
+            addCriterion("create_time not in", values, "createTime");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeBetween(Date value1, Date value2) {
-            addCriterion("create_Time between", value1, value2, "createTime");
+            addCriterion("create_time between", value1, value2, "createTime");
             return (Criteria) this;
         }
 
         public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("create_Time not between", value1, value2, "createTime");
+            addCriterion("create_time not between", value1, value2, "createTime");
             return (Criteria) this;
         }
 
@@ -716,62 +626,62 @@ public class SerialNumberExample {
         }
 
         public Criteria andUpdateTimeIsNull() {
-            addCriterion("update_Time is null");
+            addCriterion("update_time is null");
             return (Criteria) this;
         }
 
         public Criteria andUpdateTimeIsNotNull() {
-            addCriterion("update_Time is not null");
+            addCriterion("update_time is not null");
             return (Criteria) this;
         }
 
         public Criteria andUpdateTimeEqualTo(Date value) {
-            addCriterion("update_Time =", value, "updateTime");
+            addCriterion("update_time =", value, "updateTime");
             return (Criteria) this;
         }
 
         public Criteria andUpdateTimeNotEqualTo(Date value) {
-            addCriterion("update_Time <>", value, "updateTime");
+            addCriterion("update_time <>", value, "updateTime");
             return (Criteria) this;
         }
 
         public Criteria andUpdateTimeGreaterThan(Date value) {
-            addCriterion("update_Time >", value, "updateTime");
+            addCriterion("update_time >", value, "updateTime");
             return (Criteria) this;
         }
 
         public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("update_Time >=", value, "updateTime");
+            addCriterion("update_time >=", value, "updateTime");
             return (Criteria) this;
         }
 
         public Criteria andUpdateTimeLessThan(Date value) {
-            addCriterion("update_Time <", value, "updateTime");
+            addCriterion("update_time <", value, "updateTime");
             return (Criteria) this;
         }
 
         public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
-            addCriterion("update_Time <=", value, "updateTime");
+            addCriterion("update_time <=", value, "updateTime");
             return (Criteria) this;
         }
 
         public Criteria andUpdateTimeIn(List<Date> values) {
-            addCriterion("update_Time in", values, "updateTime");
+            addCriterion("update_time in", values, "updateTime");
             return (Criteria) this;
         }
 
         public Criteria andUpdateTimeNotIn(List<Date> values) {
-            addCriterion("update_Time not in", values, "updateTime");
+            addCriterion("update_time not in", values, "updateTime");
             return (Criteria) this;
         }
 
         public Criteria andUpdateTimeBetween(Date value1, Date value2) {
-            addCriterion("update_Time between", value1, value2, "updateTime");
+            addCriterion("update_time between", value1, value2, "updateTime");
             return (Criteria) this;
         }
 
         public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
-            addCriterion("update_Time not between", value1, value2, "updateTime");
+            addCriterion("update_time not between", value1, value2, "updateTime");
             return (Criteria) this;
         }
 
@@ -835,63 +745,63 @@ public class SerialNumberExample {
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdIsNull() {
-            addCriterion("depothead_Id is null");
+        public Criteria andDepotHeadIdIsNull() {
+            addCriterion("depot_head_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdIsNotNull() {
-            addCriterion("depothead_Id is not null");
+        public Criteria andDepotHeadIdIsNotNull() {
+            addCriterion("depot_head_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdEqualTo(Long value) {
-            addCriterion("depothead_Id =", value, "depotheadId");
+        public Criteria andDepotHeadIdEqualTo(Long value) {
+            addCriterion("depot_head_id =", value, "depotHeadId");
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdNotEqualTo(Long value) {
-            addCriterion("depothead_Id <>", value, "depotheadId");
+        public Criteria andDepotHeadIdNotEqualTo(Long value) {
+            addCriterion("depot_head_id <>", value, "depotHeadId");
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdGreaterThan(Long value) {
-            addCriterion("depothead_Id >", value, "depotheadId");
+        public Criteria andDepotHeadIdGreaterThan(Long value) {
+            addCriterion("depot_head_id >", value, "depotHeadId");
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("depothead_Id >=", value, "depotheadId");
+        public Criteria andDepotHeadIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("depot_head_id >=", value, "depotHeadId");
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdLessThan(Long value) {
-            addCriterion("depothead_Id <", value, "depotheadId");
+        public Criteria andDepotHeadIdLessThan(Long value) {
+            addCriterion("depot_head_id <", value, "depotHeadId");
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdLessThanOrEqualTo(Long value) {
-            addCriterion("depothead_Id <=", value, "depotheadId");
+        public Criteria andDepotHeadIdLessThanOrEqualTo(Long value) {
+            addCriterion("depot_head_id <=", value, "depotHeadId");
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdIn(List<Long> values) {
-            addCriterion("depothead_Id in", values, "depotheadId");
+        public Criteria andDepotHeadIdIn(List<Long> values) {
+            addCriterion("depot_head_id in", values, "depotHeadId");
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdNotIn(List<Long> values) {
-            addCriterion("depothead_Id not in", values, "depotheadId");
+        public Criteria andDepotHeadIdNotIn(List<Long> values) {
+            addCriterion("depot_head_id not in", values, "depotHeadId");
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdBetween(Long value1, Long value2) {
-            addCriterion("depothead_Id between", value1, value2, "depotheadId");
+        public Criteria andDepotHeadIdBetween(Long value1, Long value2) {
+            addCriterion("depot_head_id between", value1, value2, "depotHeadId");
             return (Criteria) this;
         }
 
-        public Criteria andDepotheadIdNotBetween(Long value1, Long value2) {
-            addCriterion("depothead_Id not between", value1, value2, "depotheadId");
+        public Criteria andDepotHeadIdNotBetween(Long value1, Long value2) {
+            addCriterion("depot_head_id not between", value1, value2, "depotHeadId");
             return (Criteria) this;
         }
 
@@ -956,25 +866,12 @@ public class SerialNumberExample {
         }
     }
 
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated do_not_delete_during_merge
-     */
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }
     }
 
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table jsh_serial_number
-     *
-     * @mbggenerated
-     */
     public static class Criterion {
         private String condition;
 

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

@@ -855,72 +855,72 @@ public class SystemConfigExample {
         }
 
         public Criteria andDeleteFlagIsNull() {
-            addCriterion("delete_Flag is null");
+            addCriterion("delete_flag is null");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagIsNotNull() {
-            addCriterion("delete_Flag is not null");
+            addCriterion("delete_flag is not null");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagEqualTo(String value) {
-            addCriterion("delete_Flag =", value, "deleteFlag");
+            addCriterion("delete_flag =", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotEqualTo(String value) {
-            addCriterion("delete_Flag <>", value, "deleteFlag");
+            addCriterion("delete_flag <>", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagGreaterThan(String value) {
-            addCriterion("delete_Flag >", value, "deleteFlag");
+            addCriterion("delete_flag >", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
-            addCriterion("delete_Flag >=", value, "deleteFlag");
+            addCriterion("delete_flag >=", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLessThan(String value) {
-            addCriterion("delete_Flag <", value, "deleteFlag");
+            addCriterion("delete_flag <", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
-            addCriterion("delete_Flag <=", value, "deleteFlag");
+            addCriterion("delete_flag <=", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLike(String value) {
-            addCriterion("delete_Flag like", value, "deleteFlag");
+            addCriterion("delete_flag like", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotLike(String value) {
-            addCriterion("delete_Flag 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");
+            addCriterion("delete_flag in", values, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotIn(List<String> values) {
-            addCriterion("delete_Flag not in", values, "deleteFlag");
+            addCriterion("delete_flag not in", values, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagBetween(String value1, String value2) {
-            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            addCriterion("delete_flag between", value1, value2, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotBetween(String value1, String value2) {
-            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            addCriterion("delete_flag not between", value1, value2, "deleteFlag");
             return (Criteria) this;
         }
     }

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

@@ -3,7 +3,7 @@ package com.jsh.erp.datasource.entities;
 public class Unit {
     private Long id;
 
-    private String uname;
+    private String name;
 
     private String basicUnit;
 
@@ -23,12 +23,12 @@ public class Unit {
         this.id = id;
     }
 
-    public String getUname() {
-        return uname;
+    public String getName() {
+        return name;
     }
 
-    public void setUname(String uname) {
-        this.uname = uname == null ? null : uname.trim();
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
     }
 
     public String getBasicUnit() {

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

@@ -164,73 +164,73 @@ public class UnitExample {
             return (Criteria) this;
         }
 
-        public Criteria andUnameIsNull() {
-            addCriterion("UName is null");
+        public Criteria andNameIsNull() {
+            addCriterion("name is null");
             return (Criteria) this;
         }
 
-        public Criteria andUnameIsNotNull() {
-            addCriterion("UName is not null");
+        public Criteria andNameIsNotNull() {
+            addCriterion("name is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUnameEqualTo(String value) {
-            addCriterion("UName =", value, "uname");
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("name =", value, "name");
             return (Criteria) this;
         }
 
-        public Criteria andUnameNotEqualTo(String value) {
-            addCriterion("UName <>", value, "uname");
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("name <>", value, "name");
             return (Criteria) this;
         }
 
-        public Criteria andUnameGreaterThan(String value) {
-            addCriterion("UName >", value, "uname");
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("name >", value, "name");
             return (Criteria) this;
         }
 
-        public Criteria andUnameGreaterThanOrEqualTo(String value) {
-            addCriterion("UName >=", value, "uname");
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("name >=", value, "name");
             return (Criteria) this;
         }
 
-        public Criteria andUnameLessThan(String value) {
-            addCriterion("UName <", value, "uname");
+        public Criteria andNameLessThan(String value) {
+            addCriterion("name <", value, "name");
             return (Criteria) this;
         }
 
-        public Criteria andUnameLessThanOrEqualTo(String value) {
-            addCriterion("UName <=", value, "uname");
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("name <=", value, "name");
             return (Criteria) this;
         }
 
-        public Criteria andUnameLike(String value) {
-            addCriterion("UName like", value, "uname");
+        public Criteria andNameLike(String value) {
+            addCriterion("name like", value, "name");
             return (Criteria) this;
         }
 
-        public Criteria andUnameNotLike(String value) {
-            addCriterion("UName not like", value, "uname");
+        public Criteria andNameNotLike(String value) {
+            addCriterion("name not like", value, "name");
             return (Criteria) this;
         }
 
-        public Criteria andUnameIn(List<String> values) {
-            addCriterion("UName in", values, "uname");
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("name in", values, "name");
             return (Criteria) this;
         }
 
-        public Criteria andUnameNotIn(List<String> values) {
-            addCriterion("UName not in", values, "uname");
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("name not in", values, "name");
             return (Criteria) this;
         }
 
-        public Criteria andUnameBetween(String value1, String value2) {
-            addCriterion("UName between", value1, value2, "uname");
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("name between", value1, value2, "name");
             return (Criteria) this;
         }
 
-        public Criteria andUnameNotBetween(String value1, String value2) {
-            addCriterion("UName not between", value1, value2, "uname");
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("name not between", value1, value2, "name");
             return (Criteria) this;
         }
 
@@ -495,72 +495,72 @@ public class UnitExample {
         }
 
         public Criteria andDeleteFlagIsNull() {
-            addCriterion("delete_Flag is null");
+            addCriterion("delete_flag is null");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagIsNotNull() {
-            addCriterion("delete_Flag is not null");
+            addCriterion("delete_flag is not null");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagEqualTo(String value) {
-            addCriterion("delete_Flag =", value, "deleteFlag");
+            addCriterion("delete_flag =", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotEqualTo(String value) {
-            addCriterion("delete_Flag <>", value, "deleteFlag");
+            addCriterion("delete_flag <>", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagGreaterThan(String value) {
-            addCriterion("delete_Flag >", value, "deleteFlag");
+            addCriterion("delete_flag >", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
-            addCriterion("delete_Flag >=", value, "deleteFlag");
+            addCriterion("delete_flag >=", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLessThan(String value) {
-            addCriterion("delete_Flag <", value, "deleteFlag");
+            addCriterion("delete_flag <", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
-            addCriterion("delete_Flag <=", value, "deleteFlag");
+            addCriterion("delete_flag <=", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLike(String value) {
-            addCriterion("delete_Flag like", value, "deleteFlag");
+            addCriterion("delete_flag like", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotLike(String value) {
-            addCriterion("delete_Flag 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");
+            addCriterion("delete_flag in", values, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotIn(List<String> values) {
-            addCriterion("delete_Flag not in", values, "deleteFlag");
+            addCriterion("delete_flag not in", values, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagBetween(String value1, String value2) {
-            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            addCriterion("delete_flag between", value1, value2, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotBetween(String value1, String value2) {
-            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            addCriterion("delete_flag not between", value1, value2, "deleteFlag");
             return (Criteria) this;
         }
     }

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

 package com.jsh.erp.datasource.entities;
 
 public class UserBusiness {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_userbusiness.Id
-     *
-     * @mbggenerated
-     */
     private Long id;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_userbusiness.Type
-     *
-     * @mbggenerated
-     */
     private String type;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_userbusiness.KeyId
-     *
-     * @mbggenerated
-     */
-    private String keyid;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_userbusiness.Value
-     *
-     * @mbggenerated
-     */
+    private String keyId;
+
     private String value;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_userbusiness.BtnStr
-     *
-     * @mbggenerated
-     */
-    private String btnstr;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_userbusiness.delete_Flag
-     *
-     * @mbggenerated
-     */
+    private String btnStr;
+
     private String deleteFlag;
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_userbusiness.Id
-     *
-     * @return the value of jsh_userbusiness.Id
-     *
-     * @mbggenerated
-     */
     public Long getId() {
         return id;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_userbusiness.Id
-     *
-     * @param id the value for jsh_userbusiness.Id
-     *
-     * @mbggenerated
-     */
     public void setId(Long id) {
         this.id = id;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_userbusiness.Type
-     *
-     * @return the value of jsh_userbusiness.Type
-     *
-     * @mbggenerated
-     */
     public String getType() {
         return type;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_userbusiness.Type
-     *
-     * @param type the value for jsh_userbusiness.Type
-     *
-     * @mbggenerated
-     */
     public void setType(String type) {
         this.type = type == null ? null : type.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_userbusiness.KeyId
-     *
-     * @return the value of jsh_userbusiness.KeyId
-     *
-     * @mbggenerated
-     */
-    public String getKeyid() {
-        return keyid;
+    public String getKeyId() {
+        return keyId;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_userbusiness.KeyId
-     *
-     * @param keyid the value for jsh_userbusiness.KeyId
-     *
-     * @mbggenerated
-     */
-    public void setKeyid(String keyid) {
-        this.keyid = keyid == null ? null : keyid.trim();
+    public void setKeyId(String keyId) {
+        this.keyId = keyId == null ? null : keyId.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_userbusiness.Value
-     *
-     * @return the value of jsh_userbusiness.Value
-     *
-     * @mbggenerated
-     */
     public String getValue() {
         return value;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_userbusiness.Value
-     *
-     * @param value the value for jsh_userbusiness.Value
-     *
-     * @mbggenerated
-     */
     public void setValue(String value) {
         this.value = value == null ? null : value.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_userbusiness.BtnStr
-     *
-     * @return the value of jsh_userbusiness.BtnStr
-     *
-     * @mbggenerated
-     */
-    public String getBtnstr() {
-        return btnstr;
+    public String getBtnStr() {
+        return btnStr;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_userbusiness.BtnStr
-     *
-     * @param btnstr the value for jsh_userbusiness.BtnStr
-     *
-     * @mbggenerated
-     */
-    public void setBtnstr(String btnstr) {
-        this.btnstr = btnstr == null ? null : btnstr.trim();
+    public void setBtnStr(String btnStr) {
+        this.btnStr = btnStr == null ? null : btnStr.trim();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_userbusiness.delete_Flag
-     *
-     * @return the value of jsh_userbusiness.delete_Flag
-     *
-     * @mbggenerated
-     */
     public String getDeleteFlag() {
         return deleteFlag;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_userbusiness.delete_Flag
-     *
-     * @param deleteFlag the value for jsh_userbusiness.delete_Flag
-     *
-     * @mbggenerated
-     */
     public void setDeleteFlag(String deleteFlag) {
         this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
     }

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

@@ -4,118 +4,46 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class UserBusinessExample {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     protected String orderByClause;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     protected boolean distinct;
 
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     protected List<Criteria> oredCriteria;
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     public UserBusinessExample() {
-        oredCriteria = new ArrayList<Criteria>();
+        oredCriteria = new ArrayList<>();
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     public void setOrderByClause(String orderByClause) {
         this.orderByClause = orderByClause;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     public String getOrderByClause() {
         return orderByClause;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     public void setDistinct(boolean distinct) {
         this.distinct = distinct;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     public boolean isDistinct() {
         return distinct;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     public List<Criteria> getOredCriteria() {
         return oredCriteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     public void or(Criteria criteria) {
         oredCriteria.add(criteria);
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     public Criteria or() {
         Criteria criteria = createCriteriaInternal();
         oredCriteria.add(criteria);
         return criteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     public Criteria createCriteria() {
         Criteria criteria = createCriteriaInternal();
         if (oredCriteria.size() == 0) {
@@ -124,41 +52,23 @@ public class UserBusinessExample {
         return criteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     protected Criteria createCriteriaInternal() {
         Criteria criteria = new Criteria();
         return criteria;
     }
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     public void clear() {
         oredCriteria.clear();
         orderByClause = null;
         distinct = false;
     }
 
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     protected abstract static class GeneratedCriteria {
         protected List<Criterion> criteria;
 
         protected GeneratedCriteria() {
             super();
-            criteria = new ArrayList<Criterion>();
+            criteria = new ArrayList<>();
         }
 
         public boolean isValid() {
@@ -195,435 +105,422 @@ public class UserBusinessExample {
         }
 
         public Criteria andIdIsNull() {
-            addCriterion("Id is null");
+            addCriterion("id is null");
             return (Criteria) this;
         }
 
         public Criteria andIdIsNotNull() {
-            addCriterion("Id is not null");
+            addCriterion("id is not null");
             return (Criteria) this;
         }
 
         public Criteria andIdEqualTo(Long value) {
-            addCriterion("Id =", value, "id");
+            addCriterion("id =", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdNotEqualTo(Long value) {
-            addCriterion("Id <>", value, "id");
+            addCriterion("id <>", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdGreaterThan(Long value) {
-            addCriterion("Id >", value, "id");
+            addCriterion("id >", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("Id >=", value, "id");
+            addCriterion("id >=", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdLessThan(Long value) {
-            addCriterion("Id <", value, "id");
+            addCriterion("id <", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdLessThanOrEqualTo(Long value) {
-            addCriterion("Id <=", value, "id");
+            addCriterion("id <=", value, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdIn(List<Long> values) {
-            addCriterion("Id in", values, "id");
+            addCriterion("id in", values, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdNotIn(List<Long> values) {
-            addCriterion("Id not in", values, "id");
+            addCriterion("id not in", values, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdBetween(Long value1, Long value2) {
-            addCriterion("Id between", value1, value2, "id");
+            addCriterion("id between", value1, value2, "id");
             return (Criteria) this;
         }
 
         public Criteria andIdNotBetween(Long value1, Long value2) {
-            addCriterion("Id not between", value1, value2, "id");
+            addCriterion("id not between", value1, value2, "id");
             return (Criteria) this;
         }
 
         public Criteria andTypeIsNull() {
-            addCriterion("Type is null");
+            addCriterion("type is null");
             return (Criteria) this;
         }
 
         public Criteria andTypeIsNotNull() {
-            addCriterion("Type is not null");
+            addCriterion("type is not null");
             return (Criteria) this;
         }
 
         public Criteria andTypeEqualTo(String value) {
-            addCriterion("Type =", value, "type");
+            addCriterion("type =", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeNotEqualTo(String value) {
-            addCriterion("Type <>", value, "type");
+            addCriterion("type <>", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeGreaterThan(String value) {
-            addCriterion("Type >", value, "type");
+            addCriterion("type >", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeGreaterThanOrEqualTo(String value) {
-            addCriterion("Type >=", value, "type");
+            addCriterion("type >=", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeLessThan(String value) {
-            addCriterion("Type <", value, "type");
+            addCriterion("type <", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeLessThanOrEqualTo(String value) {
-            addCriterion("Type <=", value, "type");
+            addCriterion("type <=", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeLike(String value) {
-            addCriterion("Type like", value, "type");
+            addCriterion("type like", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeNotLike(String value) {
-            addCriterion("Type not like", value, "type");
+            addCriterion("type not like", value, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeIn(List<String> values) {
-            addCriterion("Type in", values, "type");
+            addCriterion("type in", values, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeNotIn(List<String> values) {
-            addCriterion("Type not in", values, "type");
+            addCriterion("type not in", values, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeBetween(String value1, String value2) {
-            addCriterion("Type between", value1, value2, "type");
+            addCriterion("type between", value1, value2, "type");
             return (Criteria) this;
         }
 
         public Criteria andTypeNotBetween(String value1, String value2) {
-            addCriterion("Type not between", value1, value2, "type");
+            addCriterion("type not between", value1, value2, "type");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidIsNull() {
-            addCriterion("KeyId is null");
+        public Criteria andKeyIdIsNull() {
+            addCriterion("key_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidIsNotNull() {
-            addCriterion("KeyId is not null");
+        public Criteria andKeyIdIsNotNull() {
+            addCriterion("key_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidEqualTo(String value) {
-            addCriterion("KeyId =", value, "keyid");
+        public Criteria andKeyIdEqualTo(String value) {
+            addCriterion("key_id =", value, "keyId");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidNotEqualTo(String value) {
-            addCriterion("KeyId <>", value, "keyid");
+        public Criteria andKeyIdNotEqualTo(String value) {
+            addCriterion("key_id <>", value, "keyId");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidGreaterThan(String value) {
-            addCriterion("KeyId >", value, "keyid");
+        public Criteria andKeyIdGreaterThan(String value) {
+            addCriterion("key_id >", value, "keyId");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidGreaterThanOrEqualTo(String value) {
-            addCriterion("KeyId >=", value, "keyid");
+        public Criteria andKeyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("key_id >=", value, "keyId");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidLessThan(String value) {
-            addCriterion("KeyId <", value, "keyid");
+        public Criteria andKeyIdLessThan(String value) {
+            addCriterion("key_id <", value, "keyId");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidLessThanOrEqualTo(String value) {
-            addCriterion("KeyId <=", value, "keyid");
+        public Criteria andKeyIdLessThanOrEqualTo(String value) {
+            addCriterion("key_id <=", value, "keyId");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidLike(String value) {
-            addCriterion("KeyId like", value, "keyid");
+        public Criteria andKeyIdLike(String value) {
+            addCriterion("key_id like", value, "keyId");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidNotLike(String value) {
-            addCriterion("KeyId not like", value, "keyid");
+        public Criteria andKeyIdNotLike(String value) {
+            addCriterion("key_id not like", value, "keyId");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidIn(List<String> values) {
-            addCriterion("KeyId in", values, "keyid");
+        public Criteria andKeyIdIn(List<String> values) {
+            addCriterion("key_id in", values, "keyId");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidNotIn(List<String> values) {
-            addCriterion("KeyId not in", values, "keyid");
+        public Criteria andKeyIdNotIn(List<String> values) {
+            addCriterion("key_id not in", values, "keyId");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidBetween(String value1, String value2) {
-            addCriterion("KeyId between", value1, value2, "keyid");
+        public Criteria andKeyIdBetween(String value1, String value2) {
+            addCriterion("key_id between", value1, value2, "keyId");
             return (Criteria) this;
         }
 
-        public Criteria andKeyidNotBetween(String value1, String value2) {
-            addCriterion("KeyId not between", value1, value2, "keyid");
+        public Criteria andKeyIdNotBetween(String value1, String value2) {
+            addCriterion("key_id not between", value1, value2, "keyId");
             return (Criteria) this;
         }
 
         public Criteria andValueIsNull() {
-            addCriterion("Value is null");
+            addCriterion("value is null");
             return (Criteria) this;
         }
 
         public Criteria andValueIsNotNull() {
-            addCriterion("Value is not null");
+            addCriterion("value is not null");
             return (Criteria) this;
         }
 
         public Criteria andValueEqualTo(String value) {
-            addCriterion("Value =", value, "value");
+            addCriterion("value =", value, "value");
             return (Criteria) this;
         }
 
         public Criteria andValueNotEqualTo(String value) {
-            addCriterion("Value <>", value, "value");
+            addCriterion("value <>", value, "value");
             return (Criteria) this;
         }
 
         public Criteria andValueGreaterThan(String value) {
-            addCriterion("Value >", value, "value");
+            addCriterion("value >", value, "value");
             return (Criteria) this;
         }
 
         public Criteria andValueGreaterThanOrEqualTo(String value) {
-            addCriterion("Value >=", value, "value");
+            addCriterion("value >=", value, "value");
             return (Criteria) this;
         }
 
         public Criteria andValueLessThan(String value) {
-            addCriterion("Value <", value, "value");
+            addCriterion("value <", value, "value");
             return (Criteria) this;
         }
 
         public Criteria andValueLessThanOrEqualTo(String value) {
-            addCriterion("Value <=", value, "value");
+            addCriterion("value <=", value, "value");
             return (Criteria) this;
         }
 
         public Criteria andValueLike(String value) {
-            addCriterion("Value like", value, "value");
+            addCriterion("value like", value, "value");
             return (Criteria) this;
         }
 
         public Criteria andValueNotLike(String value) {
-            addCriterion("Value not like", value, "value");
+            addCriterion("value not like", value, "value");
             return (Criteria) this;
         }
 
         public Criteria andValueIn(List<String> values) {
-            addCriterion("Value in", values, "value");
+            addCriterion("value in", values, "value");
             return (Criteria) this;
         }
 
         public Criteria andValueNotIn(List<String> values) {
-            addCriterion("Value not in", values, "value");
+            addCriterion("value not in", values, "value");
             return (Criteria) this;
         }
 
         public Criteria andValueBetween(String value1, String value2) {
-            addCriterion("Value between", value1, value2, "value");
+            addCriterion("value between", value1, value2, "value");
             return (Criteria) this;
         }
 
         public Criteria andValueNotBetween(String value1, String value2) {
-            addCriterion("Value not between", value1, value2, "value");
+            addCriterion("value not between", value1, value2, "value");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrIsNull() {
-            addCriterion("BtnStr is null");
+        public Criteria andBtnStrIsNull() {
+            addCriterion("btn_str is null");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrIsNotNull() {
-            addCriterion("BtnStr is not null");
+        public Criteria andBtnStrIsNotNull() {
+            addCriterion("btn_str is not null");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrEqualTo(String value) {
-            addCriterion("BtnStr =", value, "btnstr");
+        public Criteria andBtnStrEqualTo(String value) {
+            addCriterion("btn_str =", value, "btnStr");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrNotEqualTo(String value) {
-            addCriterion("BtnStr <>", value, "btnstr");
+        public Criteria andBtnStrNotEqualTo(String value) {
+            addCriterion("btn_str <>", value, "btnStr");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrGreaterThan(String value) {
-            addCriterion("BtnStr >", value, "btnstr");
+        public Criteria andBtnStrGreaterThan(String value) {
+            addCriterion("btn_str >", value, "btnStr");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrGreaterThanOrEqualTo(String value) {
-            addCriterion("BtnStr >=", value, "btnstr");
+        public Criteria andBtnStrGreaterThanOrEqualTo(String value) {
+            addCriterion("btn_str >=", value, "btnStr");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrLessThan(String value) {
-            addCriterion("BtnStr <", value, "btnstr");
+        public Criteria andBtnStrLessThan(String value) {
+            addCriterion("btn_str <", value, "btnStr");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrLessThanOrEqualTo(String value) {
-            addCriterion("BtnStr <=", value, "btnstr");
+        public Criteria andBtnStrLessThanOrEqualTo(String value) {
+            addCriterion("btn_str <=", value, "btnStr");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrLike(String value) {
-            addCriterion("BtnStr like", value, "btnstr");
+        public Criteria andBtnStrLike(String value) {
+            addCriterion("btn_str like", value, "btnStr");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrNotLike(String value) {
-            addCriterion("BtnStr not like", value, "btnstr");
+        public Criteria andBtnStrNotLike(String value) {
+            addCriterion("btn_str not like", value, "btnStr");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrIn(List<String> values) {
-            addCriterion("BtnStr in", values, "btnstr");
+        public Criteria andBtnStrIn(List<String> values) {
+            addCriterion("btn_str in", values, "btnStr");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrNotIn(List<String> values) {
-            addCriterion("BtnStr not in", values, "btnstr");
+        public Criteria andBtnStrNotIn(List<String> values) {
+            addCriterion("btn_str not in", values, "btnStr");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrBetween(String value1, String value2) {
-            addCriterion("BtnStr between", value1, value2, "btnstr");
+        public Criteria andBtnStrBetween(String value1, String value2) {
+            addCriterion("btn_str between", value1, value2, "btnStr");
             return (Criteria) this;
         }
 
-        public Criteria andBtnstrNotBetween(String value1, String value2) {
-            addCriterion("BtnStr not between", value1, value2, "btnstr");
+        public Criteria andBtnStrNotBetween(String value1, String value2) {
+            addCriterion("btn_str not between", value1, value2, "btnStr");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagIsNull() {
-            addCriterion("delete_Flag is null");
+            addCriterion("delete_flag is null");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagIsNotNull() {
-            addCriterion("delete_Flag is not null");
+            addCriterion("delete_flag is not null");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagEqualTo(String value) {
-            addCriterion("delete_Flag =", value, "deleteFlag");
+            addCriterion("delete_flag =", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotEqualTo(String value) {
-            addCriterion("delete_Flag <>", value, "deleteFlag");
+            addCriterion("delete_flag <>", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagGreaterThan(String value) {
-            addCriterion("delete_Flag >", value, "deleteFlag");
+            addCriterion("delete_flag >", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagGreaterThanOrEqualTo(String value) {
-            addCriterion("delete_Flag >=", value, "deleteFlag");
+            addCriterion("delete_flag >=", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLessThan(String value) {
-            addCriterion("delete_Flag <", value, "deleteFlag");
+            addCriterion("delete_flag <", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLessThanOrEqualTo(String value) {
-            addCriterion("delete_Flag <=", value, "deleteFlag");
+            addCriterion("delete_flag <=", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagLike(String value) {
-            addCriterion("delete_Flag like", value, "deleteFlag");
+            addCriterion("delete_flag like", value, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotLike(String value) {
-            addCriterion("delete_Flag 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");
+            addCriterion("delete_flag in", values, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotIn(List<String> values) {
-            addCriterion("delete_Flag not in", values, "deleteFlag");
+            addCriterion("delete_flag not in", values, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagBetween(String value1, String value2) {
-            addCriterion("delete_Flag between", value1, value2, "deleteFlag");
+            addCriterion("delete_flag between", value1, value2, "deleteFlag");
             return (Criteria) this;
         }
 
         public Criteria andDeleteFlagNotBetween(String value1, String value2) {
-            addCriterion("delete_Flag not between", value1, value2, "deleteFlag");
+            addCriterion("delete_flag not between", value1, value2, "deleteFlag");
             return (Criteria) this;
         }
     }
 
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated do_not_delete_during_merge
-     */
     public static class Criteria extends GeneratedCriteria {
-
         protected Criteria() {
             super();
         }
     }
 
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table jsh_userbusiness
-     *
-     * @mbggenerated
-     */
     public static class Criterion {
         private String condition;
 

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

@@ -6,91 +6,25 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface AccountMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_account
-     *
-     * @mbggenerated
-     */
-    int countByExample(AccountExample example);
+    long countByExample(AccountExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_account
-     *
-     * @mbggenerated
-     */
     int deleteByExample(AccountExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_account
-     *
-     * @mbggenerated
-     */
     int deleteByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_account
-     *
-     * @mbggenerated
-     */
     int insert(Account record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_account
-     *
-     * @mbggenerated
-     */
     int insertSelective(Account record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_account
-     *
-     * @mbggenerated
-     */
     List<Account> selectByExample(AccountExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_account
-     *
-     * @mbggenerated
-     */
     Account selectByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_account
-     *
-     * @mbggenerated
-     */
     int updateByExampleSelective(@Param("record") Account record, @Param("example") AccountExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_account
-     *
-     * @mbggenerated
-     */
     int updateByExample(@Param("record") Account record, @Param("example") AccountExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_account
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKeySelective(Account record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_account
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKey(Account record);
 }
\ No newline at end of file

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

+package com.jsh.erp.datasource.mappers;
+
+import com.jsh.erp.datasource.entities.Function;
+import com.jsh.erp.datasource.entities.FunctionExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface FunctionMapper {
+    long countByExample(FunctionExample example);
+
+    int deleteByExample(FunctionExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(Function record);
+
+    int insertSelective(Function record);
+
+    List<Function> selectByExample(FunctionExample example);
+
+    Function selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") Function record, @Param("example") FunctionExample example);
+
+    int updateByExample(@Param("record") Function record, @Param("example") FunctionExample example);
+
+    int updateByPrimaryKeySelective(Function record);
+
+    int updateByPrimaryKey(Function record);
+}
\ No newline at end of file

src/main/java/com/jsh/erp/datasource/mappers/FunctionsMapperEx.java → src/main/java/com/jsh/erp/datasource/mappers/FunctionMapperEx.java

 package com.jsh.erp.datasource.mappers;
 
-import com.jsh.erp.datasource.entities.Functions;
-import com.jsh.erp.datasource.entities.FunctionsExample;
+import com.jsh.erp.datasource.entities.Function;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
 
-public interface FunctionsMapperEx {
+public interface FunctionMapperEx {
 
-    List<Functions> selectByConditionFunctions(
+    List<Function> selectByConditionFunction(
             @Param("name") String name,
             @Param("type") String type,
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
-    Long countsByFunctions(
+    Long countsByFunction(
             @Param("name") String name,
             @Param("type") String type);
 
-    int batchDeleteFunctionsByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
+    int batchDeleteFunctionByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]);
 }
\ No newline at end of file

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

-package com.jsh.erp.datasource.mappers;
-
-import com.jsh.erp.datasource.entities.Functions;
-import com.jsh.erp.datasource.entities.FunctionsExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface FunctionsMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_functions
-     *
-     * @mbggenerated
-     */
-    int countByExample(FunctionsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_functions
-     *
-     * @mbggenerated
-     */
-    int deleteByExample(FunctionsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_functions
-     *
-     * @mbggenerated
-     */
-    int deleteByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_functions
-     *
-     * @mbggenerated
-     */
-    int insert(Functions record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_functions
-     *
-     * @mbggenerated
-     */
-    int insertSelective(Functions record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_functions
-     *
-     * @mbggenerated
-     */
-    List<Functions> selectByExample(FunctionsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_functions
-     *
-     * @mbggenerated
-     */
-    Functions selectByPrimaryKey(Long id);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_functions
-     *
-     * @mbggenerated
-     */
-    int updateByExampleSelective(@Param("record") Functions record, @Param("example") FunctionsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_functions
-     *
-     * @mbggenerated
-     */
-    int updateByExample(@Param("record") Functions record, @Param("example") FunctionsExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_functions
-     *
-     * @mbggenerated
-     */
-    int updateByPrimaryKeySelective(Functions record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_functions
-     *
-     * @mbggenerated
-     */
-    int updateByPrimaryKey(Functions record);
-}
\ No newline at end of file

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

@@ -6,91 +6,25 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface InOutItemMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_inoutitem
-     *
-     * @mbggenerated
-     */
-    int countByExample(InOutItemExample example);
+    long countByExample(InOutItemExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_inoutitem
-     *
-     * @mbggenerated
-     */
     int deleteByExample(InOutItemExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_inoutitem
-     *
-     * @mbggenerated
-     */
     int deleteByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_inoutitem
-     *
-     * @mbggenerated
-     */
     int insert(InOutItem record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_inoutitem
-     *
-     * @mbggenerated
-     */
     int insertSelective(InOutItem record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_inoutitem
-     *
-     * @mbggenerated
-     */
     List<InOutItem> selectByExample(InOutItemExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_inoutitem
-     *
-     * @mbggenerated
-     */
     InOutItem selectByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_inoutitem
-     *
-     * @mbggenerated
-     */
     int updateByExampleSelective(@Param("record") InOutItem record, @Param("example") InOutItemExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_inoutitem
-     *
-     * @mbggenerated
-     */
     int updateByExample(@Param("record") InOutItem record, @Param("example") InOutItemExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_inoutitem
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKeySelective(InOutItem record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_inoutitem
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKey(InOutItem record);
 }
\ No newline at end of file

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

@@ -6,91 +6,25 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface LogMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_log
-     *
-     * @mbggenerated
-     */
-    int countByExample(LogExample example);
+    long countByExample(LogExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_log
-     *
-     * @mbggenerated
-     */
     int deleteByExample(LogExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_log
-     *
-     * @mbggenerated
-     */
     int deleteByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_log
-     *
-     * @mbggenerated
-     */
     int insert(Log record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_log
-     *
-     * @mbggenerated
-     */
     int insertSelective(Log record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_log
-     *
-     * @mbggenerated
-     */
     List<Log> selectByExample(LogExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_log
-     *
-     * @mbggenerated
-     */
     Log selectByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_log
-     *
-     * @mbggenerated
-     */
     int updateByExampleSelective(@Param("record") Log record, @Param("example") LogExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_log
-     *
-     * @mbggenerated
-     */
     int updateByExample(@Param("record") Log record, @Param("example") LogExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_log
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKeySelective(Log record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_log
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKey(Log record);
 }
\ No newline at end of file

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

@@ -11,21 +11,21 @@ public interface LogMapperEx {
 
     List<LogVo4List> selectByConditionLog(
             @Param("operation") String operation,
-            @Param("usernameID") Integer usernameID,
+            @Param("userId") Integer userId,
             @Param("clientIp") String clientIp,
             @Param("status") Integer status,
             @Param("beginTime") String beginTime,
             @Param("endTime") String endTime,
-            @Param("contentdetails") String contentdetails,
+            @Param("content") String content,
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
 
     Long countsByLog(
             @Param("operation") String operation,
-            @Param("usernameID") Integer usernameID,
+            @Param("userId") Integer userId,
             @Param("clientIp") String clientIp,
             @Param("status") Integer status,
             @Param("beginTime") String beginTime,
             @Param("endTime") String endTime,
-            @Param("contentdetails") String contentdetails);
+            @Param("content") String content);
 }
\ No newline at end of file

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

@@ -6,91 +6,25 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface MaterialCategoryMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
-     *
-     * @mbggenerated
-     */
-    int countByExample(MaterialCategoryExample example);
+    long countByExample(MaterialCategoryExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
-     *
-     * @mbggenerated
-     */
     int deleteByExample(MaterialCategoryExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
-     *
-     * @mbggenerated
-     */
     int deleteByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
-     *
-     * @mbggenerated
-     */
     int insert(MaterialCategory record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
-     *
-     * @mbggenerated
-     */
     int insertSelective(MaterialCategory record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
-     *
-     * @mbggenerated
-     */
     List<MaterialCategory> selectByExample(MaterialCategoryExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
-     *
-     * @mbggenerated
-     */
     MaterialCategory selectByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
-     *
-     * @mbggenerated
-     */
     int updateByExampleSelective(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
-     *
-     * @mbggenerated
-     */
     int updateByExample(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKeySelective(MaterialCategory record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKey(MaterialCategory record);
 }
\ No newline at end of file

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

@@ -6,91 +6,25 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface MaterialPropertyMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialproperty
-     *
-     * @mbggenerated
-     */
-    int countByExample(MaterialPropertyExample example);
+    long countByExample(MaterialPropertyExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialproperty
-     *
-     * @mbggenerated
-     */
     int deleteByExample(MaterialPropertyExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialproperty
-     *
-     * @mbggenerated
-     */
     int deleteByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialproperty
-     *
-     * @mbggenerated
-     */
     int insert(MaterialProperty record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialproperty
-     *
-     * @mbggenerated
-     */
     int insertSelective(MaterialProperty record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialproperty
-     *
-     * @mbggenerated
-     */
     List<MaterialProperty> selectByExample(MaterialPropertyExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialproperty
-     *
-     * @mbggenerated
-     */
     MaterialProperty selectByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialproperty
-     *
-     * @mbggenerated
-     */
     int updateByExampleSelective(@Param("record") MaterialProperty record, @Param("example") MaterialPropertyExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialproperty
-     *
-     * @mbggenerated
-     */
     int updateByExample(@Param("record") MaterialProperty record, @Param("example") MaterialPropertyExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialproperty
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKeySelective(MaterialProperty record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialproperty
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKey(MaterialProperty record);
 }
\ No newline at end of file

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

@@ -6,91 +6,25 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface PersonMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_person
-     *
-     * @mbggenerated
-     */
-    int countByExample(PersonExample example);
+    long countByExample(PersonExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_person
-     *
-     * @mbggenerated
-     */
     int deleteByExample(PersonExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_person
-     *
-     * @mbggenerated
-     */
     int deleteByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_person
-     *
-     * @mbggenerated
-     */
     int insert(Person record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_person
-     *
-     * @mbggenerated
-     */
     int insertSelective(Person record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_person
-     *
-     * @mbggenerated
-     */
     List<Person> selectByExample(PersonExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_person
-     *
-     * @mbggenerated
-     */
     Person selectByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_person
-     *
-     * @mbggenerated
-     */
     int updateByExampleSelective(@Param("record") Person record, @Param("example") PersonExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_person
-     *
-     * @mbggenerated
-     */
     int updateByExample(@Param("record") Person record, @Param("example") PersonExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_person
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKeySelective(Person record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_person
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKey(Person record);
 }
\ No newline at end of file

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

@@ -6,91 +6,25 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface RoleMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
-    int countByExample(RoleExample example);
+    long countByExample(RoleExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     int deleteByExample(RoleExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     int deleteByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     int insert(Role record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     int insertSelective(Role record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     List<Role> selectByExample(RoleExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     Role selectByPrimaryKey(Long id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     int updateByExampleSelective(@Param("record") Role record, @Param("example") RoleExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     int updateByExample(@Param("record") Role record, @Param("example") RoleExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKeySelective(Role record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_role
-     *
-     * @mbggenerated
-     */
     int updateByPrimaryKey(Role record);
 }
\ No newline at end of file