增加租户的功能

erp_web/pages/materials/material.html

@@ -85,7 +85,7 @@
                     <tr>
                         <td style="width:80px;">序列号</td>
                         <td style="padding:5px;width:180px;">
-                            <select name="enableSerialNumber" id="enableSerialNumber" style="width: 180px;height: 20px">
+                            <select name="EnableSerialNumber" id="EnableSerialNumber" style="width: 180px;height: 20px">
                                 <option value="1">启用</option>
                                 <option value="0">禁用</option>
                             </select>
@@ -509,7 +509,7 @@
                                 + 'AaBb' + rec.lowprice + 'AaBb' + rec.presetpriceone + 'AaBb' + rec.presetpricetwo + 'AaBb' + rec.remark + 'AaBb' + rec.standard
                                 + 'AaBb' + rec.color + 'AaBb' + rec.packing + 'AaBb' + rec.safetystock + 'AaBb' + rec.categoryid + 'AaBb' + rec.categoryName
                                 + 'AaBb' + rec.unitid + 'AaBb' + rec.unitName + 'AaBb' + rec.firstoutunit + 'AaBb' + rec.firstinunit
-                                + 'AaBb' + rec.mfrs + 'AaBb' + rec.otherfield1 + 'AaBb' + rec.otherfield2 + 'AaBb' + rec.otherfield3+ 'AaBb' + rec.enableSerialNumber;
+                                + 'AaBb' + rec.mfrs + 'AaBb' + rec.otherfield1 + 'AaBb' + rec.otherfield2 + 'AaBb' + rec.otherfield3+ 'AaBb' + rec.enableserialnumber;
                             str += '<img title="编辑" src="/js/easyui-1.3.5/themes/icons/pencil.png" style="cursor: pointer;" onclick="editMaterial(\'' + rowInfo + '\');"/>&nbsp;&nbsp;&nbsp;';
                             str += '<img title="删除" src="/js/easyui-1.3.5/themes/icons/edit_remove.png" style="cursor: pointer;" onclick="deleteMaterial(' + rec.id + ');"/>';
                             return str;
@@ -572,7 +572,7 @@
                         }
                     },
                     {
-                        title: '序列号', field: 'enableSerialNumber', width: 70, align: "center", formatter: function (value) {
+                        title: '序列号', field: 'enableserialnumber', width: 70, align: "center", formatter: function (value) {
                             return value=='1' ? "启用" : "禁用";
                         }
                     }
@@ -1048,8 +1048,8 @@
             $('#materialFM input').val(""); //将输入框全部清空
 
             bindMProperty(); //根据商品属性绑定
-            // $("#enableSerialNumber").combobox('setValue','0');
+            // $("#EnableSerialNumber").combobox('setValue','0');
-            $("#enableSerialNumber").val('0');
+            $("#EnableSerialNumber").val('0');
             $('#materialDlg').dialog('open').dialog('setTitle', '<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加商品信息');
             $(".window-mask").css({width: webW, height: webH});
             $("#Name").val("").focus();
@@ -1157,7 +1157,7 @@
             basicList.LowPrice = $("#basicLowPrice").val();
             basicList.PresetPriceOne = $("#basicPresetPriceOne").val();
             basicList.PresetPriceTwo = $("#basicPresetPriceTwo").val();
-            basicList.enableSerialNumber=$("#enableSerialNumber").val();
+            basicList.EnableSerialNumber=$("#EnableSerialNumber").val();
             otherList.Unit = $("#otherUnit").text();
             otherList.RetailPrice = $("#otherRetailPrice").val();
             otherList.LowPrice = $("#otherLowPrice").val();
@@ -1226,7 +1226,7 @@
             bindMProperty(); //根据商品属性绑定
             $("#Name").focus().val(materialInfo[1]);
             $("#Color").focus().val(materialInfo[11]);
-            $("#enableSerialNumber").val(materialInfo[24]=='1'?'1':'0');
+            $("#EnableSerialNumber").val(materialInfo[24]=='1'?'1':'0');
             //商品类别id
             $("#parentid").val(materialInfo[14]);
             //商品类别名称

pom.xml

@@ -103,6 +103,11 @@
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
 			<version>1.2.10</version>
 		</dependency>
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<version>3.0.7.1</version>
+		</dependency>
 	</dependencies>
 
 	<repositories>

sql/jsh_erp.sql

@@ -1472,3 +1472,33 @@ update jsh_user set status='0' where status is null;
 -- 设置根目录编号为1
 -- ----------------------------
 update jsh_materialcategory set serial_no='1' where id='1';
+
+-- ----------------------------
+-- 时间：2019年3月18日
+-- version：1.0.11
+-- 此次更新
+-- 1、批量增加大部分表的tenant_id租户字段
+-- 特别提醒：之后的sql都是在之前基础上迭代，可以对已存在的系统进行数据保留更新
+-- ----------------------------
+alter table jsh_account add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_accounthead add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_accountitem add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_asset add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_assetcategory add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_assetname add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_depot add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_depothead add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_depotitem add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_inoutitem add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_log add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_material add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_materialcategory add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_orga_user_rel add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_organization add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_person add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_role add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_serial_number add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_supplier add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_systemconfig add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_unit add tenant_id bigint(20) DEFAULT null COMMENT '租户id';
+alter table jsh_user add tenant_id bigint(20) DEFAULT null COMMENT '租户id';

src/main/java/com/jsh/erp/ErpApplication.java

@@ -2,6 +2,7 @@ package com.jsh.erp;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration;
@@ -10,6 +11,8 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.servlet.DispatcherServlet;
 
+import javax.servlet.http.Cookie;
+
 @SpringBootApplication
 @MapperScan(basePackages = {"com.jsh.erp.datasource.mappers"})
 @ServletComponentScan

src/main/java/com/jsh/erp/config/TenantConfig.java

@@ -0,0 +1,100 @@
+package com.jsh.erp.config;
+
+import com.baomidou.mybatisplus.core.parser.ISqlParser;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PerformanceInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler;
+import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.LongValue;
+import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
+@Configuration
+public class TenantConfig {
+
+    @Bean
+    public PaginationInterceptor paginationInterceptor(HttpServletRequest request) {
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        List<ISqlParser> sqlParserList = new ArrayList<>();
+        TenantSqlParser tenantSqlParser = new TenantSqlParser();
+        tenantSqlParser.setTenantHandler(new TenantHandler() {
+            @Override
+            public Expression getTenantId() {
+                //从session中获取租户id
+                Object tenantId = request.getSession().getAttribute("tenantId");
+                if(tenantId!=null){
+                    return new LongValue(Long.parseLong(tenantId.toString()));
+                } else {
+                    return null;
+                }
+            }
+
+            @Override
+            public String getTenantIdColumn() {
+                return "tenant_id";
+            }
+
+            @Override
+            public boolean doTableFilter(String tableName) {
+                //从session中获取租户id
+                Object mybatisPlusStatus = request.getSession().getAttribute("mybatisPlusStatus");
+                if(mybatisPlusStatus !=null && mybatisPlusStatus.toString().equals("open")) {
+                    // 这里可以判断是否过滤表
+                    if ("databasechangelog".equals(tableName) || "databasechangeloglock".equals(tableName)
+                            || "jsh_materialproperty".equals(tableName) || "tbl_sequence".equals(tableName) || "dual".equals(tableName)
+                            || "jsh_userbusiness".equals(tableName) || "jsh_app".equals(tableName) || "jsh_functions".equals(tableName)) {
+                        return true;
+                    } else {
+                        return false;
+                    }
+                } else {
+                    return true;
+                }
+            }
+        });
+
+        sqlParserList.add(tenantSqlParser);
+        paginationInterceptor.setSqlParserList(sqlParserList);
+//        paginationInterceptor.setSqlParserFilter(new ISqlParserFilter() {
+//            @Override
+//            public boolean doFilter(MetaObject metaObject) {
+//                MappedStatement ms = PluginUtils.realTarget(metaObject);
+//                // 过滤自定义查询此时无租户信息约束出现
+//                if ("com.jsh.erp.datasource.mappers.DepotHeadMapperEx.getBuildOnlyNumber".equals(ms.getId())) {
+//                    return true;
+//                }
+//                return false;
+//            }
+//        });
+        return paginationInterceptor;
+    }
+
+    /**
+     * 相当于顶部的：
+     * {@code @MapperScan("com.jsh.erp.datasource.mappers*")}
+     * 这里可以扩展，比如使用配置文件来配置扫描Mapper的路径
+     */
+    @Bean
+    public MapperScannerConfigurer mapperScannerConfigurer() {
+        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
+        scannerConfigurer.setBasePackage("com.jsh.erp.datasource.mappers*");
+        return scannerConfigurer;
+    }
+
+
+    /**
+     * 性能分析拦截器，不建议生产使用
+     */
+    @Bean
+    public PerformanceInterceptor performanceInterceptor(){
+        return new PerformanceInterceptor();
+    }
+
+
+}

src/main/java/com/jsh/erp/controller/DepotItemController.java

@@ -420,7 +420,7 @@ public class DepotItemController {
         BaseResponseInfo res = new BaseResponseInfo();
         Map<String, Object> map = new HashMap<String, Object>();
         try {
-            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
+            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
             String[] mpArr = mpList.split(",");
             int total = depotItemService.findByAllCount(headIds, materialIds);
             map.put("total", total);
@@ -533,7 +533,7 @@ public class DepotItemController {
         BaseResponseInfo res = new BaseResponseInfo();
         Map<String, Object> map = new HashMap<String, Object>();
         try {
-            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
+            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
             String[] mpArr = mpList.split(",");
             int total = depotItemService.findByAllCount(headIds, materialIds);
             map.put("total", total);
@@ -593,7 +593,7 @@ public class DepotItemController {
         BaseResponseInfo res = new BaseResponseInfo();
         Map<String, Object> map = new HashMap<String, Object>();
         try {
-            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
+            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
             String[] mpArr = mpList.split(",");
             int total = depotItemService.findByAllCount(headIds, materialIds);
             map.put("total", total);
@@ -659,7 +659,7 @@ public class DepotItemController {
         Map<String, Object> map = new HashMap<String, Object>();
         String message = "成功";
         try {
-            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, currentPage, pageSize);
+            List<DepotItemVo4WithInfoEx> dataList = depotItemService.findByAll(headIds, materialIds, (currentPage-1)*pageSize, pageSize);
             //存放数据json数组
             Integer pid = projectId;
             String[] names = {"名称", "型号", "单位", "单价", "上月结存数量", "入库数量", "出库数量", "本月结存数量", "结存金额"};

src/main/java/com/jsh/erp/controller/RoleController.java

@@ -71,4 +71,9 @@ public class RoleController {
         }
         return arr;
     }
+
+    @PostMapping(value = "/list")
+    public List<Role> list(HttpServletRequest request) {
+        return roleService.getRole();
+    }
 }

src/main/java/com/jsh/erp/controller/UserController.java

@@ -17,11 +17,13 @@ import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
@@ -36,6 +38,9 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
 public class UserController {
     private Logger logger = LoggerFactory.getLogger(ResourceController.class);
 
+    @Value("${mybatis-plus.status}")
+    private String mybatisPlusStatus;
+
     @Resource
     private UserService userService;
 
@@ -91,6 +96,8 @@ public class UserController {
     //                            new Timestamp(System.currentTimeMillis()), (short) 0, "管理用户：" + username + " 登录系统", username + " 登录系统"));
                         msgTip = "user can login";
                         request.getSession().setAttribute("user",user);
+                        request.getSession().setAttribute("tenantId",1L); //租户id
+                        request.getSession().setAttribute("mybatisPlusStatus",mybatisPlusStatus); //开启状态
                     } catch (Exception e) {
                         logger.error(">>>>>>>>>>>>>>>查询用户名为:" + username + " ，用户信息异常", e);
                     }

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

@@ -1,229 +1,261 @@
-package com.jsh.erp.datasource.entities;
+package com.jsh.erp.datasource.entities;
-
+
-import java.math.BigDecimal;
+import java.math.BigDecimal;
-
+
-public class Account {
+public class Account {
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.Id
+     * This field corresponds to the database column jsh_account.Id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long id;
+    private Long id;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.Name
+     * This field corresponds to the database column jsh_account.Name
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String name;
+    private String name;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.SerialNo
+     * This field corresponds to the database column jsh_account.SerialNo
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String serialno;
+    private String serialno;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.InitialAmount
+     * This field corresponds to the database column jsh_account.InitialAmount
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private BigDecimal initialamount;
+    private BigDecimal initialamount;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.CurrentAmount
+     * This field corresponds to the database column jsh_account.CurrentAmount
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private BigDecimal currentamount;
+    private BigDecimal currentamount;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.Remark
+     * This field corresponds to the database column jsh_account.Remark
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String remark;
+    private String remark;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_account.IsDefault
+     * This field corresponds to the database column jsh_account.IsDefault
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Boolean isdefault;
+    private Boolean isdefault;
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_account.Id
+     * This field corresponds to the database column jsh_account.tenant_id
-     *
+     *
-     * @return the value of jsh_account.Id
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    private Long tenantId;
-     */
+
-    public Long getId() {
+    /**
-        return id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_account.Id
-
+     *
-    /**
+     * @return the value of jsh_account.Id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_account.Id
+     * @mbggenerated
-     *
+     */
-     * @param id the value for jsh_account.Id
+    public Long getId() {
-     *
+        return id;
-     * @mbggenerated
+    }
-     */
+
-    public void setId(Long id) {
+    /**
-        this.id = id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_account.Id
-
+     *
-    /**
+     * @param id the value for jsh_account.Id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_account.Name
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_account.Name
+    public void setId(Long id) {
-     *
+        this.id = id;
-     * @mbggenerated
+    }
-     */
+
-    public String getName() {
+    /**
-        return name;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_account.Name
-
+     *
-    /**
+     * @return the value of jsh_account.Name
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_account.Name
+     * @mbggenerated
-     *
+     */
-     * @param name the value for jsh_account.Name
+    public String getName() {
-     *
+        return name;
-     * @mbggenerated
+    }
-     */
+
-    public void setName(String name) {
+    /**
-        this.name = name == null ? null : name.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_account.Name
-
+     *
-    /**
+     * @param name the value for jsh_account.Name
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_account.SerialNo
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_account.SerialNo
+    public void setName(String name) {
-     *
+        this.name = name == null ? null : name.trim();
-     * @mbggenerated
+    }
-     */
+
-    public String getSerialno() {
+    /**
-        return serialno;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_account.SerialNo
-
+     *
-    /**
+     * @return the value of jsh_account.SerialNo
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_account.SerialNo
+     * @mbggenerated
-     *
+     */
-     * @param serialno the value for jsh_account.SerialNo
+    public String getSerialno() {
-     *
+        return serialno;
-     * @mbggenerated
+    }
-     */
+
-    public void setSerialno(String serialno) {
+    /**
-        this.serialno = serialno == null ? null : serialno.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_account.SerialNo
-
+     *
-    /**
+     * @param serialno the value for jsh_account.SerialNo
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_account.InitialAmount
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_account.InitialAmount
+    public void setSerialno(String serialno) {
-     *
+        this.serialno = serialno == null ? null : serialno.trim();
-     * @mbggenerated
+    }
-     */
+
-    public BigDecimal getInitialamount() {
+    /**
-        return initialamount;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_account.InitialAmount
-
+     *
-    /**
+     * @return the value of jsh_account.InitialAmount
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_account.InitialAmount
+     * @mbggenerated
-     *
+     */
-     * @param initialamount the value for jsh_account.InitialAmount
+    public BigDecimal getInitialamount() {
-     *
+        return initialamount;
-     * @mbggenerated
+    }
-     */
+
-    public void setInitialamount(BigDecimal initialamount) {
+    /**
-        this.initialamount = initialamount;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_account.InitialAmount
-
+     *
-    /**
+     * @param initialamount the value for jsh_account.InitialAmount
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_account.CurrentAmount
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_account.CurrentAmount
+    public void setInitialamount(BigDecimal initialamount) {
-     *
+        this.initialamount = initialamount;
-     * @mbggenerated
+    }
-     */
+
-    public BigDecimal getCurrentamount() {
+    /**
-        return currentamount;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_account.CurrentAmount
-
+     *
-    /**
+     * @return the value of jsh_account.CurrentAmount
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_account.CurrentAmount
+     * @mbggenerated
-     *
+     */
-     * @param currentamount the value for jsh_account.CurrentAmount
+    public BigDecimal getCurrentamount() {
-     *
+        return currentamount;
-     * @mbggenerated
+    }
-     */
+
-    public void setCurrentamount(BigDecimal currentamount) {
+    /**
-        this.currentamount = currentamount;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_account.CurrentAmount
-
+     *
-    /**
+     * @param currentamount the value for jsh_account.CurrentAmount
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_account.Remark
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_account.Remark
+    public void setCurrentamount(BigDecimal currentamount) {
-     *
+        this.currentamount = currentamount;
-     * @mbggenerated
+    }
-     */
+
-    public String getRemark() {
+    /**
-        return remark;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_account.Remark
-
+     *
-    /**
+     * @return the value of jsh_account.Remark
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_account.Remark
+     * @mbggenerated
-     *
+     */
-     * @param remark the value for jsh_account.Remark
+    public String getRemark() {
-     *
+        return remark;
-     * @mbggenerated
+    }
-     */
+
-    public void setRemark(String remark) {
+    /**
-        this.remark = remark == null ? null : remark.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_account.Remark
-
+     *
-    /**
+     * @param remark the value for jsh_account.Remark
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_account.IsDefault
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_account.IsDefault
+    public void setRemark(String remark) {
-     *
+        this.remark = remark == null ? null : remark.trim();
-     * @mbggenerated
+    }
-     */
+
-    public Boolean getIsdefault() {
+    /**
-        return isdefault;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_account.IsDefault
-
+     *
-    /**
+     * @return the value of jsh_account.IsDefault
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_account.IsDefault
+     * @mbggenerated
-     *
+     */
-     * @param isdefault the value for jsh_account.IsDefault
+    public Boolean getIsdefault() {
-     *
+        return isdefault;
-     * @mbggenerated
+    }
-     */
+
-    public void setIsdefault(Boolean isdefault) {
+    /**
-        this.isdefault = isdefault;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_account.IsDefault
+     *
+     * @param isdefault the value for jsh_account.IsDefault
+     *
+     * @mbggenerated
+     */
+    public void setIsdefault(Boolean isdefault) {
+        this.isdefault = isdefault;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_account.tenant_id
+     *
+     * @return the value of jsh_account.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_account.tenant_id
+     *
+     * @param tenantId the value for jsh_account.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

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

@@ -1,326 +1,358 @@
-package com.jsh.erp.datasource.entities;
+package com.jsh.erp.datasource.entities;
-
+
-import java.math.BigDecimal;
+import java.math.BigDecimal;
-import java.util.Date;
+import java.util.Date;
-
+
-public class AccountHead {
+public class AccountHead {
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.Id
+     * This field corresponds to the database column jsh_accounthead.Id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long id;
+    private Long id;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.Type
+     * This field corresponds to the database column jsh_accounthead.Type
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String type;
+    private String type;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.OrganId
+     * This field corresponds to the database column jsh_accounthead.OrganId
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long organid;
+    private Long organid;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.HandsPersonId
+     * This field corresponds to the database column jsh_accounthead.HandsPersonId
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long handspersonid;
+    private Long handspersonid;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.ChangeAmount
+     * This field corresponds to the database column jsh_accounthead.ChangeAmount
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private BigDecimal changeamount;
+    private BigDecimal changeamount;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.TotalPrice
+     * This field corresponds to the database column jsh_accounthead.TotalPrice
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private BigDecimal totalprice;
+    private BigDecimal totalprice;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.AccountId
+     * This field corresponds to the database column jsh_accounthead.AccountId
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long accountid;
+    private Long accountid;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.BillNo
+     * This field corresponds to the database column jsh_accounthead.BillNo
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String billno;
+    private String billno;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.BillTime
+     * This field corresponds to the database column jsh_accounthead.BillTime
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Date billtime;
+    private Date billtime;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accounthead.Remark
+     * This field corresponds to the database column jsh_accounthead.Remark
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String remark;
+    private String remark;
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_accounthead.Id
+     * This field corresponds to the database column jsh_accounthead.tenant_id
-     *
+     *
-     * @return the value of jsh_accounthead.Id
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    private Long tenantId;
-     */
+
-    public Long getId() {
+    /**
-        return id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accounthead.Id
-
+     *
-    /**
+     * @return the value of jsh_accounthead.Id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accounthead.Id
+     * @mbggenerated
-     *
+     */
-     * @param id the value for jsh_accounthead.Id
+    public Long getId() {
-     *
+        return id;
-     * @mbggenerated
+    }
-     */
+
-    public void setId(Long id) {
+    /**
-        this.id = id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accounthead.Id
-
+     *
-    /**
+     * @param id the value for jsh_accounthead.Id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accounthead.Type
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accounthead.Type
+    public void setId(Long id) {
-     *
+        this.id = id;
-     * @mbggenerated
+    }
-     */
+
-    public String getType() {
+    /**
-        return type;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accounthead.Type
-
+     *
-    /**
+     * @return the value of jsh_accounthead.Type
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accounthead.Type
+     * @mbggenerated
-     *
+     */
-     * @param type the value for jsh_accounthead.Type
+    public String getType() {
-     *
+        return type;
-     * @mbggenerated
+    }
-     */
+
-    public void setType(String type) {
+    /**
-        this.type = type == null ? null : type.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accounthead.Type
-
+     *
-    /**
+     * @param type the value for jsh_accounthead.Type
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accounthead.OrganId
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accounthead.OrganId
+    public void setType(String type) {
-     *
+        this.type = type == null ? null : type.trim();
-     * @mbggenerated
+    }
-     */
+
-    public Long getOrganid() {
+    /**
-        return organid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accounthead.OrganId
-
+     *
-    /**
+     * @return the value of jsh_accounthead.OrganId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accounthead.OrganId
+     * @mbggenerated
-     *
+     */
-     * @param organid the value for jsh_accounthead.OrganId
+    public Long getOrganid() {
-     *
+        return organid;
-     * @mbggenerated
+    }
-     */
+
-    public void setOrganid(Long organid) {
+    /**
-        this.organid = organid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accounthead.OrganId
-
+     *
-    /**
+     * @param organid the value for jsh_accounthead.OrganId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accounthead.HandsPersonId
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accounthead.HandsPersonId
+    public void setOrganid(Long organid) {
-     *
+        this.organid = organid;
-     * @mbggenerated
+    }
-     */
+
-    public Long getHandspersonid() {
+    /**
-        return handspersonid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accounthead.HandsPersonId
-
+     *
-    /**
+     * @return the value of jsh_accounthead.HandsPersonId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accounthead.HandsPersonId
+     * @mbggenerated
-     *
+     */
-     * @param handspersonid the value for jsh_accounthead.HandsPersonId
+    public Long getHandspersonid() {
-     *
+        return handspersonid;
-     * @mbggenerated
+    }
-     */
+
-    public void setHandspersonid(Long handspersonid) {
+    /**
-        this.handspersonid = handspersonid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accounthead.HandsPersonId
-
+     *
-    /**
+     * @param handspersonid the value for jsh_accounthead.HandsPersonId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accounthead.ChangeAmount
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accounthead.ChangeAmount
+    public void setHandspersonid(Long handspersonid) {
-     *
+        this.handspersonid = handspersonid;
-     * @mbggenerated
+    }
-     */
+
-    public BigDecimal getChangeamount() {
+    /**
-        return changeamount;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accounthead.ChangeAmount
-
+     *
-    /**
+     * @return the value of jsh_accounthead.ChangeAmount
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accounthead.ChangeAmount
+     * @mbggenerated
-     *
+     */
-     * @param changeamount the value for jsh_accounthead.ChangeAmount
+    public BigDecimal getChangeamount() {
-     *
+        return changeamount;
-     * @mbggenerated
+    }
-     */
+
-    public void setChangeamount(BigDecimal changeamount) {
+    /**
-        this.changeamount = changeamount;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accounthead.ChangeAmount
-
+     *
-    /**
+     * @param changeamount the value for jsh_accounthead.ChangeAmount
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accounthead.TotalPrice
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accounthead.TotalPrice
+    public void setChangeamount(BigDecimal changeamount) {
-     *
+        this.changeamount = changeamount;
-     * @mbggenerated
+    }
-     */
+
-    public BigDecimal getTotalprice() {
+    /**
-        return totalprice;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accounthead.TotalPrice
-
+     *
-    /**
+     * @return the value of jsh_accounthead.TotalPrice
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accounthead.TotalPrice
+     * @mbggenerated
-     *
+     */
-     * @param totalprice the value for jsh_accounthead.TotalPrice
+    public BigDecimal getTotalprice() {
-     *
+        return totalprice;
-     * @mbggenerated
+    }
-     */
+
-    public void setTotalprice(BigDecimal totalprice) {
+    /**
-        this.totalprice = totalprice;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accounthead.TotalPrice
-
+     *
-    /**
+     * @param totalprice the value for jsh_accounthead.TotalPrice
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accounthead.AccountId
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accounthead.AccountId
+    public void setTotalprice(BigDecimal totalprice) {
-     *
+        this.totalprice = totalprice;
-     * @mbggenerated
+    }
-     */
+
-    public Long getAccountid() {
+    /**
-        return accountid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accounthead.AccountId
-
+     *
-    /**
+     * @return the value of jsh_accounthead.AccountId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accounthead.AccountId
+     * @mbggenerated
-     *
+     */
-     * @param accountid the value for jsh_accounthead.AccountId
+    public Long getAccountid() {
-     *
+        return accountid;
-     * @mbggenerated
+    }
-     */
+
-    public void setAccountid(Long accountid) {
+    /**
-        this.accountid = accountid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accounthead.AccountId
-
+     *
-    /**
+     * @param accountid the value for jsh_accounthead.AccountId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accounthead.BillNo
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accounthead.BillNo
+    public void setAccountid(Long accountid) {
-     *
+        this.accountid = accountid;
-     * @mbggenerated
+    }
-     */
+
-    public String getBillno() {
+    /**
-        return billno;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accounthead.BillNo
-
+     *
-    /**
+     * @return the value of jsh_accounthead.BillNo
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accounthead.BillNo
+     * @mbggenerated
-     *
+     */
-     * @param billno the value for jsh_accounthead.BillNo
+    public String getBillno() {
-     *
+        return billno;
-     * @mbggenerated
+    }
-     */
+
-    public void setBillno(String billno) {
+    /**
-        this.billno = billno == null ? null : billno.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accounthead.BillNo
-
+     *
-    /**
+     * @param billno the value for jsh_accounthead.BillNo
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accounthead.BillTime
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accounthead.BillTime
+    public void setBillno(String billno) {
-     *
+        this.billno = billno == null ? null : billno.trim();
-     * @mbggenerated
+    }
-     */
+
-    public Date getBilltime() {
+    /**
-        return billtime;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accounthead.BillTime
-
+     *
-    /**
+     * @return the value of jsh_accounthead.BillTime
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accounthead.BillTime
+     * @mbggenerated
-     *
+     */
-     * @param billtime the value for jsh_accounthead.BillTime
+    public Date getBilltime() {
-     *
+        return billtime;
-     * @mbggenerated
+    }
-     */
+
-    public void setBilltime(Date billtime) {
+    /**
-        this.billtime = billtime;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accounthead.BillTime
-
+     *
-    /**
+     * @param billtime the value for jsh_accounthead.BillTime
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accounthead.Remark
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accounthead.Remark
+    public void setBilltime(Date billtime) {
-     *
+        this.billtime = billtime;
-     * @mbggenerated
+    }
-     */
+
-    public String getRemark() {
+    /**
-        return remark;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accounthead.Remark
-
+     *
-    /**
+     * @return the value of jsh_accounthead.Remark
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accounthead.Remark
+     * @mbggenerated
-     *
+     */
-     * @param remark the value for jsh_accounthead.Remark
+    public String getRemark() {
-     *
+        return remark;
-     * @mbggenerated
+    }
-     */
+
-    public void setRemark(String remark) {
+    /**
-        this.remark = remark == null ? null : remark.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accounthead.Remark
+     *
+     * @param remark the value for jsh_accounthead.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_accounthead.tenant_id
+     *
+     * @return the value of jsh_accounthead.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_accounthead.tenant_id
+     *
+     * @param tenantId the value for jsh_accounthead.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

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

@@ -25,6 +25,8 @@ public class AccountHeadVo4ListEx {
 
     private String remark;
 
+    private Long tenantId;
+
     private String organname;
 
     private String handspersonname;
@@ -111,6 +113,14 @@ public class AccountHeadVo4ListEx {
         this.remark = remark;
     }
 
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
+
     public String getOrganname() {
         return organname;
     }

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

@@ -1,197 +1,229 @@
-package com.jsh.erp.datasource.entities;
+package com.jsh.erp.datasource.entities;
-
+
-import java.math.BigDecimal;
+import java.math.BigDecimal;
-
+
-public class AccountItem {
+public class AccountItem {
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accountitem.Id
+     * This field corresponds to the database column jsh_accountitem.Id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long id;
+    private Long id;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accountitem.HeaderId
+     * This field corresponds to the database column jsh_accountitem.HeaderId
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long headerid;
+    private Long headerid;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accountitem.AccountId
+     * This field corresponds to the database column jsh_accountitem.AccountId
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long accountid;
+    private Long accountid;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accountitem.InOutItemId
+     * This field corresponds to the database column jsh_accountitem.InOutItemId
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long inoutitemid;
+    private Long inoutitemid;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accountitem.EachAmount
+     * This field corresponds to the database column jsh_accountitem.EachAmount
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private BigDecimal eachamount;
+    private BigDecimal eachamount;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_accountitem.Remark
+     * This field corresponds to the database column jsh_accountitem.Remark
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String remark;
+    private String remark;
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_accountitem.Id
+     * This field corresponds to the database column jsh_accountitem.tenant_id
-     *
+     *
-     * @return the value of jsh_accountitem.Id
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    private Long tenantId;
-     */
+
-    public Long getId() {
+    /**
-        return id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accountitem.Id
-
+     *
-    /**
+     * @return the value of jsh_accountitem.Id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accountitem.Id
+     * @mbggenerated
-     *
+     */
-     * @param id the value for jsh_accountitem.Id
+    public Long getId() {
-     *
+        return id;
-     * @mbggenerated
+    }
-     */
+
-    public void setId(Long id) {
+    /**
-        this.id = id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accountitem.Id
-
+     *
-    /**
+     * @param id the value for jsh_accountitem.Id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accountitem.HeaderId
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accountitem.HeaderId
+    public void setId(Long id) {
-     *
+        this.id = id;
-     * @mbggenerated
+    }
-     */
+
-    public Long getHeaderid() {
+    /**
-        return headerid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accountitem.HeaderId
-
+     *
-    /**
+     * @return the value of jsh_accountitem.HeaderId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accountitem.HeaderId
+     * @mbggenerated
-     *
+     */
-     * @param headerid the value for jsh_accountitem.HeaderId
+    public Long getHeaderid() {
-     *
+        return headerid;
-     * @mbggenerated
+    }
-     */
+
-    public void setHeaderid(Long headerid) {
+    /**
-        this.headerid = headerid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accountitem.HeaderId
-
+     *
-    /**
+     * @param headerid the value for jsh_accountitem.HeaderId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accountitem.AccountId
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accountitem.AccountId
+    public void setHeaderid(Long headerid) {
-     *
+        this.headerid = headerid;
-     * @mbggenerated
+    }
-     */
+
-    public Long getAccountid() {
+    /**
-        return accountid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accountitem.AccountId
-
+     *
-    /**
+     * @return the value of jsh_accountitem.AccountId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accountitem.AccountId
+     * @mbggenerated
-     *
+     */
-     * @param accountid the value for jsh_accountitem.AccountId
+    public Long getAccountid() {
-     *
+        return accountid;
-     * @mbggenerated
+    }
-     */
+
-    public void setAccountid(Long accountid) {
+    /**
-        this.accountid = accountid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accountitem.AccountId
-
+     *
-    /**
+     * @param accountid the value for jsh_accountitem.AccountId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accountitem.InOutItemId
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accountitem.InOutItemId
+    public void setAccountid(Long accountid) {
-     *
+        this.accountid = accountid;
-     * @mbggenerated
+    }
-     */
+
-    public Long getInoutitemid() {
+    /**
-        return inoutitemid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accountitem.InOutItemId
-
+     *
-    /**
+     * @return the value of jsh_accountitem.InOutItemId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accountitem.InOutItemId
+     * @mbggenerated
-     *
+     */
-     * @param inoutitemid the value for jsh_accountitem.InOutItemId
+    public Long getInoutitemid() {
-     *
+        return inoutitemid;
-     * @mbggenerated
+    }
-     */
+
-    public void setInoutitemid(Long inoutitemid) {
+    /**
-        this.inoutitemid = inoutitemid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accountitem.InOutItemId
-
+     *
-    /**
+     * @param inoutitemid the value for jsh_accountitem.InOutItemId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accountitem.EachAmount
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accountitem.EachAmount
+    public void setInoutitemid(Long inoutitemid) {
-     *
+        this.inoutitemid = inoutitemid;
-     * @mbggenerated
+    }
-     */
+
-    public BigDecimal getEachamount() {
+    /**
-        return eachamount;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accountitem.EachAmount
-
+     *
-    /**
+     * @return the value of jsh_accountitem.EachAmount
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accountitem.EachAmount
+     * @mbggenerated
-     *
+     */
-     * @param eachamount the value for jsh_accountitem.EachAmount
+    public BigDecimal getEachamount() {
-     *
+        return eachamount;
-     * @mbggenerated
+    }
-     */
+
-    public void setEachamount(BigDecimal eachamount) {
+    /**
-        this.eachamount = eachamount;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accountitem.EachAmount
-
+     *
-    /**
+     * @param eachamount the value for jsh_accountitem.EachAmount
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_accountitem.Remark
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_accountitem.Remark
+    public void setEachamount(BigDecimal eachamount) {
-     *
+        this.eachamount = eachamount;
-     * @mbggenerated
+    }
-     */
+
-    public String getRemark() {
+    /**
-        return remark;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_accountitem.Remark
-
+     *
-    /**
+     * @return the value of jsh_accountitem.Remark
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_accountitem.Remark
+     * @mbggenerated
-     *
+     */
-     * @param remark the value for jsh_accountitem.Remark
+    public String getRemark() {
-     *
+        return remark;
-     * @mbggenerated
+    }
-     */
+
-    public void setRemark(String remark) {
+    /**
-        this.remark = remark == null ? null : remark.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_accountitem.Remark
+     *
+     * @param remark the value for jsh_accountitem.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_accountitem.tenant_id
+     *
+     * @return the value of jsh_accountitem.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_accountitem.tenant_id
+     *
+     * @param tenantId the value for jsh_accountitem.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

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

@@ -33,6 +33,14 @@ public class AssetCategory {
      */
     private String description;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_assetcategory.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_assetcategory.id
@@ -128,4 +136,28 @@ public class AssetCategory {
     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_assetcategory.tenant_id
+     *
+     * @return the value of jsh_assetcategory.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_assetcategory.tenant_id
+     *
+     * @param tenantId the value for jsh_assetcategory.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

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

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

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

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

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

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

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

@@ -1,293 +1,325 @@
-package com.jsh.erp.datasource.entities;
+package com.jsh.erp.datasource.entities;
-
+
-import java.math.BigDecimal;
+import java.math.BigDecimal;
-
+
-public class Depot {
+public class Depot {
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_depot.id
+     * This field corresponds to the database column jsh_depot.id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long id;
+    private Long id;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_depot.name
+     * This field corresponds to the database column jsh_depot.name
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String name;
+    private String name;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_depot.address
+     * This field corresponds to the database column jsh_depot.address
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String address;
+    private String address;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_depot.warehousing
+     * This field corresponds to the database column jsh_depot.warehousing
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private BigDecimal warehousing;
+    private BigDecimal warehousing;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_depot.truckage
+     * This field corresponds to the database column jsh_depot.truckage
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private BigDecimal truckage;
+    private BigDecimal truckage;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_depot.type
+     * This field corresponds to the database column jsh_depot.type
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Integer type;
+    private Integer type;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_depot.sort
+     * This field corresponds to the database column jsh_depot.sort
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String sort;
+    private String sort;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_depot.remark
+     * This field corresponds to the database column jsh_depot.remark
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String remark;
+    private String remark;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_depot.principal
+     * This field corresponds to the database column jsh_depot.principal
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long principal;
+    private Long principal;
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_depot.id
+     * This field corresponds to the database column jsh_depot.tenant_id
-     *
+     *
-     * @return the value of jsh_depot.id
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    private Long tenantId;
-     */
+
-    public Long getId() {
+    /**
-        return id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_depot.id
-
+     *
-    /**
+     * @return the value of jsh_depot.id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_depot.id
+     * @mbggenerated
-     *
+     */
-     * @param id the value for jsh_depot.id
+    public Long getId() {
-     *
+        return id;
-     * @mbggenerated
+    }
-     */
+
-    public void setId(Long id) {
+    /**
-        this.id = id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_depot.id
-
+     *
-    /**
+     * @param id the value for jsh_depot.id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_depot.name
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_depot.name
+    public void setId(Long id) {
-     *
+        this.id = id;
-     * @mbggenerated
+    }
-     */
+
-    public String getName() {
+    /**
-        return name;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_depot.name
-
+     *
-    /**
+     * @return the value of jsh_depot.name
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_depot.name
+     * @mbggenerated
-     *
+     */
-     * @param name the value for jsh_depot.name
+    public String getName() {
-     *
+        return name;
-     * @mbggenerated
+    }
-     */
+
-    public void setName(String name) {
+    /**
-        this.name = name == null ? null : name.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_depot.name
-
+     *
-    /**
+     * @param name the value for jsh_depot.name
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_depot.address
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_depot.address
+    public void setName(String name) {
-     *
+        this.name = name == null ? null : name.trim();
-     * @mbggenerated
+    }
-     */
+
-    public String getAddress() {
+    /**
-        return address;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_depot.address
-
+     *
-    /**
+     * @return the value of jsh_depot.address
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_depot.address
+     * @mbggenerated
-     *
+     */
-     * @param address the value for jsh_depot.address
+    public String getAddress() {
-     *
+        return address;
-     * @mbggenerated
+    }
-     */
+
-    public void setAddress(String address) {
+    /**
-        this.address = address == null ? null : address.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_depot.address
-
+     *
-    /**
+     * @param address the value for jsh_depot.address
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_depot.warehousing
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_depot.warehousing
+    public void setAddress(String address) {
-     *
+        this.address = address == null ? null : address.trim();
-     * @mbggenerated
+    }
-     */
+
-    public BigDecimal getWarehousing() {
+    /**
-        return warehousing;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_depot.warehousing
-
+     *
-    /**
+     * @return the value of jsh_depot.warehousing
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_depot.warehousing
+     * @mbggenerated
-     *
+     */
-     * @param warehousing the value for jsh_depot.warehousing
+    public BigDecimal getWarehousing() {
-     *
+        return warehousing;
-     * @mbggenerated
+    }
-     */
+
-    public void setWarehousing(BigDecimal warehousing) {
+    /**
-        this.warehousing = warehousing;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_depot.warehousing
-
+     *
-    /**
+     * @param warehousing the value for jsh_depot.warehousing
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_depot.truckage
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_depot.truckage
+    public void setWarehousing(BigDecimal warehousing) {
-     *
+        this.warehousing = warehousing;
-     * @mbggenerated
+    }
-     */
+
-    public BigDecimal getTruckage() {
+    /**
-        return truckage;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_depot.truckage
-
+     *
-    /**
+     * @return the value of jsh_depot.truckage
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_depot.truckage
+     * @mbggenerated
-     *
+     */
-     * @param truckage the value for jsh_depot.truckage
+    public BigDecimal getTruckage() {
-     *
+        return truckage;
-     * @mbggenerated
+    }
-     */
+
-    public void setTruckage(BigDecimal truckage) {
+    /**
-        this.truckage = truckage;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_depot.truckage
-
+     *
-    /**
+     * @param truckage the value for jsh_depot.truckage
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_depot.type
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_depot.type
+    public void setTruckage(BigDecimal truckage) {
-     *
+        this.truckage = truckage;
-     * @mbggenerated
+    }
-     */
+
-    public Integer getType() {
+    /**
-        return type;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_depot.type
-
+     *
-    /**
+     * @return the value of jsh_depot.type
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_depot.type
+     * @mbggenerated
-     *
+     */
-     * @param type the value for jsh_depot.type
+    public Integer getType() {
-     *
+        return type;
-     * @mbggenerated
+    }
-     */
+
-    public void setType(Integer type) {
+    /**
-        this.type = type;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_depot.type
-
+     *
-    /**
+     * @param type the value for jsh_depot.type
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_depot.sort
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_depot.sort
+    public void setType(Integer type) {
-     *
+        this.type = type;
-     * @mbggenerated
+    }
-     */
+
-    public String getSort() {
+    /**
-        return sort;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_depot.sort
-
+     *
-    /**
+     * @return the value of jsh_depot.sort
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_depot.sort
+     * @mbggenerated
-     *
+     */
-     * @param sort the value for jsh_depot.sort
+    public String getSort() {
-     *
+        return sort;
-     * @mbggenerated
+    }
-     */
+
-    public void setSort(String sort) {
+    /**
-        this.sort = sort == null ? null : sort.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_depot.sort
-
+     *
-    /**
+     * @param sort the value for jsh_depot.sort
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_depot.remark
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_depot.remark
+    public void setSort(String sort) {
-     *
+        this.sort = sort == null ? null : sort.trim();
-     * @mbggenerated
+    }
-     */
+
-    public String getRemark() {
+    /**
-        return remark;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_depot.remark
-
+     *
-    /**
+     * @return the value of jsh_depot.remark
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_depot.remark
+     * @mbggenerated
-     *
+     */
-     * @param remark the value for jsh_depot.remark
+    public String getRemark() {
-     *
+        return remark;
-     * @mbggenerated
+    }
-     */
+
-    public void setRemark(String remark) {
+    /**
-        this.remark = remark == null ? null : remark.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_depot.remark
-
+     *
-    /**
+     * @param remark the value for jsh_depot.remark
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_depot.principal
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_depot.principal
+    public void setRemark(String remark) {
-     *
+        this.remark = remark == null ? null : remark.trim();
-     * @mbggenerated
+    }
-     */
+
-    public Long getPrincipal() {
+    /**
-        return principal;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_depot.principal
-
+     *
-    /**
+     * @return the value of jsh_depot.principal
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_depot.principal
+     * @mbggenerated
-     *
+     */
-     * @param principal the value for jsh_depot.principal
+    public Long getPrincipal() {
-     *
+        return principal;
-     * @mbggenerated
+    }
-     */
+
-    public void setPrincipal(Long principal) {
+    /**
-        this.principal = principal;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_depot.principal
+     *
+     * @param principal the value for jsh_depot.principal
+     *
+     * @mbggenerated
+     */
+    public void setPrincipal(Long principal) {
+        this.principal = principal;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_depot.tenant_id
+     *
+     * @return the value of jsh_depot.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_depot.tenant_id
+     *
+     * @param tenantId the value for jsh_depot.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,389 +1,421 @@
-package com.jsh.erp.datasource.entities;
+package com.jsh.erp.datasource.entities;
-
+
-import java.util.Date;
+import java.util.Date;
-
+
-public class MaterialCategory {
+public class MaterialCategory {
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.Id
+     * This field corresponds to the database column jsh_materialcategory.Id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long id;
+    private Long id;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.Name
+     * This field corresponds to the database column jsh_materialcategory.Name
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String name;
+    private String name;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.CategoryLevel
+     * This field corresponds to the database column jsh_materialcategory.CategoryLevel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Short categorylevel;
+    private Short categorylevel;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.ParentId
+     * This field corresponds to the database column jsh_materialcategory.ParentId
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long parentid;
+    private Long parentid;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.sort
+     * This field corresponds to the database column jsh_materialcategory.sort
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String sort;
+    private String sort;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.status
+     * This field corresponds to the database column jsh_materialcategory.status
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String status;
+    private String status;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.serial_no
+     * This field corresponds to the database column jsh_materialcategory.serial_no
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String serialNo;
+    private String serialNo;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.remark
+     * This field corresponds to the database column jsh_materialcategory.remark
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String remark;
+    private String remark;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.create_time
+     * This field corresponds to the database column jsh_materialcategory.create_time
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Date createTime;
+    private Date createTime;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.creator
+     * This field corresponds to the database column jsh_materialcategory.creator
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long creator;
+    private Long creator;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.update_time
+     * This field corresponds to the database column jsh_materialcategory.update_time
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Date updateTime;
+    private Date updateTime;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_materialcategory.updater
+     * This field corresponds to the database column jsh_materialcategory.updater
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long updater;
+    private Long updater;
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_materialcategory.Id
+     * This field corresponds to the database column jsh_materialcategory.tenant_id
-     *
+     *
-     * @return the value of jsh_materialcategory.Id
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    private Long tenantId;
-     */
+
-    public Long getId() {
+    /**
-        return id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.Id
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.Id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.Id
+     * @mbggenerated
-     *
+     */
-     * @param id the value for jsh_materialcategory.Id
+    public Long getId() {
-     *
+        return id;
-     * @mbggenerated
+    }
-     */
+
-    public void setId(Long id) {
+    /**
-        this.id = id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.Id
-
+     *
-    /**
+     * @param id the value for jsh_materialcategory.Id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_materialcategory.Name
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_materialcategory.Name
+    public void setId(Long id) {
-     *
+        this.id = id;
-     * @mbggenerated
+    }
-     */
+
-    public String getName() {
+    /**
-        return name;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.Name
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.Name
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.Name
+     * @mbggenerated
-     *
+     */
-     * @param name the value for jsh_materialcategory.Name
+    public String getName() {
-     *
+        return name;
-     * @mbggenerated
+    }
-     */
+
-    public void setName(String name) {
+    /**
-        this.name = name == null ? null : name.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.Name
-
+     *
-    /**
+     * @param name the value for jsh_materialcategory.Name
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_materialcategory.CategoryLevel
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_materialcategory.CategoryLevel
+    public void setName(String name) {
-     *
+        this.name = name == null ? null : name.trim();
-     * @mbggenerated
+    }
-     */
+
-    public Short getCategorylevel() {
+    /**
-        return categorylevel;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.CategoryLevel
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.CategoryLevel
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.CategoryLevel
+     * @mbggenerated
-     *
+     */
-     * @param categorylevel the value for jsh_materialcategory.CategoryLevel
+    public Short getCategorylevel() {
-     *
+        return categorylevel;
-     * @mbggenerated
+    }
-     */
+
-    public void setCategorylevel(Short categorylevel) {
+    /**
-        this.categorylevel = categorylevel;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.CategoryLevel
-
+     *
-    /**
+     * @param categorylevel the value for jsh_materialcategory.CategoryLevel
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_materialcategory.ParentId
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_materialcategory.ParentId
+    public void setCategorylevel(Short categorylevel) {
-     *
+        this.categorylevel = categorylevel;
-     * @mbggenerated
+    }
-     */
+
-    public Long getParentid() {
+    /**
-        return parentid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.ParentId
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.ParentId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.ParentId
+     * @mbggenerated
-     *
+     */
-     * @param parentid the value for jsh_materialcategory.ParentId
+    public Long getParentid() {
-     *
+        return parentid;
-     * @mbggenerated
+    }
-     */
+
-    public void setParentid(Long parentid) {
+    /**
-        this.parentid = parentid;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.ParentId
-
+     *
-    /**
+     * @param parentid the value for jsh_materialcategory.ParentId
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_materialcategory.sort
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_materialcategory.sort
+    public void setParentid(Long parentid) {
-     *
+        this.parentid = parentid;
-     * @mbggenerated
+    }
-     */
+
-    public String getSort() {
+    /**
-        return sort;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.sort
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.sort
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.sort
+     * @mbggenerated
-     *
+     */
-     * @param sort the value for jsh_materialcategory.sort
+    public String getSort() {
-     *
+        return sort;
-     * @mbggenerated
+    }
-     */
+
-    public void setSort(String sort) {
+    /**
-        this.sort = sort == null ? null : sort.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.sort
-
+     *
-    /**
+     * @param sort the value for jsh_materialcategory.sort
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_materialcategory.status
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_materialcategory.status
+    public void setSort(String sort) {
-     *
+        this.sort = sort == null ? null : sort.trim();
-     * @mbggenerated
+    }
-     */
+
-    public String getStatus() {
+    /**
-        return status;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.status
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.status
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.status
+     * @mbggenerated
-     *
+     */
-     * @param status the value for jsh_materialcategory.status
+    public String getStatus() {
-     *
+        return status;
-     * @mbggenerated
+    }
-     */
+
-    public void setStatus(String status) {
+    /**
-        this.status = status == null ? null : status.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.status
-
+     *
-    /**
+     * @param status the value for jsh_materialcategory.status
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_materialcategory.serial_no
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_materialcategory.serial_no
+    public void setStatus(String status) {
-     *
+        this.status = status == null ? null : status.trim();
-     * @mbggenerated
+    }
-     */
+
-    public String getSerialNo() {
+    /**
-        return serialNo;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.serial_no
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.serial_no
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.serial_no
+     * @mbggenerated
-     *
+     */
-     * @param serialNo the value for jsh_materialcategory.serial_no
+    public String getSerialNo() {
-     *
+        return serialNo;
-     * @mbggenerated
+    }
-     */
+
-    public void setSerialNo(String serialNo) {
+    /**
-        this.serialNo = serialNo == null ? null : serialNo.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.serial_no
-
+     *
-    /**
+     * @param serialNo the value for jsh_materialcategory.serial_no
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_materialcategory.remark
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_materialcategory.remark
+    public void setSerialNo(String serialNo) {
-     *
+        this.serialNo = serialNo == null ? null : serialNo.trim();
-     * @mbggenerated
+    }
-     */
+
-    public String getRemark() {
+    /**
-        return remark;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.remark
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.remark
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.remark
+     * @mbggenerated
-     *
+     */
-     * @param remark the value for jsh_materialcategory.remark
+    public String getRemark() {
-     *
+        return remark;
-     * @mbggenerated
+    }
-     */
+
-    public void setRemark(String remark) {
+    /**
-        this.remark = remark == null ? null : remark.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.remark
-
+     *
-    /**
+     * @param remark the value for jsh_materialcategory.remark
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_materialcategory.create_time
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_materialcategory.create_time
+    public void setRemark(String remark) {
-     *
+        this.remark = remark == null ? null : remark.trim();
-     * @mbggenerated
+    }
-     */
+
-    public Date getCreateTime() {
+    /**
-        return createTime;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.create_time
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.create_time
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.create_time
+     * @mbggenerated
-     *
+     */
-     * @param createTime the value for jsh_materialcategory.create_time
+    public Date getCreateTime() {
-     *
+        return createTime;
-     * @mbggenerated
+    }
-     */
+
-    public void setCreateTime(Date createTime) {
+    /**
-        this.createTime = createTime;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.create_time
-
+     *
-    /**
+     * @param createTime the value for jsh_materialcategory.create_time
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_materialcategory.creator
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_materialcategory.creator
+    public void setCreateTime(Date createTime) {
-     *
+        this.createTime = createTime;
-     * @mbggenerated
+    }
-     */
+
-    public Long getCreator() {
+    /**
-        return creator;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.creator
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.creator
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.creator
+     * @mbggenerated
-     *
+     */
-     * @param creator the value for jsh_materialcategory.creator
+    public Long getCreator() {
-     *
+        return creator;
-     * @mbggenerated
+    }
-     */
+
-    public void setCreator(Long creator) {
+    /**
-        this.creator = creator;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.creator
-
+     *
-    /**
+     * @param creator the value for jsh_materialcategory.creator
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_materialcategory.update_time
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_materialcategory.update_time
+    public void setCreator(Long creator) {
-     *
+        this.creator = creator;
-     * @mbggenerated
+    }
-     */
+
-    public Date getUpdateTime() {
+    /**
-        return updateTime;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.update_time
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.update_time
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.update_time
+     * @mbggenerated
-     *
+     */
-     * @param updateTime the value for jsh_materialcategory.update_time
+    public Date getUpdateTime() {
-     *
+        return updateTime;
-     * @mbggenerated
+    }
-     */
+
-    public void setUpdateTime(Date updateTime) {
+    /**
-        this.updateTime = updateTime;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.update_time
-
+     *
-    /**
+     * @param updateTime the value for jsh_materialcategory.update_time
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_materialcategory.updater
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_materialcategory.updater
+    public void setUpdateTime(Date updateTime) {
-     *
+        this.updateTime = updateTime;
-     * @mbggenerated
+    }
-     */
+
-    public Long getUpdater() {
+    /**
-        return updater;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_materialcategory.updater
-
+     *
-    /**
+     * @return the value of jsh_materialcategory.updater
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_materialcategory.updater
+     * @mbggenerated
-     *
+     */
-     * @param updater the value for jsh_materialcategory.updater
+    public Long getUpdater() {
-     *
+        return updater;
-     * @mbggenerated
+    }
-     */
+
-    public void setUpdater(Long updater) {
+    /**
-        this.updater = updater;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_materialcategory.updater
+     *
+     * @param updater the value for jsh_materialcategory.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_materialcategory.tenant_id
+     *
+     * @return the value of jsh_materialcategory.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_materialcategory.tenant_id
+     *
+     * @param tenantId the value for jsh_materialcategory.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

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

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

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

@@ -1,293 +1,325 @@
-package com.jsh.erp.datasource.entities;
+package com.jsh.erp.datasource.entities;
-
+
-import java.util.Date;
+import java.util.Date;
-
+
-public class OrgaUserRel {
+public class OrgaUserRel {
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_orga_user_rel.id
+     * This field corresponds to the database column jsh_orga_user_rel.id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long id;
+    private Long id;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_orga_user_rel.orga_id
+     * This field corresponds to the database column jsh_orga_user_rel.orga_id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long orgaId;
+    private Long orgaId;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_orga_user_rel.user_id
+     * This field corresponds to the database column jsh_orga_user_rel.user_id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long userId;
+    private Long userId;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
+     * This field corresponds to the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String userBlngOrgaDsplSeq;
+    private String userBlngOrgaDsplSeq;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_orga_user_rel.delete_flag
+     * This field corresponds to the database column jsh_orga_user_rel.delete_flag
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String deleteFlag;
+    private String deleteFlag;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_orga_user_rel.create_time
+     * This field corresponds to the database column jsh_orga_user_rel.create_time
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Date createTime;
+    private Date createTime;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_orga_user_rel.creator
+     * This field corresponds to the database column jsh_orga_user_rel.creator
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long creator;
+    private Long creator;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_orga_user_rel.update_time
+     * This field corresponds to the database column jsh_orga_user_rel.update_time
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Date updateTime;
+    private Date updateTime;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_orga_user_rel.updater
+     * This field corresponds to the database column jsh_orga_user_rel.updater
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long updater;
+    private Long updater;
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_orga_user_rel.id
+     * This field corresponds to the database column jsh_orga_user_rel.tenant_id
-     *
+     *
-     * @return the value of jsh_orga_user_rel.id
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    private Long tenantId;
-     */
+
-    public Long getId() {
+    /**
-        return id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_orga_user_rel.id
-
+     *
-    /**
+     * @return the value of jsh_orga_user_rel.id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_orga_user_rel.id
+     * @mbggenerated
-     *
+     */
-     * @param id the value for jsh_orga_user_rel.id
+    public Long getId() {
-     *
+        return id;
-     * @mbggenerated
+    }
-     */
+
-    public void setId(Long id) {
+    /**
-        this.id = id;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_orga_user_rel.id
-
+     *
-    /**
+     * @param id the value for jsh_orga_user_rel.id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_orga_user_rel.orga_id
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_orga_user_rel.orga_id
+    public void setId(Long id) {
-     *
+        this.id = id;
-     * @mbggenerated
+    }
-     */
+
-    public Long getOrgaId() {
+    /**
-        return orgaId;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_orga_user_rel.orga_id
-
+     *
-    /**
+     * @return the value of jsh_orga_user_rel.orga_id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_orga_user_rel.orga_id
+     * @mbggenerated
-     *
+     */
-     * @param orgaId the value for jsh_orga_user_rel.orga_id
+    public Long getOrgaId() {
-     *
+        return orgaId;
-     * @mbggenerated
+    }
-     */
+
-    public void setOrgaId(Long orgaId) {
+    /**
-        this.orgaId = orgaId;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_orga_user_rel.orga_id
-
+     *
-    /**
+     * @param orgaId the value for jsh_orga_user_rel.orga_id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_orga_user_rel.user_id
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_orga_user_rel.user_id
+    public void setOrgaId(Long orgaId) {
-     *
+        this.orgaId = orgaId;
-     * @mbggenerated
+    }
-     */
+
-    public Long getUserId() {
+    /**
-        return userId;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_orga_user_rel.user_id
-
+     *
-    /**
+     * @return the value of jsh_orga_user_rel.user_id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_orga_user_rel.user_id
+     * @mbggenerated
-     *
+     */
-     * @param userId the value for jsh_orga_user_rel.user_id
+    public Long getUserId() {
-     *
+        return userId;
-     * @mbggenerated
+    }
-     */
+
-    public void setUserId(Long userId) {
+    /**
-        this.userId = userId;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_orga_user_rel.user_id
-
+     *
-    /**
+     * @param userId the value for jsh_orga_user_rel.user_id
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_orga_user_rel.user_blng_orga_dspl_seq
+    public void setUserId(Long userId) {
-     *
+        this.userId = userId;
-     * @mbggenerated
+    }
-     */
+
-    public String getUserBlngOrgaDsplSeq() {
+    /**
-        return userBlngOrgaDsplSeq;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
-
+     *
-    /**
+     * @return the value of jsh_orga_user_rel.user_blng_orga_dspl_seq
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
+     * @mbggenerated
-     *
+     */
-     * @param userBlngOrgaDsplSeq the value for jsh_orga_user_rel.user_blng_orga_dspl_seq
+    public String getUserBlngOrgaDsplSeq() {
-     *
+        return userBlngOrgaDsplSeq;
-     * @mbggenerated
+    }
-     */
+
-    public void setUserBlngOrgaDsplSeq(String userBlngOrgaDsplSeq) {
+    /**
-        this.userBlngOrgaDsplSeq = userBlngOrgaDsplSeq == null ? null : userBlngOrgaDsplSeq.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_orga_user_rel.user_blng_orga_dspl_seq
-
+     *
-    /**
+     * @param userBlngOrgaDsplSeq the value for jsh_orga_user_rel.user_blng_orga_dspl_seq
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_orga_user_rel.delete_flag
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_orga_user_rel.delete_flag
+    public void setUserBlngOrgaDsplSeq(String userBlngOrgaDsplSeq) {
-     *
+        this.userBlngOrgaDsplSeq = userBlngOrgaDsplSeq == null ? null : userBlngOrgaDsplSeq.trim();
-     * @mbggenerated
+    }
-     */
+
-    public String getDeleteFlag() {
+    /**
-        return deleteFlag;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_orga_user_rel.delete_flag
-
+     *
-    /**
+     * @return the value of jsh_orga_user_rel.delete_flag
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_orga_user_rel.delete_flag
+     * @mbggenerated
-     *
+     */
-     * @param deleteFlag the value for jsh_orga_user_rel.delete_flag
+    public String getDeleteFlag() {
-     *
+        return deleteFlag;
-     * @mbggenerated
+    }
-     */
+
-    public void setDeleteFlag(String deleteFlag) {
+    /**
-        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_orga_user_rel.delete_flag
-
+     *
-    /**
+     * @param deleteFlag the value for jsh_orga_user_rel.delete_flag
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_orga_user_rel.create_time
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_orga_user_rel.create_time
+    public void setDeleteFlag(String deleteFlag) {
-     *
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
-     * @mbggenerated
+    }
-     */
+
-    public Date getCreateTime() {
+    /**
-        return createTime;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_orga_user_rel.create_time
-
+     *
-    /**
+     * @return the value of jsh_orga_user_rel.create_time
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_orga_user_rel.create_time
+     * @mbggenerated
-     *
+     */
-     * @param createTime the value for jsh_orga_user_rel.create_time
+    public Date getCreateTime() {
-     *
+        return createTime;
-     * @mbggenerated
+    }
-     */
+
-    public void setCreateTime(Date createTime) {
+    /**
-        this.createTime = createTime;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_orga_user_rel.create_time
-
+     *
-    /**
+     * @param createTime the value for jsh_orga_user_rel.create_time
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_orga_user_rel.creator
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_orga_user_rel.creator
+    public void setCreateTime(Date createTime) {
-     *
+        this.createTime = createTime;
-     * @mbggenerated
+    }
-     */
+
-    public Long getCreator() {
+    /**
-        return creator;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_orga_user_rel.creator
-
+     *
-    /**
+     * @return the value of jsh_orga_user_rel.creator
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_orga_user_rel.creator
+     * @mbggenerated
-     *
+     */
-     * @param creator the value for jsh_orga_user_rel.creator
+    public Long getCreator() {
-     *
+        return creator;
-     * @mbggenerated
+    }
-     */
+
-    public void setCreator(Long creator) {
+    /**
-        this.creator = creator;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_orga_user_rel.creator
-
+     *
-    /**
+     * @param creator the value for jsh_orga_user_rel.creator
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_orga_user_rel.update_time
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_orga_user_rel.update_time
+    public void setCreator(Long creator) {
-     *
+        this.creator = creator;
-     * @mbggenerated
+    }
-     */
+
-    public Date getUpdateTime() {
+    /**
-        return updateTime;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_orga_user_rel.update_time
-
+     *
-    /**
+     * @return the value of jsh_orga_user_rel.update_time
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_orga_user_rel.update_time
+     * @mbggenerated
-     *
+     */
-     * @param updateTime the value for jsh_orga_user_rel.update_time
+    public Date getUpdateTime() {
-     *
+        return updateTime;
-     * @mbggenerated
+    }
-     */
+
-    public void setUpdateTime(Date updateTime) {
+    /**
-        this.updateTime = updateTime;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_orga_user_rel.update_time
-
+     *
-    /**
+     * @param updateTime the value for jsh_orga_user_rel.update_time
-     * This method was generated by MyBatis Generator.
+     *
-     * This method returns the value of the database column jsh_orga_user_rel.updater
+     * @mbggenerated
-     *
+     */
-     * @return the value of jsh_orga_user_rel.updater
+    public void setUpdateTime(Date updateTime) {
-     *
+        this.updateTime = updateTime;
-     * @mbggenerated
+    }
-     */
+
-    public Long getUpdater() {
+    /**
-        return updater;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method returns the value of the database column jsh_orga_user_rel.updater
-
+     *
-    /**
+     * @return the value of jsh_orga_user_rel.updater
-     * This method was generated by MyBatis Generator.
+     *
-     * This method sets the value of the database column jsh_orga_user_rel.updater
+     * @mbggenerated
-     *
+     */
-     * @param updater the value for jsh_orga_user_rel.updater
+    public Long getUpdater() {
-     *
+        return updater;
-     * @mbggenerated
+    }
-     */
+
-    public void setUpdater(Long updater) {
+    /**
-        this.updater = updater;
+     * This method was generated by MyBatis Generator.
-    }
+     * This method sets the value of the database column jsh_orga_user_rel.updater
+     *
+     * @param updater the value for jsh_orga_user_rel.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_orga_user_rel.tenant_id
+     *
+     * @return the value of jsh_orga_user_rel.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_orga_user_rel.tenant_id
+     *
+     * @param tenantId the value for jsh_orga_user_rel.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -1,338 +1,389 @@
-package com.jsh.erp.datasource.entities;
+package com.jsh.erp.datasource.entities;
-
+
-import java.util.Date;
+import java.util.Date;
-
+
-public class SerialNumber {
+public class SerialNumber {
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.id
+     * This field corresponds to the database column jsh_serial_number.id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long id;
+    private Long id;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.material_Id
+     * This field corresponds to the database column jsh_serial_number.material_Id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long materialId;
+    private Long materialId;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.serial_Number
+     * This field corresponds to the database column jsh_serial_number.serial_Number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String serialNumber;
+    private String serialNumber;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.is_Sell
+     * This field corresponds to the database column jsh_serial_number.is_Sell
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String isSell;
+    private String isSell;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.remark
+     * This field corresponds to the database column jsh_serial_number.remark
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String remark;
+    private String remark;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.delete_Flag
+     * This field corresponds to the database column jsh_serial_number.delete_Flag
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private String deleteFlag;
+    private String deleteFlag;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.create_Time
+     * This field corresponds to the database column jsh_serial_number.create_Time
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Date createTime;
+    private Date createTime;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.creator
+     * This field corresponds to the database column jsh_serial_number.creator
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long creator;
+    private Long creator;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.update_Time
+     * This field corresponds to the database column jsh_serial_number.update_Time
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Date updateTime;
+    private Date updateTime;
-
+
-    /**
+    /**
-     * This field was generated by MyBatis Generator.
+     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_serial_number.updater
+     * This field corresponds to the database column jsh_serial_number.updater
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    private Long updater;
+    private Long updater;
-    /**
+
-     * 单据主表id，用于跟踪序列号流向
+    /**
-     * */
+     * This field was generated by MyBatis Generator.
-    private Long depotheadId;
+     * This field corresponds to the database column jsh_serial_number.depothead_Id
-
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method returns the value of the database column jsh_serial_number.id
+    private Long depotheadId;
-     *
+
-     * @return the value of jsh_serial_number.id
+    /**
-     *
+     * This field was generated by MyBatis Generator.
-     * @mbggenerated
+     * This field corresponds to the database column jsh_serial_number.tenant_id
-     */
+     *
-    public Long getId() {
+     * @mbggenerated
-        return id;
+     */
-    }
+    private Long tenantId;
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.id
+     * This method returns the value of the database column jsh_serial_number.id
-     *
+     *
-     * @param id the value for jsh_serial_number.id
+     * @return the value of jsh_serial_number.id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public void setId(Long id) {
+    public Long getId() {
-        this.id = id;
+        return id;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.material_Id
+     * This method sets the value of the database column jsh_serial_number.id
-     *
+     *
-     * @return the value of jsh_serial_number.material_Id
+     * @param id the value for jsh_serial_number.id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public Long getMaterialId() {
+    public void setId(Long id) {
-        return materialId;
+        this.id = id;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.material_Id
+     * This method returns the value of the database column jsh_serial_number.material_Id
-     *
+     *
-     * @param materialId the value for jsh_serial_number.material_Id
+     * @return the value of jsh_serial_number.material_Id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public void setMaterialId(Long materialId) {
+    public Long getMaterialId() {
-        this.materialId = materialId;
+        return materialId;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.serial_Number
+     * This method sets the value of the database column jsh_serial_number.material_Id
-     *
+     *
-     * @return the value of jsh_serial_number.serial_Number
+     * @param materialId the value for jsh_serial_number.material_Id
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public String getSerialNumber() {
+    public void setMaterialId(Long materialId) {
-        return serialNumber;
+        this.materialId = materialId;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.serial_Number
+     * This method returns the value of the database column jsh_serial_number.serial_Number
-     *
+     *
-     * @param serialNumber the value for jsh_serial_number.serial_Number
+     * @return the value of jsh_serial_number.serial_Number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public void setSerialNumber(String serialNumber) {
+    public String getSerialNumber() {
-        this.serialNumber = serialNumber == null ? null : serialNumber.trim();
+        return serialNumber;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.is_Sell
+     * This method sets the value of the database column jsh_serial_number.serial_Number
-     *
+     *
-     * @return the value of jsh_serial_number.is_Sell
+     * @param serialNumber the value for jsh_serial_number.serial_Number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public String getIsSell() {
+    public void setSerialNumber(String serialNumber) {
-        return isSell;
+        this.serialNumber = serialNumber == null ? null : serialNumber.trim();
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.is_Sell
+     * This method returns the value of the database column jsh_serial_number.is_Sell
-     *
+     *
-     * @param isSell the value for jsh_serial_number.is_Sell
+     * @return the value of jsh_serial_number.is_Sell
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public void setIsSell(String isSell) {
+    public String getIsSell() {
-        this.isSell = isSell;
+        return isSell;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.remark
+     * This method sets the value of the database column jsh_serial_number.is_Sell
-     *
+     *
-     * @return the value of jsh_serial_number.remark
+     * @param isSell the value for jsh_serial_number.is_Sell
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public String getRemark() {
+    public void setIsSell(String isSell) {
-        return remark;
+        this.isSell = isSell == null ? null : isSell.trim();
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.remark
+     * This method returns the value of the database column jsh_serial_number.remark
-     *
+     *
-     * @param remark the value for jsh_serial_number.remark
+     * @return the value of jsh_serial_number.remark
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public void setRemark(String remark) {
+    public String getRemark() {
-        this.remark = remark == null ? null : remark.trim();
+        return remark;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.delete_Flag
+     * This method sets the value of the database column jsh_serial_number.remark
-     *
+     *
-     * @return the value of jsh_serial_number.delete_Flag
+     * @param remark the value for jsh_serial_number.remark
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public String getDeleteFlag() {
+    public void setRemark(String remark) {
-        return deleteFlag;
+        this.remark = remark == null ? null : remark.trim();
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.delete_Flag
+     * This method returns the value of the database column jsh_serial_number.delete_Flag
-     *
+     *
-     * @param deleteFlag the value for jsh_serial_number.delete_Flag
+     * @return the value of jsh_serial_number.delete_Flag
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public void setDeleteFlag(String deleteFlag) {
+    public String getDeleteFlag() {
-        this.deleteFlag = deleteFlag;
+        return deleteFlag;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.create_Time
+     * This method sets the value of the database column jsh_serial_number.delete_Flag
-     *
+     *
-     * @return the value of jsh_serial_number.create_Time
+     * @param deleteFlag the value for jsh_serial_number.delete_Flag
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public Date getCreateTime() {
+    public void setDeleteFlag(String deleteFlag) {
-        return createTime;
+        this.deleteFlag = deleteFlag == null ? null : deleteFlag.trim();
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.create_Time
+     * This method returns the value of the database column jsh_serial_number.create_Time
-     *
+     *
-     * @param createTime the value for jsh_serial_number.create_Time
+     * @return the value of jsh_serial_number.create_Time
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public void setCreateTime(Date createTime) {
+    public Date getCreateTime() {
-        this.createTime = createTime;
+        return createTime;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.creator
+     * This method sets the value of the database column jsh_serial_number.create_Time
-     *
+     *
-     * @return the value of jsh_serial_number.creator
+     * @param createTime the value for jsh_serial_number.create_Time
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public Long getCreator() {
+    public void setCreateTime(Date createTime) {
-        return creator;
+        this.createTime = createTime;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.creator
+     * This method returns the value of the database column jsh_serial_number.creator
-     *
+     *
-     * @param creator the value for jsh_serial_number.creator
+     * @return the value of jsh_serial_number.creator
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public void setCreator(Long creator) {
+    public Long getCreator() {
-        this.creator = creator;
+        return creator;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.update_Time
+     * This method sets the value of the database column jsh_serial_number.creator
-     *
+     *
-     * @return the value of jsh_serial_number.update_Time
+     * @param creator the value for jsh_serial_number.creator
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public Date getUpdateTime() {
+    public void setCreator(Long creator) {
-        return updateTime;
+        this.creator = creator;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.update_Time
+     * This method returns the value of the database column jsh_serial_number.update_Time
-     *
+     *
-     * @param updateTime the value for jsh_serial_number.update_Time
+     * @return the value of jsh_serial_number.update_Time
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public void setUpdateTime(Date updateTime) {
+    public Date getUpdateTime() {
-        this.updateTime = updateTime;
+        return updateTime;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_serial_number.updater
+     * This method sets the value of the database column jsh_serial_number.update_Time
-     *
+     *
-     * @return the value of jsh_serial_number.updater
+     * @param updateTime the value for jsh_serial_number.update_Time
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public Long getUpdater() {
+    public void setUpdateTime(Date updateTime) {
-        return updater;
+        this.updateTime = updateTime;
-    }
+    }
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_serial_number.updater
+     * This method returns the value of the database column jsh_serial_number.updater
-     *
+     *
-     * @param updater the value for jsh_serial_number.updater
+     * @return the value of jsh_serial_number.updater
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    public void setUpdater(Long updater) {
+    public Long getUpdater() {
-        this.updater = updater;
+        return updater;
-    }
+    }
-
+
-
+    /**
-    public Long getDepotheadId() {
+     * This method was generated by MyBatis Generator.
-        return depotheadId;
+     * This method sets the value of the database column jsh_serial_number.updater
-    }
+     *
-
+     * @param updater the value for jsh_serial_number.updater
-    public void setDepotheadId(Long depotheadId) {
+     *
-        this.depotheadId = depotheadId;
+     * @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;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_serial_number.depothead_Id
+     *
+     * @param depotheadId the value for jsh_serial_number.depothead_Id
+     *
+     * @mbggenerated
+     */
+    public void setDepotheadId(Long depotheadId) {
+        this.depotheadId = depotheadId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_serial_number.tenant_id
+     *
+     * @return the value of jsh_serial_number.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_serial_number.tenant_id
+     *
+     * @param tenantId the value for jsh_serial_number.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

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

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

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

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

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

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

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

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

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

@@ -83,7 +83,7 @@ public class User {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column jsh_user.status
+     * This field corresponds to the database column jsh_user.Status
      *
      * @mbggenerated
      */
@@ -105,6 +105,14 @@ public class User {
      */
     private String remark;
 
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column jsh_user.tenant_id
+     *
+     * @mbggenerated
+     */
+    private Long tenantId;
+
     /**
      * This method was generated by MyBatis Generator.
      * This method returns the value of the database column jsh_user.id
@@ -347,9 +355,9 @@ public class User {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column jsh_user.status
+     * This method returns the value of the database column jsh_user.Status
      *
-     * @return the value of jsh_user.status
+     * @return the value of jsh_user.Status
      *
      * @mbggenerated
      */
@@ -359,9 +367,9 @@ public class User {
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column jsh_user.status
+     * This method sets the value of the database column jsh_user.Status
      *
-     * @param status the value for jsh_user.status
+     * @param status the value for jsh_user.Status
      *
      * @mbggenerated
      */
@@ -416,4 +424,28 @@ public class User {
     public void setRemark(String remark) {
         this.remark = remark == null ? null : remark.trim();
     }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column jsh_user.tenant_id
+     *
+     * @return the value of jsh_user.tenant_id
+     *
+     * @mbggenerated
+     */
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column jsh_user.tenant_id
+     *
+     * @param tenantId the value for jsh_user.tenant_id
+     *
+     * @mbggenerated
+     */
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

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

@@ -865,62 +865,62 @@ public class UserExample {
         }
 
         public Criteria andStatusIsNull() {
-            addCriterion("status is null");
+            addCriterion("Status is null");
             return (Criteria) this;
         }
 
         public Criteria andStatusIsNotNull() {
-            addCriterion("status is not null");
+            addCriterion("Status is not null");
             return (Criteria) this;
         }
 
         public Criteria andStatusEqualTo(Byte value) {
-            addCriterion("status =", value, "status");
+            addCriterion("Status =", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusNotEqualTo(Byte value) {
-            addCriterion("status <>", value, "status");
+            addCriterion("Status <>", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusGreaterThan(Byte value) {
-            addCriterion("status >", value, "status");
+            addCriterion("Status >", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusGreaterThanOrEqualTo(Byte value) {
-            addCriterion("status >=", value, "status");
+            addCriterion("Status >=", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusLessThan(Byte value) {
-            addCriterion("status <", value, "status");
+            addCriterion("Status <", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusLessThanOrEqualTo(Byte value) {
-            addCriterion("status <=", value, "status");
+            addCriterion("Status <=", value, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusIn(List<Byte> values) {
-            addCriterion("status in", values, "status");
+            addCriterion("Status in", values, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusNotIn(List<Byte> values) {
-            addCriterion("status not in", values, "status");
+            addCriterion("Status not in", values, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusBetween(Byte value1, Byte value2) {
-            addCriterion("status between", value1, value2, "status");
+            addCriterion("Status between", value1, value2, "status");
             return (Criteria) this;
         }
 
         public Criteria andStatusNotBetween(Byte value1, Byte value2) {
-            addCriterion("status not between", value1, value2, "status");
+            addCriterion("Status not between", value1, value2, "status");
             return (Criteria) this;
         }
 
@@ -1063,6 +1063,66 @@ public class UserExample {
             addCriterion("remark not between", value1, value2, "remark");
             return (Criteria) this;
         }
+
+        public Criteria andTenantIdIsNull() {
+            addCriterion("tenant_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIsNotNull() {
+            addCriterion("tenant_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdEqualTo(Long value) {
+            addCriterion("tenant_id =", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotEqualTo(Long value) {
+            addCriterion("tenant_id <>", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThan(Long value) {
+            addCriterion("tenant_id >", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("tenant_id >=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThan(Long value) {
+            addCriterion("tenant_id <", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdLessThanOrEqualTo(Long value) {
+            addCriterion("tenant_id <=", value, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdIn(List<Long> values) {
+            addCriterion("tenant_id in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotIn(List<Long> values) {
+            addCriterion("tenant_id not in", values, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdBetween(Long value1, Long value2) {
+            addCriterion("tenant_id between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
+
+        public Criteria andTenantIdNotBetween(Long value1, Long value2) {
+            addCriterion("tenant_id not between", value1, value2, "tenantId");
+            return (Criteria) this;
+        }
     }
 
     /**

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

@@ -1,100 +1,96 @@
-package com.jsh.erp.datasource.mappers;
+package com.jsh.erp.datasource.mappers;
-
+
-import com.jsh.erp.datasource.entities.AccountHead;
+import com.jsh.erp.datasource.entities.AccountHead;
-import com.jsh.erp.datasource.entities.AccountHeadExample;
+import com.jsh.erp.datasource.entities.AccountHeadExample;
-
+import java.util.List;
-import java.math.BigDecimal;
+import org.apache.ibatis.annotations.Param;
-import java.util.List;
+
-
+public interface AccountHeadMapper {
-import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx;
+    /**
-import org.apache.ibatis.annotations.Param;
+     * This method was generated by MyBatis Generator.
-
+     * This method corresponds to the database table jsh_accounthead
-public interface AccountHeadMapper {
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method corresponds to the database table jsh_accounthead
+    int countByExample(AccountHeadExample example);
-     *
+
-     * @mbggenerated
+    /**
-     */
+     * This method was generated by MyBatis Generator.
-    int countByExample(AccountHeadExample example);
+     * This method corresponds to the database table jsh_accounthead
-
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method corresponds to the database table jsh_accounthead
+    int deleteByExample(AccountHeadExample example);
-     *
+
-     * @mbggenerated
+    /**
-     */
+     * This method was generated by MyBatis Generator.
-    int deleteByExample(AccountHeadExample example);
+     * This method corresponds to the database table jsh_accounthead
-
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method corresponds to the database table jsh_accounthead
+    int deleteByPrimaryKey(Long id);
-     *
+
-     * @mbggenerated
+    /**
-     */
+     * This method was generated by MyBatis Generator.
-    int deleteByPrimaryKey(Long id);
+     * This method corresponds to the database table jsh_accounthead
-
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method corresponds to the database table jsh_accounthead
+    int insert(AccountHead record);
-     *
+
-     * @mbggenerated
+    /**
-     */
+     * This method was generated by MyBatis Generator.
-    int insert(AccountHead record);
+     * This method corresponds to the database table jsh_accounthead
-
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method corresponds to the database table jsh_accounthead
+    int insertSelective(AccountHead record);
-     *
+
-     * @mbggenerated
+    /**
-     */
+     * This method was generated by MyBatis Generator.
-    int insertSelective(AccountHead record);
+     * This method corresponds to the database table jsh_accounthead
-
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method corresponds to the database table jsh_accounthead
+    List<AccountHead> selectByExample(AccountHeadExample example);
-     *
+
-     * @mbggenerated
+    /**
-     */
+     * This method was generated by MyBatis Generator.
-    List<AccountHead> selectByExample(AccountHeadExample example);
+     * This method corresponds to the database table jsh_accounthead
-
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method corresponds to the database table jsh_accounthead
+    AccountHead selectByPrimaryKey(Long id);
-     *
+
-     * @mbggenerated
+    /**
-     */
+     * This method was generated by MyBatis Generator.
-    AccountHead selectByPrimaryKey(Long id);
+     * This method corresponds to the database table jsh_accounthead
-
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method corresponds to the database table jsh_accounthead
+    int updateByExampleSelective(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
-     *
+
-     * @mbggenerated
+    /**
-     */
+     * This method was generated by MyBatis Generator.
-    int updateByExampleSelective(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
+     * This method corresponds to the database table jsh_accounthead
-
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method corresponds to the database table jsh_accounthead
+    int updateByExample(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
-     *
+
-     * @mbggenerated
+    /**
-     */
+     * This method was generated by MyBatis Generator.
-    int updateByExample(@Param("record") AccountHead record, @Param("example") AccountHeadExample example);
+     * This method corresponds to the database table jsh_accounthead
-
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method corresponds to the database table jsh_accounthead
+    int updateByPrimaryKeySelective(AccountHead record);
-     *
+
-     * @mbggenerated
+    /**
-     */
+     * This method was generated by MyBatis Generator.
-    int updateByPrimaryKeySelective(AccountHead record);
+     * This method corresponds to the database table jsh_accounthead
-
+     *
-    /**
+     * @mbggenerated
-     * This method was generated by MyBatis Generator.
+     */
-     * This method corresponds to the database table jsh_accounthead
+    int updateByPrimaryKey(AccountHead record);
-     *
-     * @mbggenerated
-     */
-    int updateByPrimaryKey(AccountHead record);
 }

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

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

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

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

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

@@ -93,5 +93,4 @@ public interface AppMapper {
      * @mbggenerated
      */
     int updateByPrimaryKey(App record);
-
 }

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

@@ -1,98 +1,96 @@
-package com.jsh.erp.datasource.mappers;
+package com.jsh.erp.datasource.mappers;
-
+
-import com.jsh.erp.datasource.entities.*;
+import com.jsh.erp.datasource.entities.DepotItem;
-
+import com.jsh.erp.datasource.entities.DepotItemExample;
-import java.math.BigDecimal;
+import java.util.List;
-import java.util.List;
+import org.apache.ibatis.annotations.Param;
-
+
-import org.apache.ibatis.annotations.Param;
+public interface DepotItemMapper {
-
+    /**
-public interface DepotItemMapper {
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_depotitem
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_depotitem
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int countByExample(DepotItemExample example);
-     */
+
-    int countByExample(DepotItemExample example);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_depotitem
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_depotitem
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int deleteByExample(DepotItemExample example);
-     */
+
-    int deleteByExample(DepotItemExample example);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_depotitem
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_depotitem
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int deleteByPrimaryKey(Long id);
-     */
+
-    int deleteByPrimaryKey(Long id);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_depotitem
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_depotitem
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int insert(DepotItem record);
-     */
+
-    int insert(DepotItem record);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_depotitem
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_depotitem
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int insertSelective(DepotItem record);
-     */
+
-    int insertSelective(DepotItem record);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_depotitem
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_depotitem
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    List<DepotItem> selectByExample(DepotItemExample example);
-     */
+
-    List<DepotItem> selectByExample(DepotItemExample example);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_depotitem
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_depotitem
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    DepotItem selectByPrimaryKey(Long id);
-     */
+
-    DepotItem selectByPrimaryKey(Long id);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_depotitem
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_depotitem
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int updateByExampleSelective(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
-     */
+
-    int updateByExampleSelective(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_depotitem
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_depotitem
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int updateByExample(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
-     */
+
-    int updateByExample(@Param("record") DepotItem record, @Param("example") DepotItemExample example);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_depotitem
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_depotitem
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int updateByPrimaryKeySelective(DepotItem record);
-     */
+
-    int updateByPrimaryKeySelective(DepotItem record);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_depotitem
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_depotitem
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int updateByPrimaryKey(DepotItem record);
-     */
-    int updateByPrimaryKey(DepotItem record);
 }

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

@@ -3,8 +3,6 @@ package com.jsh.erp.datasource.mappers;
 import com.jsh.erp.datasource.entities.Log;
 import com.jsh.erp.datasource.entities.LogExample;
 import java.util.List;
-
-import com.jsh.erp.datasource.vo.LogVo4List;
 import org.apache.ibatis.annotations.Param;
 
 public interface LogMapper {

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

@@ -1,96 +1,96 @@
-package com.jsh.erp.datasource.mappers;
+package com.jsh.erp.datasource.mappers;
-
+
-import com.jsh.erp.datasource.entities.MaterialCategory;
+import com.jsh.erp.datasource.entities.MaterialCategory;
-import com.jsh.erp.datasource.entities.MaterialCategoryExample;
+import com.jsh.erp.datasource.entities.MaterialCategoryExample;
-import java.util.List;
+import java.util.List;
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Param;
-
+
-public interface MaterialCategoryMapper {
+public interface MaterialCategoryMapper {
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
+     * This method corresponds to the database table jsh_materialcategory
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int countByExample(MaterialCategoryExample example);
+    int countByExample(MaterialCategoryExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
+     * This method corresponds to the database table jsh_materialcategory
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int deleteByExample(MaterialCategoryExample example);
+    int deleteByExample(MaterialCategoryExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
+     * This method corresponds to the database table jsh_materialcategory
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int deleteByPrimaryKey(Long id);
+    int deleteByPrimaryKey(Long id);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
+     * This method corresponds to the database table jsh_materialcategory
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int insert(MaterialCategory record);
+    int insert(MaterialCategory record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
+     * This method corresponds to the database table jsh_materialcategory
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int insertSelective(MaterialCategory record);
+    int insertSelective(MaterialCategory record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
+     * This method corresponds to the database table jsh_materialcategory
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    List<MaterialCategory> selectByExample(MaterialCategoryExample example);
+    List<MaterialCategory> selectByExample(MaterialCategoryExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
+     * This method corresponds to the database table jsh_materialcategory
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    MaterialCategory selectByPrimaryKey(Long id);
+    MaterialCategory selectByPrimaryKey(Long id);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
+     * This method corresponds to the database table jsh_materialcategory
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByExampleSelective(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
+    int updateByExampleSelective(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
+     * This method corresponds to the database table jsh_materialcategory
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByExample(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
+    int updateByExample(@Param("record") MaterialCategory record, @Param("example") MaterialCategoryExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
+     * This method corresponds to the database table jsh_materialcategory
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByPrimaryKeySelective(MaterialCategory record);
+    int updateByPrimaryKeySelective(MaterialCategory record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_materialcategory
+     * This method corresponds to the database table jsh_materialcategory
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByPrimaryKey(MaterialCategory record);
+    int updateByPrimaryKey(MaterialCategory record);
 }

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

@@ -1,100 +1,96 @@
-package com.jsh.erp.datasource.mappers;
+package com.jsh.erp.datasource.mappers;
-
+
-import com.jsh.erp.datasource.entities.Material;
+import com.jsh.erp.datasource.entities.Material;
-import com.jsh.erp.datasource.entities.MaterialExample;
+import com.jsh.erp.datasource.entities.MaterialExample;
-import java.util.List;
+import java.util.List;
-
+import org.apache.ibatis.annotations.Param;
-import com.jsh.erp.datasource.entities.MaterialVo4Unit;
+
-import org.apache.ibatis.annotations.Param;
+public interface MaterialMapper {
-
+    /**
-public interface MaterialMapper {
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_material
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_material
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int countByExample(MaterialExample example);
-     */
+
-    int countByExample(MaterialExample example);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_material
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_material
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int deleteByExample(MaterialExample example);
-     */
+
-    int deleteByExample(MaterialExample example);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_material
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_material
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int deleteByPrimaryKey(Long id);
-     */
+
-    int deleteByPrimaryKey(Long id);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_material
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_material
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int insert(Material record);
-     */
+
-    int insert(Material record);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_material
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_material
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int insertSelective(Material record);
-     */
+
-    int insertSelective(Material record);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_material
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_material
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    List<Material> selectByExample(MaterialExample example);
-     */
+
-    List<Material> selectByExample(MaterialExample example);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_material
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_material
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    Material selectByPrimaryKey(Long id);
-     */
+
-    Material selectByPrimaryKey(Long id);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_material
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_material
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int updateByExampleSelective(@Param("record") Material record, @Param("example") MaterialExample example);
-     */
+
-    int updateByExampleSelective(@Param("record") Material record, @Param("example") MaterialExample example);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_material
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_material
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int updateByExample(@Param("record") Material record, @Param("example") MaterialExample example);
-     */
+
-    int updateByExample(@Param("record") Material record, @Param("example") MaterialExample example);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_material
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_material
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int updateByPrimaryKeySelective(Material record);
-     */
+
-    int updateByPrimaryKeySelective(Material record);
+    /**
-
+     * This method was generated by MyBatis Generator.
-    /**
+     * This method corresponds to the database table jsh_material
-     * This method was generated by MyBatis Generator.
+     *
-     * This method corresponds to the database table jsh_material
+     * @mbggenerated
-     *
+     */
-     * @mbggenerated
+    int updateByPrimaryKey(Material record);
-     */
-    int updateByPrimaryKey(Material record);
-
-
 }

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

@@ -1,96 +1,96 @@
-package com.jsh.erp.datasource.mappers;
+package com.jsh.erp.datasource.mappers;
-
+
-import com.jsh.erp.datasource.entities.OrgaUserRel;
+import com.jsh.erp.datasource.entities.OrgaUserRel;
-import com.jsh.erp.datasource.entities.OrgaUserRelExample;
+import com.jsh.erp.datasource.entities.OrgaUserRelExample;
-import java.util.List;
+import java.util.List;
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Param;
-
+
-public interface OrgaUserRelMapper {
+public interface OrgaUserRelMapper {
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_orga_user_rel
+     * This method corresponds to the database table jsh_orga_user_rel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int countByExample(OrgaUserRelExample example);
+    int countByExample(OrgaUserRelExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_orga_user_rel
+     * This method corresponds to the database table jsh_orga_user_rel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int deleteByExample(OrgaUserRelExample example);
+    int deleteByExample(OrgaUserRelExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_orga_user_rel
+     * This method corresponds to the database table jsh_orga_user_rel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int deleteByPrimaryKey(Long id);
+    int deleteByPrimaryKey(Long id);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_orga_user_rel
+     * This method corresponds to the database table jsh_orga_user_rel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int insert(OrgaUserRel record);
+    int insert(OrgaUserRel record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_orga_user_rel
+     * This method corresponds to the database table jsh_orga_user_rel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int insertSelective(OrgaUserRel record);
+    int insertSelective(OrgaUserRel record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_orga_user_rel
+     * This method corresponds to the database table jsh_orga_user_rel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    List<OrgaUserRel> selectByExample(OrgaUserRelExample example);
+    List<OrgaUserRel> selectByExample(OrgaUserRelExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_orga_user_rel
+     * This method corresponds to the database table jsh_orga_user_rel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    OrgaUserRel selectByPrimaryKey(Long id);
+    OrgaUserRel selectByPrimaryKey(Long id);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_orga_user_rel
+     * This method corresponds to the database table jsh_orga_user_rel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByExampleSelective(@Param("record") OrgaUserRel record, @Param("example") OrgaUserRelExample example);
+    int updateByExampleSelective(@Param("record") OrgaUserRel record, @Param("example") OrgaUserRelExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_orga_user_rel
+     * This method corresponds to the database table jsh_orga_user_rel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByExample(@Param("record") OrgaUserRel record, @Param("example") OrgaUserRelExample example);
+    int updateByExample(@Param("record") OrgaUserRel record, @Param("example") OrgaUserRelExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_orga_user_rel
+     * This method corresponds to the database table jsh_orga_user_rel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByPrimaryKeySelective(OrgaUserRel record);
+    int updateByPrimaryKeySelective(OrgaUserRel record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_orga_user_rel
+     * This method corresponds to the database table jsh_orga_user_rel
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByPrimaryKey(OrgaUserRel record);
+    int updateByPrimaryKey(OrgaUserRel record);
 }

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

@@ -1,96 +1,96 @@
-package com.jsh.erp.datasource.mappers;
+package com.jsh.erp.datasource.mappers;
-
+
-import com.jsh.erp.datasource.entities.Organization;
+import com.jsh.erp.datasource.entities.Organization;
-import com.jsh.erp.datasource.entities.OrganizationExample;
+import com.jsh.erp.datasource.entities.OrganizationExample;
-import java.util.List;
+import java.util.List;
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Param;
-
+
-public interface OrganizationMapper {
+public interface OrganizationMapper {
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_organization
+     * This method corresponds to the database table jsh_organization
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int countByExample(OrganizationExample example);
+    int countByExample(OrganizationExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_organization
+     * This method corresponds to the database table jsh_organization
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int deleteByExample(OrganizationExample example);
+    int deleteByExample(OrganizationExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_organization
+     * This method corresponds to the database table jsh_organization
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int deleteByPrimaryKey(Long id);
+    int deleteByPrimaryKey(Long id);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_organization
+     * This method corresponds to the database table jsh_organization
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int insert(Organization record);
+    int insert(Organization record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_organization
+     * This method corresponds to the database table jsh_organization
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int insertSelective(Organization record);
+    int insertSelective(Organization record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_organization
+     * This method corresponds to the database table jsh_organization
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    List<Organization> selectByExample(OrganizationExample example);
+    List<Organization> selectByExample(OrganizationExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_organization
+     * This method corresponds to the database table jsh_organization
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    Organization selectByPrimaryKey(Long id);
+    Organization selectByPrimaryKey(Long id);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_organization
+     * This method corresponds to the database table jsh_organization
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByExampleSelective(@Param("record") Organization record, @Param("example") OrganizationExample example);
+    int updateByExampleSelective(@Param("record") Organization record, @Param("example") OrganizationExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_organization
+     * This method corresponds to the database table jsh_organization
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByExample(@Param("record") Organization record, @Param("example") OrganizationExample example);
+    int updateByExample(@Param("record") Organization record, @Param("example") OrganizationExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_organization
+     * This method corresponds to the database table jsh_organization
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByPrimaryKeySelective(Organization record);
+    int updateByPrimaryKeySelective(Organization record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_organization
+     * This method corresponds to the database table jsh_organization
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByPrimaryKey(Organization record);
+    int updateByPrimaryKey(Organization record);
 }

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

@@ -1,97 +1,96 @@
-package com.jsh.erp.datasource.mappers;
+package com.jsh.erp.datasource.mappers;
-
+
-import com.jsh.erp.datasource.entities.SerialNumber;
+import com.jsh.erp.datasource.entities.SerialNumber;
-import com.jsh.erp.datasource.entities.SerialNumberExample;
+import com.jsh.erp.datasource.entities.SerialNumberExample;
-import java.util.List;
+import java.util.List;
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Param;
-
+
-public interface SerialNumberMapper {
+public interface SerialNumberMapper {
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
+     * This method corresponds to the database table jsh_serial_number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int countByExample(SerialNumberExample example);
+    int countByExample(SerialNumberExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
+     * This method corresponds to the database table jsh_serial_number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int deleteByExample(SerialNumberExample example);
+    int deleteByExample(SerialNumberExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
+     * This method corresponds to the database table jsh_serial_number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int deleteByPrimaryKey(Long id);
+    int deleteByPrimaryKey(Long id);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
+     * This method corresponds to the database table jsh_serial_number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int insert(SerialNumber record);
+    int insert(SerialNumber record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
+     * This method corresponds to the database table jsh_serial_number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int insertSelective(SerialNumber record);
+    int insertSelective(SerialNumber record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
+     * This method corresponds to the database table jsh_serial_number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    List<SerialNumber> selectByExample(SerialNumberExample example);
+    List<SerialNumber> selectByExample(SerialNumberExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
+     * This method corresponds to the database table jsh_serial_number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    SerialNumber selectByPrimaryKey(Long id);
+    SerialNumber selectByPrimaryKey(Long id);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
+     * This method corresponds to the database table jsh_serial_number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByExampleSelective(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example);
+    int updateByExampleSelective(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
+     * This method corresponds to the database table jsh_serial_number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByExample(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example);
+    int updateByExample(@Param("record") SerialNumber record, @Param("example") SerialNumberExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
+     * This method corresponds to the database table jsh_serial_number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByPrimaryKeySelective(SerialNumber record);
+    int updateByPrimaryKeySelective(SerialNumber record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_serial_number
+     * This method corresponds to the database table jsh_serial_number
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByPrimaryKey(SerialNumber record);
+    int updateByPrimaryKey(SerialNumber record);
-
 }

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

@@ -1,96 +1,96 @@
-package com.jsh.erp.datasource.mappers;
+package com.jsh.erp.datasource.mappers;
-
+
-import com.jsh.erp.datasource.entities.Supplier;
+import com.jsh.erp.datasource.entities.Supplier;
-import com.jsh.erp.datasource.entities.SupplierExample;
+import com.jsh.erp.datasource.entities.SupplierExample;
-import java.util.List;
+import java.util.List;
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Param;
-
+
-public interface SupplierMapper {
+public interface SupplierMapper {
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_supplier
+     * This method corresponds to the database table jsh_supplier
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int countByExample(SupplierExample example);
+    int countByExample(SupplierExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_supplier
+     * This method corresponds to the database table jsh_supplier
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int deleteByExample(SupplierExample example);
+    int deleteByExample(SupplierExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_supplier
+     * This method corresponds to the database table jsh_supplier
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int deleteByPrimaryKey(Long id);
+    int deleteByPrimaryKey(Long id);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_supplier
+     * This method corresponds to the database table jsh_supplier
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int insert(Supplier record);
+    int insert(Supplier record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_supplier
+     * This method corresponds to the database table jsh_supplier
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int insertSelective(Supplier record);
+    int insertSelective(Supplier record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_supplier
+     * This method corresponds to the database table jsh_supplier
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    List<Supplier> selectByExample(SupplierExample example);
+    List<Supplier> selectByExample(SupplierExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_supplier
+     * This method corresponds to the database table jsh_supplier
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    Supplier selectByPrimaryKey(Long id);
+    Supplier selectByPrimaryKey(Long id);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_supplier
+     * This method corresponds to the database table jsh_supplier
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByExampleSelective(@Param("record") Supplier record, @Param("example") SupplierExample example);
+    int updateByExampleSelective(@Param("record") Supplier record, @Param("example") SupplierExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_supplier
+     * This method corresponds to the database table jsh_supplier
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByExample(@Param("record") Supplier record, @Param("example") SupplierExample example);
+    int updateByExample(@Param("record") Supplier record, @Param("example") SupplierExample example);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_supplier
+     * This method corresponds to the database table jsh_supplier
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByPrimaryKeySelective(Supplier record);
+    int updateByPrimaryKeySelective(Supplier record);
-
+
-    /**
+    /**
-     * This method was generated by MyBatis Generator.
+     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table jsh_supplier
+     * This method corresponds to the database table jsh_supplier
-     *
+     *
-     * @mbggenerated
+     * @mbggenerated
-     */
+     */
-    int updateByPrimaryKey(Supplier record);
+    int updateByPrimaryKey(Supplier record);
 }

src/main/java/com/jsh/erp/datasource/vo/AccountItemVo4List.java

@@ -1,73 +1,13 @@
 package com.jsh.erp.datasource.vo;
 
-import java.math.BigDecimal;
+import com.jsh.erp.datasource.entities.AccountItem;
 
-public class AccountItemVo4List {
+public class AccountItemVo4List extends AccountItem {
-
-    private Long id;
-
-    private Long headerid;
-
-    private Long accountid;
-
-    private Long inoutitemid;
-
-    private BigDecimal eachamount;
-
-    private String remark;
 
     private String accountName;
 
     private String inOutItemName;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getHeaderid() {
-        return headerid;
-    }
-
-    public void setHeaderid(Long headerid) {
-        this.headerid = headerid;
-    }
-
-    public Long getAccountid() {
-        return accountid;
-    }
-
-    public void setAccountid(Long accountid) {
-        this.accountid = accountid;
-    }
-
-    public Long getInoutitemid() {
-        return inoutitemid;
-    }
-
-    public void setInoutitemid(Long inoutitemid) {
-        this.inoutitemid = inoutitemid;
-    }
-
-    public BigDecimal getEachamount() {
-        return eachamount;
-    }
-
-    public void setEachamount(BigDecimal eachamount) {
-        this.eachamount = eachamount;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
     public String getAccountName() {
         return accountName;
     }

src/main/java/com/jsh/erp/datasource/vo/AccountVo4InOutList.java

@@ -20,6 +20,8 @@ public class AccountVo4InOutList {
 
     private String amList;
 
+    private Long tenantId;
+
     public String getNumber() {
         return number;
     }
@@ -83,4 +85,12 @@ public class AccountVo4InOutList {
     public void setAmList(String amList) {
         this.amList = amList;
     }
+
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

src/main/java/com/jsh/erp/datasource/vo/AccountVo4List.java

@@ -1,81 +1,11 @@
 package com.jsh.erp.datasource.vo;
 
-import java.math.BigDecimal;
+import com.jsh.erp.datasource.entities.Account;
 
-public class AccountVo4List {
+public class AccountVo4List extends Account{
-
-    private Long id;
-
-    private String name;
-
-    private String serialno;
-
-    private BigDecimal initialamount;
-
-    private BigDecimal currentamount;
-
-    private String remark;
-
-    private Boolean isdefault;
 
     private String thismonthamount;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getSerialno() {
-        return serialno;
-    }
-
-    public void setSerialno(String serialno) {
-        this.serialno = serialno;
-    }
-
-    public BigDecimal getInitialamount() {
-        return initialamount;
-    }
-
-    public void setInitialamount(BigDecimal initialamount) {
-        this.initialamount = initialamount;
-    }
-
-    public BigDecimal getCurrentamount() {
-        return currentamount;
-    }
-
-    public void setCurrentamount(BigDecimal currentamount) {
-        this.currentamount = currentamount;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Boolean getIsdefault() {
-        return isdefault;
-    }
-
-    public void setIsdefault(Boolean isdefault) {
-        this.isdefault = isdefault;
-    }
-
     public String getThismonthamount() {
         return thismonthamount;
     }

src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InDetail.java

@@ -26,6 +26,8 @@ public class DepotHeadVo4InDetail {
 
     private String NewType;
 
+    private Long tenantId;
+
     public String getNumber() {
         return Number;
     }
@@ -105,4 +107,12 @@ public class DepotHeadVo4InDetail {
     public void setNewType(String newType) {
         NewType = newType;
     }
+
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4InOutMCount.java

@@ -17,6 +17,8 @@ public class DepotHeadVo4InOutMCount {
 
     private BigDecimal priceSum;
 
+    private Long tenantId;
+
     public Long getMaterialId() {
         return MaterialId;
     }
@@ -64,4 +66,12 @@ public class DepotHeadVo4InOutMCount {
     public void setPriceSum(BigDecimal priceSum) {
         this.priceSum = priceSum;
     }
+
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4List.java

@@ -1,67 +1,11 @@
 package com.jsh.erp.datasource.vo;
 
+import com.jsh.erp.datasource.entities.DepotHead;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
-public class DepotHeadVo4List {
+public class DepotHeadVo4List extends DepotHead{
-
-    private Long id;
-
-    private String type;
-
-    private String subtype;
-
-    private Long projectid;
-
-    private String defaultnumber;
-
-    private String number;
-
-    private String operpersonname;
-
-    private Date createtime;
-
-    private Date opertime;
-
-    private Long organid;
-
-    private Long handspersonid;
-
-    private Long accountid;
-
-    private BigDecimal changeamount;
-
-    private Long allocationprojectid;
-
-    private BigDecimal totalprice;
-
-    private String paytype;
-
-    private String remark;
-
-    private String salesman;
-
-    private String accountidlist;
-
-    private String accountmoneylist;
-
-    private BigDecimal discount;
-
-    private BigDecimal discountmoney;
-
-    private BigDecimal discountlastmoney;
-
-    private BigDecimal othermoney;
-
-    private String othermoneylist;
-
-    private String othermoneyitem;
-
-    private Integer accountday;
-
-    private String status;
-
-    private String linknumber;
 
     private String projectName;
 
@@ -77,238 +21,6 @@ public class DepotHeadVo4List {
 
     private String opertimeStr;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getSubtype() {
-        return subtype;
-    }
-
-    public void setSubtype(String subtype) {
-        this.subtype = subtype;
-    }
-
-    public Long getProjectid() {
-        return projectid;
-    }
-
-    public void setProjectid(Long projectid) {
-        this.projectid = projectid;
-    }
-
-    public String getDefaultnumber() {
-        return defaultnumber;
-    }
-
-    public void setDefaultnumber(String defaultnumber) {
-        this.defaultnumber = defaultnumber;
-    }
-
-    public String getNumber() {
-        return number;
-    }
-
-    public void setNumber(String number) {
-        this.number = number;
-    }
-
-    public String getOperpersonname() {
-        return operpersonname;
-    }
-
-    public void setOperpersonname(String operpersonname) {
-        this.operpersonname = operpersonname;
-    }
-
-    public Date getCreatetime() {
-        return createtime;
-    }
-
-    public void setCreatetime(Date createtime) {
-        this.createtime = createtime;
-    }
-
-    public Date getOpertime() {
-        return opertime;
-    }
-
-    public void setOpertime(Date opertime) {
-        this.opertime = opertime;
-    }
-
-    public Long getOrganid() {
-        return organid;
-    }
-
-    public void setOrganid(Long organid) {
-        this.organid = organid;
-    }
-
-    public Long getHandspersonid() {
-        return handspersonid;
-    }
-
-    public void setHandspersonid(Long handspersonid) {
-        this.handspersonid = handspersonid;
-    }
-
-    public Long getAccountid() {
-        return accountid;
-    }
-
-    public void setAccountid(Long accountid) {
-        this.accountid = accountid;
-    }
-
-    public BigDecimal getChangeamount() {
-        return changeamount;
-    }
-
-    public void setChangeamount(BigDecimal changeamount) {
-        this.changeamount = changeamount;
-    }
-
-    public Long getAllocationprojectid() {
-        return allocationprojectid;
-    }
-
-    public void setAllocationprojectid(Long allocationprojectid) {
-        this.allocationprojectid = allocationprojectid;
-    }
-
-    public BigDecimal getTotalprice() {
-        return totalprice;
-    }
-
-    public void setTotalprice(BigDecimal totalprice) {
-        this.totalprice = totalprice;
-    }
-
-    public String getPaytype() {
-        return paytype;
-    }
-
-    public void setPaytype(String paytype) {
-        this.paytype = paytype;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getSalesman() {
-        return salesman;
-    }
-
-    public void setSalesman(String salesman) {
-        this.salesman = salesman;
-    }
-
-    public String getAccountidlist() {
-        return accountidlist;
-    }
-
-    public void setAccountidlist(String accountidlist) {
-        this.accountidlist = accountidlist;
-    }
-
-    public String getAccountmoneylist() {
-        return accountmoneylist;
-    }
-
-    public void setAccountmoneylist(String accountmoneylist) {
-        this.accountmoneylist = accountmoneylist;
-    }
-
-    public BigDecimal getDiscount() {
-        return discount;
-    }
-
-    public void setDiscount(BigDecimal discount) {
-        this.discount = discount;
-    }
-
-    public BigDecimal getDiscountmoney() {
-        return discountmoney;
-    }
-
-    public void setDiscountmoney(BigDecimal discountmoney) {
-        this.discountmoney = discountmoney;
-    }
-
-    public BigDecimal getDiscountlastmoney() {
-        return discountlastmoney;
-    }
-
-    public void setDiscountlastmoney(BigDecimal discountlastmoney) {
-        this.discountlastmoney = discountlastmoney;
-    }
-
-    public BigDecimal getOthermoney() {
-        return othermoney;
-    }
-
-    public void setOthermoney(BigDecimal othermoney) {
-        this.othermoney = othermoney;
-    }
-
-    public String getOthermoneylist() {
-        return othermoneylist;
-    }
-
-    public void setOthermoneylist(String othermoneylist) {
-        this.othermoneylist = othermoneylist;
-    }
-
-    public String getOthermoneyitem() {
-        return othermoneyitem;
-    }
-
-    public void setOthermoneyitem(String othermoneyitem) {
-        this.othermoneyitem = othermoneyitem;
-    }
-
-    public Integer getAccountday() {
-        return accountday;
-    }
-
-    public void setAccountday(Integer accountday) {
-        this.accountday = accountday;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getLinknumber() {
-        return linknumber;
-    }
-
-    public void setLinknumber(String linknumber) {
-        this.linknumber = linknumber;
-    }
-
     public String getProjectName() {
         return projectName;
     }

src/main/java/com/jsh/erp/datasource/vo/DepotHeadVo4StatementAccount.java

@@ -19,6 +19,8 @@ public class DepotHeadVo4StatementAccount {
 
     private String oTime;
 
+    private Long tenantId;
+
     public String getNumber() {
         return number;
     }
@@ -74,4 +76,12 @@ public class DepotHeadVo4StatementAccount {
     public void setoTime(String oTime) {
         this.oTime = oTime;
     }
+
+    public Long getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(Long tenantId) {
+        this.tenantId = tenantId;
+    }
 }

src/main/java/com/jsh/erp/datasource/vo/LogVo4List.java

@@ -1,91 +1,11 @@
 package com.jsh.erp.datasource.vo;
 
-import java.util.Date;
+import com.jsh.erp.datasource.entities.Log;
 
-public class LogVo4List {
+public class LogVo4List extends Log {
-
-    private Long id;
-
-    private Long userid;
-
-    private String operation;
-
-    private String clientip;
-
-    private Date createtime;
-
-    private Byte status;
-
-    private String contentdetails;
-
-    private String remark;
 
     private String username;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getUserid() {
-        return userid;
-    }
-
-    public void setUserid(Long userid) {
-        this.userid = userid;
-    }
-
-    public String getOperation() {
-        return operation;
-    }
-
-    public void setOperation(String operation) {
-        this.operation = operation;
-    }
-
-    public String getClientip() {
-        return clientip;
-    }
-
-    public void setClientip(String clientip) {
-        this.clientip = clientip;
-    }
-
-    public Date getCreatetime() {
-        return createtime;
-    }
-
-    public void setCreatetime(Date createtime) {
-        this.createtime = createtime;
-    }
-
-    public Byte getStatus() {
-        return status;
-    }
-
-    public void setStatus(Byte status) {
-        this.status = status;
-    }
-
-    public String getContentdetails() {
-        return contentdetails;
-    }
-
-    public void setContentdetails(String contentdetails) {
-        this.contentdetails = contentdetails;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
     public String getUsername() {
         return username;
     }

src/main/java/com/jsh/erp/service/depotItem/DepotItemService.java

@@ -255,7 +255,7 @@ public class DepotItemService {
                         if(material==null){
                             continue;
                         }
-                        if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())){
+                        if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())){
                             serialNumberMapperEx.cancelSerialNumber(depotItem.getMaterialid(),depotItem.getHeaderid(),depotItem.getBasicnumber().intValue(),
                                     new Date(),userInfo==null?null:userInfo.getId());
                         }
@@ -364,7 +364,7 @@ public class DepotItemService {
                             /**
                              * 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
                              * */
-                            if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
+                            if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) {
                                 //查询单据子表中开启序列号的数据列表
                                 serialNumberService.checkAndUpdateSerialNumber(depotItem, userInfo);
                             }
@@ -391,7 +391,7 @@ public class DepotItemService {
                         /**
                          * 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
                          * */
-                        if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
+                        if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) {
                             serialNumberMapperEx.cancelSerialNumber(depotItem.getMaterialid(), depotItem.getHeaderid(), depotItem.getBasicnumber().intValue(),
                                     new Date(), userInfo == null ? null : userInfo.getId());
                         }
@@ -471,7 +471,7 @@ public class DepotItemService {
                                 /**
                                  * 判断商品是否开启序列号，开启的收回序列号，未开启的跳过
                                  * */
-                            if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableSerialNumber())) {
+                            if(BusinessConstants.ENABLE_SERIAL_NUMBER_ENABLED.equals(material.getEnableserialnumber())) {
                                 //查询单据子表中开启序列号的数据列表
                                 serialNumberService.checkAndUpdateSerialNumber(depotItem, userInfo);
                             }

src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java

@@ -229,7 +229,7 @@ public class SerialNumberService {
 
             }
             //获得唯一商品
-            if (BusinessConstants.ENABLE_SERIAL_NUMBER_NOT_ENABLED.equals(mlist.get(0).getEnableSerialNumber())) {
+            if (BusinessConstants.ENABLE_SERIAL_NUMBER_NOT_ENABLED.equals(mlist.get(0).getEnableserialnumber())) {
                 //商品未开启序列号
                 throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_CODE,
                         ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_MSG);

src/main/resources/application.properties

@@ -23,6 +23,10 @@ pagehelper.pageSizeZero=true
 pagehelper.reasonable=false
 pagehelper.params=pageNum=pageHelperStart;pageSize=pageHelperRows;
 pagehelper.supportMethodsArguments=false
+#mybatis-plus配置
+#open开启 close关闭
+mybatis-plus.status=close
+mybatis-plus.mapper-locations=classpath:./mapper_xml/*.xml
 
 
 

src/main/resources/mapper_xml/AccountHeadMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.AccountHeadMapper">
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.AccountHead">
     <!--
@@ -16,6 +16,7 @@
     <result column="BillNo" jdbcType="VARCHAR" property="billno" />
     <result column="BillTime" jdbcType="TIMESTAMP" property="billtime" />
     <result column="Remark" jdbcType="VARCHAR" property="remark" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -89,7 +90,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     Id, Type, OrganId, HandsPersonId, ChangeAmount, TotalPrice, AccountId, BillNo, BillTime, 
-    Remark
+    Remark, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultMap="BaseResultMap">
     <!--
@@ -145,11 +146,11 @@
     insert into jsh_accounthead (Id, Type, OrganId, 
       HandsPersonId, ChangeAmount, TotalPrice, 
       AccountId, BillNo, BillTime, 
-      Remark)
+      Remark, tenant_id)
     values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{organid,jdbcType=BIGINT}, 
-      #{handspersonid,jdbcType=BIGINT}, #{changeamount,jdbcType=DECIMAL}, #{totalprice,jdbcType=DECIMAL},
+      #{handspersonid,jdbcType=BIGINT}, #{changeamount,jdbcType=DECIMAL}, #{totalprice,jdbcType=DECIMAL}, 
       #{accountid,jdbcType=BIGINT}, #{billno,jdbcType=VARCHAR}, #{billtime,jdbcType=TIMESTAMP}, 
-      #{remark,jdbcType=VARCHAR})
+      #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountHead">
     <!--
@@ -188,6 +189,9 @@
       <if test="remark != null">
         Remark,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -220,6 +224,9 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AccountHeadExample" resultType="java.lang.Integer">
@@ -269,6 +276,9 @@
       <if test="record.remark != null">
         Remark = #{record.remark,jdbcType=VARCHAR},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -289,7 +299,8 @@
       AccountId = #{record.accountid,jdbcType=BIGINT},
       BillNo = #{record.billno,jdbcType=VARCHAR},
       BillTime = #{record.billtime,jdbcType=TIMESTAMP},
-      Remark = #{record.remark,jdbcType=VARCHAR}
+      Remark = #{record.remark,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -328,6 +339,9 @@
       <if test="remark != null">
         Remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where Id = #{id,jdbcType=BIGINT}
   </update>
@@ -345,7 +359,8 @@
       AccountId = #{accountid,jdbcType=BIGINT},
       BillNo = #{billno,jdbcType=VARCHAR},
       BillTime = #{billtime,jdbcType=TIMESTAMP},
-      Remark = #{remark,jdbcType=VARCHAR}
+      Remark = #{remark,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/AccountItemMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.AccountItemMapper">
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.AccountItem">
     <!--
@@ -12,6 +12,7 @@
     <result column="InOutItemId" jdbcType="BIGINT" property="inoutitemid" />
     <result column="EachAmount" jdbcType="DECIMAL" property="eachamount" />
     <result column="Remark" jdbcType="VARCHAR" property="remark" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -84,7 +85,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    Id, HeaderId, AccountId, InOutItemId, EachAmount, Remark
+    Id, HeaderId, AccountId, InOutItemId, EachAmount, Remark, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultMap="BaseResultMap">
     <!--
@@ -138,11 +139,11 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into jsh_accountitem (Id, HeaderId, AccountId, 
-      InOutItemId, EachAmount, Remark
+      InOutItemId, EachAmount, Remark, 
-      )
+      tenant_id)
     values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{accountid,jdbcType=BIGINT}, 
-      #{inoutitemid,jdbcType=BIGINT}, #{eachamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}
+      #{inoutitemid,jdbcType=BIGINT}, #{eachamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, 
-      )
+      #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AccountItem">
     <!--
@@ -169,6 +170,9 @@
       <if test="remark != null">
         Remark,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -189,6 +193,9 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AccountItemExample" resultType="java.lang.Integer">
@@ -226,6 +233,9 @@
       <if test="record.remark != null">
         Remark = #{record.remark,jdbcType=VARCHAR},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -242,7 +252,8 @@
       AccountId = #{record.accountid,jdbcType=BIGINT},
       InOutItemId = #{record.inoutitemid,jdbcType=BIGINT},
       EachAmount = #{record.eachamount,jdbcType=DECIMAL},
-      Remark = #{record.remark,jdbcType=VARCHAR}
+      Remark = #{record.remark,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -269,6 +280,9 @@
       <if test="remark != null">
         Remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where Id = #{id,jdbcType=BIGINT}
   </update>
@@ -282,7 +296,8 @@
       AccountId = #{accountid,jdbcType=BIGINT},
       InOutItemId = #{inoutitemid,jdbcType=BIGINT},
       EachAmount = #{eachamount,jdbcType=DECIMAL},
-      Remark = #{remark,jdbcType=VARCHAR}
+      Remark = #{remark,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/AccountMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.AccountMapper">
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Account">
     <!--
@@ -13,6 +13,7 @@
     <result column="CurrentAmount" jdbcType="DECIMAL" property="currentamount" />
     <result column="Remark" jdbcType="VARCHAR" property="remark" />
     <result column="IsDefault" jdbcType="BIT" property="isdefault" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -85,7 +86,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    Id, Name, SerialNo, InitialAmount, CurrentAmount, Remark, IsDefault
+    Id, Name, SerialNo, InitialAmount, CurrentAmount, Remark, IsDefault, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultMap="BaseResultMap">
     <!--
@@ -140,10 +141,10 @@
     -->
     insert into jsh_account (Id, Name, SerialNo, 
       InitialAmount, CurrentAmount, Remark, 
-      IsDefault)
+      IsDefault, tenant_id)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{serialno,jdbcType=VARCHAR}, 
       #{initialamount,jdbcType=DECIMAL}, #{currentamount,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, 
-      #{isdefault,jdbcType=BIT})
+      #{isdefault,jdbcType=BIT}, #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Account">
     <!--
@@ -173,6 +174,9 @@
       <if test="isdefault != null">
         IsDefault,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -196,6 +200,9 @@
       <if test="isdefault != null">
         #{isdefault,jdbcType=BIT},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AccountExample" resultType="java.lang.Integer">
@@ -236,6 +243,9 @@
       <if test="record.isdefault != null">
         IsDefault = #{record.isdefault,jdbcType=BIT},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -253,7 +263,8 @@
       InitialAmount = #{record.initialamount,jdbcType=DECIMAL},
       CurrentAmount = #{record.currentamount,jdbcType=DECIMAL},
       Remark = #{record.remark,jdbcType=VARCHAR},
-      IsDefault = #{record.isdefault,jdbcType=BIT}
+      IsDefault = #{record.isdefault,jdbcType=BIT},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -283,6 +294,9 @@
       <if test="isdefault != null">
         IsDefault = #{isdefault,jdbcType=BIT},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where Id = #{id,jdbcType=BIGINT}
   </update>
@@ -297,7 +311,8 @@
       InitialAmount = #{initialamount,jdbcType=DECIMAL},
       CurrentAmount = #{currentamount,jdbcType=DECIMAL},
       Remark = #{remark,jdbcType=VARCHAR},
-      IsDefault = #{isdefault,jdbcType=BIT}
+      IsDefault = #{isdefault,jdbcType=BIT},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/AssetCategoryMapper.xml

@@ -10,6 +10,7 @@
     <result column="assetname" jdbcType="VARCHAR" property="assetname" />
     <result column="isystem" jdbcType="TINYINT" property="isystem" />
     <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -82,7 +83,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, assetname, isystem, description
+    id, assetname, isystem, description, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.AssetCategoryExample" resultMap="BaseResultMap">
     <!--
@@ -136,9 +137,9 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into jsh_assetcategory (id, assetname, isystem, 
-      description)
+      description, tenant_id)
     values (#{id,jdbcType=BIGINT}, #{assetname,jdbcType=VARCHAR}, #{isystem,jdbcType=TINYINT}, 
-      #{description,jdbcType=VARCHAR})
+      #{description,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AssetCategory">
     <!--
@@ -159,6 +160,9 @@
       <if test="description != null">
         description,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -173,6 +177,9 @@
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.AssetCategoryExample" resultType="java.lang.Integer">
@@ -204,6 +211,9 @@
       <if test="record.description != null">
         description = #{record.description,jdbcType=VARCHAR},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -218,7 +228,8 @@
     set id = #{record.id,jdbcType=BIGINT},
       assetname = #{record.assetname,jdbcType=VARCHAR},
       isystem = #{record.isystem,jdbcType=TINYINT},
-      description = #{record.description,jdbcType=VARCHAR}
+      description = #{record.description,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -239,6 +250,9 @@
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -250,7 +264,8 @@
     update jsh_assetcategory
     set assetname = #{assetname,jdbcType=VARCHAR},
       isystem = #{isystem,jdbcType=TINYINT},
-      description = #{description,jdbcType=VARCHAR}
+      description = #{description,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/AssetMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.AssetMapper">
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Asset">
     <!--
@@ -23,6 +23,7 @@
     <result column="creator" jdbcType="BIGINT" property="creator" />
     <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
     <result column="updator" jdbcType="BIGINT" property="updator" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.jsh.erp.datasource.entities.Asset">
     <!--
@@ -104,7 +105,8 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, assetnameID, location, labels, status, userID, price, purchasedate, periodofvalidity, 
-    warrantydate, assetnum, serialnum, supplier, createtime, creator, updatetime, updator
+    warrantydate, assetnum, serialnum, supplier, createtime, creator, updatetime, updator, 
+    tenant_id
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -191,15 +193,15 @@
       price, purchasedate, periodofvalidity, 
       warrantydate, assetnum, serialnum, 
       supplier, createtime, creator, 
-      updatetime, updator, description, 
+      updatetime, updator, tenant_id, 
-      addMonth)
+      description, addMonth)
     values (#{id,jdbcType=BIGINT}, #{assetnameid,jdbcType=BIGINT}, #{location,jdbcType=VARCHAR}, 
       #{labels,jdbcType=VARCHAR}, #{status,jdbcType=SMALLINT}, #{userid,jdbcType=BIGINT}, 
       #{price,jdbcType=DECIMAL}, #{purchasedate,jdbcType=TIMESTAMP}, #{periodofvalidity,jdbcType=TIMESTAMP}, 
       #{warrantydate,jdbcType=TIMESTAMP}, #{assetnum,jdbcType=VARCHAR}, #{serialnum,jdbcType=VARCHAR}, 
       #{supplier,jdbcType=BIGINT}, #{createtime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, 
-      #{updatetime,jdbcType=TIMESTAMP}, #{updator,jdbcType=BIGINT}, #{description,jdbcType=LONGVARCHAR}, 
+      #{updatetime,jdbcType=TIMESTAMP}, #{updator,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}, 
-      #{addmonth,jdbcType=LONGVARCHAR})
+      #{description,jdbcType=LONGVARCHAR}, #{addmonth,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Asset">
     <!--
@@ -259,6 +261,9 @@
       <if test="updator != null">
         updator,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -318,6 +323,9 @@
       <if test="updator != null">
         #{updator,jdbcType=BIGINT},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -394,6 +402,9 @@
       <if test="record.updator != null">
         updator = #{record.updator,jdbcType=BIGINT},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -428,6 +439,7 @@
       creator = #{record.creator,jdbcType=BIGINT},
       updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
       updator = #{record.updator,jdbcType=BIGINT},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT},
       description = #{record.description,jdbcType=LONGVARCHAR},
       addMonth = #{record.addmonth,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -456,7 +468,8 @@
       createtime = #{record.createtime,jdbcType=TIMESTAMP},
       creator = #{record.creator,jdbcType=BIGINT},
       updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
-      updator = #{record.updator,jdbcType=BIGINT}
+      updator = #{record.updator,jdbcType=BIGINT},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -516,6 +529,9 @@
       <if test="updator != null">
         updator = #{updator,jdbcType=BIGINT},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -547,6 +563,7 @@
       creator = #{creator,jdbcType=BIGINT},
       updatetime = #{updatetime,jdbcType=TIMESTAMP},
       updator = #{updator,jdbcType=BIGINT},
+      tenant_id = #{tenantId,jdbcType=BIGINT},
       description = #{description,jdbcType=LONGVARCHAR},
       addMonth = #{addmonth,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
@@ -572,7 +589,8 @@
       createtime = #{createtime,jdbcType=TIMESTAMP},
       creator = #{creator,jdbcType=BIGINT},
       updatetime = #{updatetime,jdbcType=TIMESTAMP},
-      updator = #{updator,jdbcType=BIGINT}
+      updator = #{updator,jdbcType=BIGINT},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/AssetNameMapper.xml

@@ -11,6 +11,7 @@
     <result column="assetcategoryID" jdbcType="BIGINT" property="assetcategoryid" />
     <result column="isystem" jdbcType="SMALLINT" property="isystem" />
     <result column="isconsumables" jdbcType="SMALLINT" property="isconsumables" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.jsh.erp.datasource.entities.AssetName">
     <!--
@@ -90,7 +91,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, assetname, assetcategoryID, isystem, isconsumables
+    id, assetname, assetcategoryID, isystem, isconsumables, tenant_id
   </sql>
   <sql id="Blob_Column_List">
     <!--
@@ -173,11 +174,11 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into jsh_assetname (id, assetname, assetcategoryID, 
-      isystem, isconsumables, description
+      isystem, isconsumables, tenant_id, 
-      )
+      description)
     values (#{id,jdbcType=BIGINT}, #{assetname,jdbcType=VARCHAR}, #{assetcategoryid,jdbcType=BIGINT}, 
-      #{isystem,jdbcType=SMALLINT}, #{isconsumables,jdbcType=SMALLINT}, #{description,jdbcType=LONGVARCHAR}
+      #{isystem,jdbcType=SMALLINT}, #{isconsumables,jdbcType=SMALLINT}, #{tenantId,jdbcType=BIGINT}, 
-      )
+      #{description,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.AssetName">
     <!--
@@ -201,6 +202,9 @@
       <if test="isconsumables != null">
         isconsumables,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -221,6 +225,9 @@
       <if test="isconsumables != null">
         #{isconsumables,jdbcType=SMALLINT},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -258,6 +265,9 @@
       <if test="record.isconsumables != null">
         isconsumables = #{record.isconsumables,jdbcType=SMALLINT},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -277,6 +287,7 @@
       assetcategoryID = #{record.assetcategoryid,jdbcType=BIGINT},
       isystem = #{record.isystem,jdbcType=SMALLINT},
       isconsumables = #{record.isconsumables,jdbcType=SMALLINT},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT},
       description = #{record.description,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -292,7 +303,8 @@
       assetname = #{record.assetname,jdbcType=VARCHAR},
       assetcategoryID = #{record.assetcategoryid,jdbcType=BIGINT},
       isystem = #{record.isystem,jdbcType=SMALLINT},
-      isconsumables = #{record.isconsumables,jdbcType=SMALLINT}
+      isconsumables = #{record.isconsumables,jdbcType=SMALLINT},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -316,6 +328,9 @@
       <if test="isconsumables != null">
         isconsumables = #{isconsumables,jdbcType=SMALLINT},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -332,6 +347,7 @@
       assetcategoryID = #{assetcategoryid,jdbcType=BIGINT},
       isystem = #{isystem,jdbcType=SMALLINT},
       isconsumables = #{isconsumables,jdbcType=SMALLINT},
+      tenant_id = #{tenantId,jdbcType=BIGINT},
       description = #{description,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -344,7 +360,8 @@
     set assetname = #{assetname,jdbcType=VARCHAR},
       assetcategoryID = #{assetcategoryid,jdbcType=BIGINT},
       isystem = #{isystem,jdbcType=SMALLINT},
-      isconsumables = #{isconsumables,jdbcType=SMALLINT}
+      isconsumables = #{isconsumables,jdbcType=SMALLINT},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/DepotHeadMapper.xml

@@ -35,6 +35,7 @@
     <result column="AccountDay" jdbcType="INTEGER" property="accountday" />
     <result column="Status" jdbcType="VARCHAR" property="status" />
     <result column="LinkNumber" jdbcType="VARCHAR" property="linknumber" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -111,7 +112,7 @@
     OperTime, OrganId, HandsPersonId, AccountId, ChangeAmount, AllocationProjectId, TotalPrice, 
     PayType, Remark, Salesman, AccountIdList, AccountMoneyList, Discount, DiscountMoney, 
     DiscountLastMoney, OtherMoney, OtherMoneyList, OtherMoneyItem, AccountDay, Status, 
-    LinkNumber
+    LinkNumber, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultMap="BaseResultMap">
     <!--
@@ -173,7 +174,8 @@
       AccountIdList, AccountMoneyList, Discount, 
       DiscountMoney, DiscountLastMoney, OtherMoney, 
       OtherMoneyList, OtherMoneyItem, AccountDay, 
-      Status, LinkNumber)
+      Status, LinkNumber, tenant_id
+      )
     values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{subtype,jdbcType=VARCHAR}, 
       #{projectid,jdbcType=BIGINT}, #{defaultnumber,jdbcType=VARCHAR}, #{number,jdbcType=VARCHAR}, 
       #{operpersonname,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{opertime,jdbcType=TIMESTAMP}, 
@@ -183,7 +185,8 @@
       #{accountidlist,jdbcType=VARCHAR}, #{accountmoneylist,jdbcType=VARCHAR}, #{discount,jdbcType=DECIMAL}, 
       #{discountmoney,jdbcType=DECIMAL}, #{discountlastmoney,jdbcType=DECIMAL}, #{othermoney,jdbcType=DECIMAL}, 
       #{othermoneylist,jdbcType=VARCHAR}, #{othermoneyitem,jdbcType=VARCHAR}, #{accountday,jdbcType=INTEGER}, 
-      #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR})
+      #{status,jdbcType=VARCHAR}, #{linknumber,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotHead">
     <!--
@@ -279,6 +282,9 @@
       <if test="linknumber != null">
         LinkNumber,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -368,6 +374,9 @@
       <if test="linknumber != null">
         #{linknumber,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotHeadExample" resultType="java.lang.Integer">
@@ -474,6 +483,9 @@
       <if test="record.linknumber != null">
         LinkNumber = #{record.linknumber,jdbcType=VARCHAR},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -513,7 +525,8 @@
       OtherMoneyItem = #{record.othermoneyitem,jdbcType=VARCHAR},
       AccountDay = #{record.accountday,jdbcType=INTEGER},
       Status = #{record.status,jdbcType=VARCHAR},
-      LinkNumber = #{record.linknumber,jdbcType=VARCHAR}
+      LinkNumber = #{record.linknumber,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -609,6 +622,9 @@
       <if test="linknumber != null">
         LinkNumber = #{linknumber,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where Id = #{id,jdbcType=BIGINT}
   </update>
@@ -645,7 +661,8 @@
       OtherMoneyItem = #{othermoneyitem,jdbcType=VARCHAR},
       AccountDay = #{accountday,jdbcType=INTEGER},
       Status = #{status,jdbcType=VARCHAR},
-      LinkNumber = #{linknumber,jdbcType=VARCHAR}
+      LinkNumber = #{linknumber,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/DepotItemMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.DepotItemMapper">
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.DepotItem">
     <!--
@@ -29,6 +29,7 @@
     <result column="OtherField4" jdbcType="VARCHAR" property="otherfield4" />
     <result column="OtherField5" jdbcType="VARCHAR" property="otherfield5" />
     <result column="MType" jdbcType="VARCHAR" property="mtype" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -103,7 +104,7 @@
     -->
     Id, HeaderId, MaterialId, MUnit, OperNumber, BasicNumber, UnitPrice, TaxUnitPrice, 
     AllPrice, Remark, Img, Incidentals, DepotId, AnotherDepotId, TaxRate, TaxMoney, TaxLastMoney, 
-    OtherField1, OtherField2, OtherField3, OtherField4, OtherField5, MType
+    OtherField1, OtherField2, OtherField3, OtherField4, OtherField5, MType, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="BaseResultMap">
     <!--
@@ -163,7 +164,8 @@
       DepotId, AnotherDepotId, TaxRate, 
       TaxMoney, TaxLastMoney, OtherField1, 
       OtherField2, OtherField3, OtherField4, 
-      OtherField5, MType)
+      OtherField5, MType, tenant_id
+      )
     values (#{id,jdbcType=BIGINT}, #{headerid,jdbcType=BIGINT}, #{materialid,jdbcType=BIGINT}, 
       #{munit,jdbcType=VARCHAR}, #{opernumber,jdbcType=DECIMAL}, #{basicnumber,jdbcType=DECIMAL}, 
       #{unitprice,jdbcType=DECIMAL}, #{taxunitprice,jdbcType=DECIMAL}, #{allprice,jdbcType=DECIMAL}, 
@@ -171,7 +173,8 @@
       #{depotid,jdbcType=BIGINT}, #{anotherdepotid,jdbcType=BIGINT}, #{taxrate,jdbcType=DECIMAL}, 
       #{taxmoney,jdbcType=DECIMAL}, #{taxlastmoney,jdbcType=DECIMAL}, #{otherfield1,jdbcType=VARCHAR}, 
       #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}, #{otherfield4,jdbcType=VARCHAR}, 
-      #{otherfield5,jdbcType=VARCHAR}, #{mtype,jdbcType=VARCHAR})
+      #{otherfield5,jdbcType=VARCHAR}, #{mtype,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.DepotItem">
     <!--
@@ -249,6 +252,9 @@
       <if test="mtype != null">
         MType,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -320,6 +326,9 @@
       <if test="mtype != null">
         #{mtype,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultType="java.lang.Integer">
@@ -408,6 +417,9 @@
       <if test="record.mtype != null">
         MType = #{record.mtype,jdbcType=VARCHAR},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -441,7 +453,8 @@
       OtherField3 = #{record.otherfield3,jdbcType=VARCHAR},
       OtherField4 = #{record.otherfield4,jdbcType=VARCHAR},
       OtherField5 = #{record.otherfield5,jdbcType=VARCHAR},
-      MType = #{record.mtype,jdbcType=VARCHAR}
+      MType = #{record.mtype,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -519,6 +532,9 @@
       <if test="mtype != null">
         MType = #{mtype,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where Id = #{id,jdbcType=BIGINT}
   </update>
@@ -549,7 +565,8 @@
       OtherField3 = #{otherfield3,jdbcType=VARCHAR},
       OtherField4 = #{otherfield4,jdbcType=VARCHAR},
       OtherField5 = #{otherfield5,jdbcType=VARCHAR},
-      MType = #{mtype,jdbcType=VARCHAR}
+      MType = #{mtype,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/DepotMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.DepotMapper">
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Depot">
     <!--
@@ -15,6 +15,7 @@
     <result column="sort" jdbcType="VARCHAR" property="sort" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
     <result column="principal" jdbcType="BIGINT" property="principal" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -87,7 +88,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, name, address, warehousing, truckage, type, sort, remark, principal
+    id, name, address, warehousing, truckage, type, sort, remark, principal, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultMap="BaseResultMap">
     <!--
@@ -142,12 +143,12 @@
     -->
     insert into jsh_depot (id, name, address, 
       warehousing, truckage, type, 
-      sort, remark, principal
+      sort, remark, principal, 
-      )
+      tenant_id)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, 
       #{warehousing,jdbcType=DECIMAL}, #{truckage,jdbcType=DECIMAL}, #{type,jdbcType=INTEGER}, 
-      #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{principal,jdbcType=BIGINT}
+      #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{principal,jdbcType=BIGINT}, 
-      )
+      #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Depot">
     <!--
@@ -183,6 +184,9 @@
       <if test="principal != null">
         principal,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -212,6 +216,9 @@
       <if test="principal != null">
         #{principal,jdbcType=BIGINT},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.DepotExample" resultType="java.lang.Integer">
@@ -258,6 +265,9 @@
       <if test="record.principal != null">
         principal = #{record.principal,jdbcType=BIGINT},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -277,7 +287,8 @@
       type = #{record.type,jdbcType=INTEGER},
       sort = #{record.sort,jdbcType=VARCHAR},
       remark = #{record.remark,jdbcType=VARCHAR},
-      principal = #{record.principal,jdbcType=BIGINT}
+      principal = #{record.principal,jdbcType=BIGINT},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -313,6 +324,9 @@
       <if test="principal != null">
         principal = #{principal,jdbcType=BIGINT},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -329,7 +343,8 @@
       type = #{type,jdbcType=INTEGER},
       sort = #{sort,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
-      principal = #{principal,jdbcType=BIGINT}
+      principal = #{principal,jdbcType=BIGINT},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/InOutItemMapper.xml

@@ -10,6 +10,7 @@
     <result column="Name" jdbcType="VARCHAR" property="name" />
     <result column="Type" jdbcType="VARCHAR" property="type" />
     <result column="Remark" jdbcType="VARCHAR" property="remark" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -82,7 +83,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    Id, Name, Type, Remark
+    Id, Name, Type, Remark, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultMap="BaseResultMap">
     <!--
@@ -136,9 +137,9 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into jsh_inoutitem (Id, Name, Type, 
-      Remark)
+      Remark, tenant_id)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
-      #{remark,jdbcType=VARCHAR})
+      #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.InOutItem">
     <!--
@@ -159,6 +160,9 @@
       <if test="remark != null">
         Remark,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -173,6 +177,9 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.InOutItemExample" resultType="java.lang.Integer">
@@ -204,6 +211,9 @@
       <if test="record.remark != null">
         Remark = #{record.remark,jdbcType=VARCHAR},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -218,7 +228,8 @@
     set Id = #{record.id,jdbcType=BIGINT},
       Name = #{record.name,jdbcType=VARCHAR},
       Type = #{record.type,jdbcType=VARCHAR},
-      Remark = #{record.remark,jdbcType=VARCHAR}
+      Remark = #{record.remark,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -239,6 +250,9 @@
       <if test="remark != null">
         Remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where Id = #{id,jdbcType=BIGINT}
   </update>
@@ -250,7 +264,8 @@
     update jsh_inoutitem
     set Name = #{name,jdbcType=VARCHAR},
       Type = #{type,jdbcType=VARCHAR},
-      Remark = #{remark,jdbcType=VARCHAR}
+      Remark = #{remark,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/LogMapper.xml

@@ -14,6 +14,7 @@
     <result column="status" jdbcType="TINYINT" property="status" />
     <result column="contentdetails" jdbcType="VARCHAR" property="contentdetails" />
     <result column="remark" jdbcType="VARCHAR" property="remark" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -86,7 +87,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, userID, operation, clientIP, createtime, status, contentdetails, remark
+    id, userID, operation, clientIP, createtime, status, contentdetails, remark, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.LogExample" resultMap="BaseResultMap">
     <!--
@@ -141,10 +142,12 @@
     -->
     insert into jsh_log (id, userID, operation, 
       clientIP, createtime, status, 
-      contentdetails, remark)
+      contentdetails, remark, tenant_id
+      )
     values (#{id,jdbcType=BIGINT}, #{userid,jdbcType=BIGINT}, #{operation,jdbcType=VARCHAR}, 
       #{clientip,jdbcType=VARCHAR}, #{createtime,jdbcType=TIMESTAMP}, #{status,jdbcType=TINYINT}, 
-      #{contentdetails,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR})
+      #{contentdetails,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Log">
     <!--
@@ -177,6 +180,9 @@
       <if test="remark != null">
         remark,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -203,6 +209,9 @@
       <if test="remark != null">
         #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.LogExample" resultType="java.lang.Integer">
@@ -246,6 +255,9 @@
       <if test="record.remark != null">
         remark = #{record.remark,jdbcType=VARCHAR},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -264,7 +276,8 @@
       createtime = #{record.createtime,jdbcType=TIMESTAMP},
       status = #{record.status,jdbcType=TINYINT},
       contentdetails = #{record.contentdetails,jdbcType=VARCHAR},
-      remark = #{record.remark,jdbcType=VARCHAR}
+      remark = #{record.remark,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -297,6 +310,9 @@
       <if test="remark != null">
         remark = #{remark,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -312,7 +328,8 @@
       createtime = #{createtime,jdbcType=TIMESTAMP},
       status = #{status,jdbcType=TINYINT},
       contentdetails = #{contentdetails,jdbcType=VARCHAR},
-      remark = #{remark,jdbcType=VARCHAR}
+      remark = #{remark,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/MaterialCategoryMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.MaterialCategoryMapper">
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.MaterialCategory">
     <!--
@@ -18,6 +18,7 @@
     <result column="creator" jdbcType="BIGINT" property="creator" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="updater" jdbcType="BIGINT" property="updater" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -91,7 +92,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     Id, Name, CategoryLevel, ParentId, sort, status, serial_no, remark, create_time, 
-    creator, update_time, updater
+    creator, update_time, updater, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultMap="BaseResultMap">
     <!--
@@ -147,13 +148,13 @@
     insert into jsh_materialcategory (Id, Name, CategoryLevel, 
       ParentId, sort, status, 
       serial_no, remark, create_time, 
-      creator, update_time, updater
+      creator, update_time, updater, 
-      )
+      tenant_id)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{categorylevel,jdbcType=SMALLINT}, 
       #{parentid,jdbcType=BIGINT}, #{sort,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, 
       #{serialNo,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{updater,jdbcType=BIGINT}
+      #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{updater,jdbcType=BIGINT}, 
-      )
+      #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.MaterialCategory">
     <!--
@@ -198,6 +199,9 @@
       <if test="updater != null">
         updater,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -236,6 +240,9 @@
       <if test="updater != null">
         #{updater,jdbcType=BIGINT},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.MaterialCategoryExample" resultType="java.lang.Integer">
@@ -291,6 +298,9 @@
       <if test="record.updater != null">
         updater = #{record.updater,jdbcType=BIGINT},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -313,7 +323,8 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       creator = #{record.creator,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      updater = #{record.updater,jdbcType=BIGINT}
+      updater = #{record.updater,jdbcType=BIGINT},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -358,6 +369,9 @@
       <if test="updater != null">
         updater = #{updater,jdbcType=BIGINT},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where Id = #{id,jdbcType=BIGINT}
   </update>
@@ -377,7 +391,8 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       creator = #{creator,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      updater = #{updater,jdbcType=BIGINT}
+      updater = #{updater,jdbcType=BIGINT},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/MaterialMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.MaterialMapper">
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Material">
     <!--
@@ -29,7 +29,8 @@
     <result column="OtherField1" jdbcType="VARCHAR" property="otherfield1" />
     <result column="OtherField2" jdbcType="VARCHAR" property="otherfield2" />
     <result column="OtherField3" jdbcType="VARCHAR" property="otherfield3" />
-    <result column="enableSerialNumber" jdbcType="VARCHAR" property="enableSerialNumber" />
+    <result column="enableSerialNumber" jdbcType="VARCHAR" property="enableserialnumber" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -104,7 +105,8 @@
     -->
     Id, CategoryId, Name, Mfrs, Packing, SafetyStock, Model, Standard, Color, Unit, Remark, 
     RetailPrice, LowPrice, PresetPriceOne, PresetPriceTwo, UnitId, FirstOutUnit, FirstInUnit, 
-    PriceStrategy, Enabled, OtherField1, OtherField2, OtherField3,enableSerialNumber
+    PriceStrategy, Enabled, OtherField1, OtherField2, OtherField3, enableSerialNumber, 
+    tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.MaterialExample" resultMap="BaseResultMap">
     <!--
@@ -164,7 +166,8 @@
       LowPrice, PresetPriceOne, PresetPriceTwo, 
       UnitId, FirstOutUnit, FirstInUnit, 
       PriceStrategy, Enabled, OtherField1, 
-      OtherField2, OtherField3,enableSerialNumber)
+      OtherField2, OtherField3, enableSerialNumber, 
+      tenant_id)
     values (#{id,jdbcType=BIGINT}, #{categoryid,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
       #{mfrs,jdbcType=VARCHAR}, #{packing,jdbcType=DECIMAL}, #{safetystock,jdbcType=DECIMAL}, 
       #{model,jdbcType=VARCHAR}, #{standard,jdbcType=VARCHAR}, #{color,jdbcType=VARCHAR}, 
@@ -172,7 +175,8 @@
       #{lowprice,jdbcType=DECIMAL}, #{presetpriceone,jdbcType=DECIMAL}, #{presetpricetwo,jdbcType=DECIMAL}, 
       #{unitid,jdbcType=BIGINT}, #{firstoutunit,jdbcType=VARCHAR}, #{firstinunit,jdbcType=VARCHAR}, 
       #{pricestrategy,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, #{otherfield1,jdbcType=VARCHAR}, 
-      #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR},#{enableSerialNumber,jdbcType=VARCHAR})
+      #{otherfield2,jdbcType=VARCHAR}, #{otherfield3,jdbcType=VARCHAR}, #{enableserialnumber,jdbcType=VARCHAR}, 
+      #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Material">
     <!--
@@ -250,9 +254,12 @@
       <if test="otherfield3 != null">
         OtherField3,
       </if>
-      <if test="enableSerialNumber != null">
+      <if test="enableserialnumber != null">
         enableSerialNumber,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -324,8 +331,11 @@
       <if test="otherfield3 != null">
         #{otherfield3,jdbcType=VARCHAR},
       </if>
-      <if test="enableSerialNumber != null">
+      <if test="enableserialnumber != null">
-        #{enableSerialNumber,jdbcType=VARCHAR},
+        #{enableserialnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
       </if>
     </trim>
   </insert>
@@ -415,8 +425,11 @@
       <if test="record.otherfield3 != null">
         OtherField3 = #{record.otherfield3,jdbcType=VARCHAR},
       </if>
-      <if test="record.enableSerialNumber != null">
+      <if test="record.enableserialnumber != null">
-        enableSerialNumber = #{record.enableSerialNumber,jdbcType=VARCHAR},
+        enableSerialNumber = #{record.enableserialnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
       </if>
     </set>
     <if test="_parameter != null">
@@ -451,8 +464,9 @@
       Enabled = #{record.enabled,jdbcType=BIT},
       OtherField1 = #{record.otherfield1,jdbcType=VARCHAR},
       OtherField2 = #{record.otherfield2,jdbcType=VARCHAR},
-      OtherField3 = #{record.otherfield3,jdbcType=VARCHAR}
+      OtherField3 = #{record.otherfield3,jdbcType=VARCHAR},
-      enableSerialNumber = #{record.enableSerialNumber,jdbcType=VARCHAR}
+      enableSerialNumber = #{record.enableserialnumber,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -530,8 +544,11 @@
       <if test="otherfield3 != null">
         OtherField3 = #{otherfield3,jdbcType=VARCHAR},
       </if>
-      <if test="enableSerialNumber != null">
+      <if test="enableserialnumber != null">
-        enableSerialNumber = #{enableSerialNumber,jdbcType=VARCHAR},
+        enableSerialNumber = #{enableserialnumber,jdbcType=VARCHAR},
+      </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
       </if>
     </set>
     where Id = #{id,jdbcType=BIGINT}
@@ -563,8 +580,9 @@
       Enabled = #{enabled,jdbcType=BIT},
       OtherField1 = #{otherfield1,jdbcType=VARCHAR},
       OtherField2 = #{otherfield2,jdbcType=VARCHAR},
-      OtherField3 = #{otherfield3,jdbcType=VARCHAR}
+      OtherField3 = #{otherfield3,jdbcType=VARCHAR},
-      enableSerialNumber = #{enableSerialNumber,jdbcType=VARCHAR}
+      enableSerialNumber = #{enableserialnumber,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/OrgaUserRelMapper.xml

@@ -1,44 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.jsh.erp.datasource.mappers.OrgaUserRelMapper" >
+<mapper namespace="com.jsh.erp.datasource.mappers.OrgaUserRelMapper">
-  <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.OrgaUserRel" >
+  <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.OrgaUserRel">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <id column="id" property="id" jdbcType="BIGINT" />
+    <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="orga_id" property="orgaId" jdbcType="BIGINT" />
+    <result column="orga_id" jdbcType="BIGINT" property="orgaId" />
-    <result column="user_id" property="userId" jdbcType="BIGINT" />
+    <result column="user_id" jdbcType="BIGINT" property="userId" />
-    <result column="user_blng_orga_dspl_seq" property="userBlngOrgaDsplSeq" jdbcType="VARCHAR" />
+    <result column="user_blng_orga_dspl_seq" jdbcType="VARCHAR" property="userBlngOrgaDsplSeq" />
-    <result column="delete_flag" property="deleteFlag" jdbcType="CHAR" />
+    <result column="delete_flag" jdbcType="CHAR" property="deleteFlag" />
-    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="creator" property="creator" jdbcType="BIGINT" />
+    <result column="creator" jdbcType="BIGINT" property="creator" />
-    <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
-    <result column="updater" property="updater" jdbcType="BIGINT" />
+    <result column="updater" jdbcType="BIGINT" property="updater" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
-  <sql id="Example_Where_Clause" >
+  <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <where >
+    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
+      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -49,29 +50,29 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Update_By_Example_Where_Clause" >
+  <sql id="Update_By_Example_Where_Clause">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    <where >
+    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid" >
+        <if test="criteria.valid">
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
+          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion" >
+            <foreach collection="criteria.criteria" item="criterion">
-              <choose >
+              <choose>
-                <when test="criterion.noValue" >
+                <when test="criterion.noValue">
                   and ${criterion.condition}
                 </when>
-                <when test="criterion.singleValue" >
+                <when test="criterion.singleValue">
                   and ${criterion.condition} #{criterion.value}
                 </when>
-                <when test="criterion.betweenValue" >
+                <when test="criterion.betweenValue">
                   and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
                 </when>
-                <when test="criterion.listValue" >
+                <when test="criterion.listValue">
                   and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
                     #{listItem}
                   </foreach>
                 </when>
@@ -82,33 +83,33 @@
       </foreach>
     </where>
   </sql>
-  <sql id="Base_Column_List" >
+  <sql id="Base_Column_List">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, orga_id, user_id, user_blng_orga_dspl_seq, delete_flag, create_time, creator, 
-    update_time, updater
+    update_time, updater, tenant_id
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.jsh.erp.datasource.entities.OrgaUserRelExample" >
+  <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.OrgaUserRelExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select
-    <if test="distinct" >
+    <if test="distinct">
       distinct
     </if>
     <include refid="Base_Column_List" />
     from jsh_orga_user_rel
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
-    <if test="orderByClause != null" >
+    <if test="orderByClause != null">
       order by ${orderByClause}
     </if>
   </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -118,7 +119,7 @@
     from jsh_orga_user_rel
     where id = #{id,jdbcType=BIGINT}
   </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -126,145 +127,154 @@
     delete from jsh_orga_user_rel
     where id = #{id,jdbcType=BIGINT}
   </delete>
-  <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.OrgaUserRelExample" >
+  <delete id="deleteByExample" parameterType="com.jsh.erp.datasource.entities.OrgaUserRelExample">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     delete from jsh_orga_user_rel
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.OrgaUserRel" >
+  <insert id="insert" parameterType="com.jsh.erp.datasource.entities.OrgaUserRel">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into jsh_orga_user_rel (id, orga_id, user_id, 
       user_blng_orga_dspl_seq, delete_flag, create_time, 
-      creator, update_time, updater
+      creator, update_time, updater, 
-      )
+      tenant_id)
     values (#{id,jdbcType=BIGINT}, #{orgaId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, 
       #{userBlngOrgaDsplSeq,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, 
-      #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{updater,jdbcType=BIGINT}
+      #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{updater,jdbcType=BIGINT}, 
-      )
+      #{tenantId,jdbcType=BIGINT})
   </insert>
-  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.OrgaUserRel" >
+  <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.OrgaUserRel">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into jsh_orga_user_rel
-    <trim prefix="(" suffix=")" suffixOverrides="," >
+    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null" >
+      <if test="id != null">
         id,
       </if>
-      <if test="orgaId != null" >
+      <if test="orgaId != null">
         orga_id,
       </if>
-      <if test="userId != null" >
+      <if test="userId != null">
         user_id,
       </if>
-      <if test="userBlngOrgaDsplSeq != null" >
+      <if test="userBlngOrgaDsplSeq != null">
         user_blng_orga_dspl_seq,
       </if>
-      <if test="deleteFlag != null" >
+      <if test="deleteFlag != null">
         delete_flag,
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null">
         create_time,
       </if>
-      <if test="creator != null" >
+      <if test="creator != null">
         creator,
       </if>
-      <if test="updateTime != null" >
+      <if test="updateTime != null">
         update_time,
       </if>
-      <if test="updater != null" >
+      <if test="updater != null">
         updater,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null" >
+      <if test="id != null">
         #{id,jdbcType=BIGINT},
       </if>
-      <if test="orgaId != null" >
+      <if test="orgaId != null">
         #{orgaId,jdbcType=BIGINT},
       </if>
-      <if test="userId != null" >
+      <if test="userId != null">
         #{userId,jdbcType=BIGINT},
       </if>
-      <if test="userBlngOrgaDsplSeq != null" >
+      <if test="userBlngOrgaDsplSeq != null">
         #{userBlngOrgaDsplSeq,jdbcType=VARCHAR},
       </if>
-      <if test="deleteFlag != null" >
+      <if test="deleteFlag != null">
         #{deleteFlag,jdbcType=CHAR},
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="creator != null" >
+      <if test="creator != null">
         #{creator,jdbcType=BIGINT},
       </if>
-      <if test="updateTime != null" >
+      <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updater != null" >
+      <if test="updater != null">
         #{updater,jdbcType=BIGINT},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
-  <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.OrgaUserRelExample" resultType="java.lang.Integer" >
+  <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.OrgaUserRelExample" resultType="java.lang.Integer">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     select count(*) from jsh_orga_user_rel
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByExampleSelective" parameterType="map" >
+  <update id="updateByExampleSelective" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update jsh_orga_user_rel
-    <set >
+    <set>
-      <if test="record.id != null" >
+      <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
-      <if test="record.orgaId != null" >
+      <if test="record.orgaId != null">
         orga_id = #{record.orgaId,jdbcType=BIGINT},
       </if>
-      <if test="record.userId != null" >
+      <if test="record.userId != null">
         user_id = #{record.userId,jdbcType=BIGINT},
       </if>
-      <if test="record.userBlngOrgaDsplSeq != null" >
+      <if test="record.userBlngOrgaDsplSeq != null">
         user_blng_orga_dspl_seq = #{record.userBlngOrgaDsplSeq,jdbcType=VARCHAR},
       </if>
-      <if test="record.deleteFlag != null" >
+      <if test="record.deleteFlag != null">
         delete_flag = #{record.deleteFlag,jdbcType=CHAR},
       </if>
-      <if test="record.createTime != null" >
+      <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.creator != null" >
+      <if test="record.creator != null">
         creator = #{record.creator,jdbcType=BIGINT},
       </if>
-      <if test="record.updateTime != null" >
+      <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.updater != null" >
+      <if test="record.updater != null">
         updater = #{record.updater,jdbcType=BIGINT},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
-    <if test="_parameter != null" >
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByExample" parameterType="map" >
+  <update id="updateByExample" parameterType="map">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -278,46 +288,50 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       creator = #{record.creator,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
-      updater = #{record.updater,jdbcType=BIGINT}
+      updater = #{record.updater,jdbcType=BIGINT},
-    <if test="_parameter != null" >
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
+    <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.OrgaUserRel" >
+  <update id="updateByPrimaryKeySelective" parameterType="com.jsh.erp.datasource.entities.OrgaUserRel">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     update jsh_orga_user_rel
-    <set >
+    <set>
-      <if test="orgaId != null" >
+      <if test="orgaId != null">
         orga_id = #{orgaId,jdbcType=BIGINT},
       </if>
-      <if test="userId != null" >
+      <if test="userId != null">
         user_id = #{userId,jdbcType=BIGINT},
       </if>
-      <if test="userBlngOrgaDsplSeq != null" >
+      <if test="userBlngOrgaDsplSeq != null">
         user_blng_orga_dspl_seq = #{userBlngOrgaDsplSeq,jdbcType=VARCHAR},
       </if>
-      <if test="deleteFlag != null" >
+      <if test="deleteFlag != null">
         delete_flag = #{deleteFlag,jdbcType=CHAR},
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="creator != null" >
+      <if test="creator != null">
         creator = #{creator,jdbcType=BIGINT},
       </if>
-      <if test="updateTime != null" >
+      <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updater != null" >
+      <if test="updater != null">
         updater = #{updater,jdbcType=BIGINT},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.OrgaUserRel" >
+  <update id="updateByPrimaryKey" parameterType="com.jsh.erp.datasource.entities.OrgaUserRel">
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
@@ -330,7 +344,8 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       creator = #{creator,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
-      updater = #{updater,jdbcType=BIGINT}
+      updater = #{updater,jdbcType=BIGINT},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/OrganizationMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.OrganizationMapper">
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Organization">
     <!--
@@ -21,6 +21,7 @@
     <result column="updater" jdbcType="BIGINT" property="updater" />
     <result column="org_create_time" jdbcType="TIMESTAMP" property="orgCreateTime" />
     <result column="org_stop_time" jdbcType="TIMESTAMP" property="orgStopTime" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -94,7 +95,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, org_no, org_full_name, org_abr, org_tpcd, org_stcd, org_parent_no, sort, remark, 
-    create_time, creator, update_time, updater, org_create_time, org_stop_time
+    create_time, creator, update_time, updater, org_create_time, org_stop_time, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.OrganizationExample" resultMap="BaseResultMap">
     <!--
@@ -151,14 +152,14 @@
       org_abr, org_tpcd, org_stcd, 
       org_parent_no, sort, remark, 
       create_time, creator, update_time, 
-      updater, org_create_time, org_stop_time
+      updater, org_create_time, org_stop_time, 
-      )
+      tenant_id)
     values (#{id,jdbcType=BIGINT}, #{orgNo,jdbcType=VARCHAR}, #{orgFullName,jdbcType=VARCHAR}, 
       #{orgAbr,jdbcType=VARCHAR}, #{orgTpcd,jdbcType=VARCHAR}, #{orgStcd,jdbcType=CHAR}, 
       #{orgParentNo,jdbcType=VARCHAR}, #{sort,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{updater,jdbcType=BIGINT}, #{orgCreateTime,jdbcType=TIMESTAMP}, #{orgStopTime,jdbcType=TIMESTAMP}
+      #{updater,jdbcType=BIGINT}, #{orgCreateTime,jdbcType=TIMESTAMP}, #{orgStopTime,jdbcType=TIMESTAMP}, 
-      )
+      #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Organization">
     <!--
@@ -212,6 +213,9 @@
       <if test="orgStopTime != null">
         org_stop_time,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -259,6 +263,9 @@
       <if test="orgStopTime != null">
         #{orgStopTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.OrganizationExample" resultType="java.lang.Integer">
@@ -323,6 +330,9 @@
       <if test="record.orgStopTime != null">
         org_stop_time = #{record.orgStopTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -348,7 +358,8 @@
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       updater = #{record.updater,jdbcType=BIGINT},
       org_create_time = #{record.orgCreateTime,jdbcType=TIMESTAMP},
-      org_stop_time = #{record.orgStopTime,jdbcType=TIMESTAMP}
+      org_stop_time = #{record.orgStopTime,jdbcType=TIMESTAMP},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -402,6 +413,9 @@
       <if test="orgStopTime != null">
         org_stop_time = #{orgStopTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -424,7 +438,8 @@
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       updater = #{updater,jdbcType=BIGINT},
       org_create_time = #{orgCreateTime,jdbcType=TIMESTAMP},
-      org_stop_time = #{orgStopTime,jdbcType=TIMESTAMP}
+      org_stop_time = #{orgStopTime,jdbcType=TIMESTAMP},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/PersonMapper.xml

@@ -9,6 +9,7 @@
     <id column="Id" jdbcType="BIGINT" property="id" />
     <result column="Type" jdbcType="VARCHAR" property="type" />
     <result column="Name" jdbcType="VARCHAR" property="name" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -81,7 +82,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    Id, Type, Name
+    Id, Type, Name, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultMap="BaseResultMap">
     <!--
@@ -134,10 +135,10 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    insert into jsh_person (Id, Type, Name
+    insert into jsh_person (Id, Type, Name, 
-      )
+      tenant_id)
-    values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}
+    values (#{id,jdbcType=BIGINT}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
-      )
+      #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Person">
     <!--
@@ -155,6 +156,9 @@
       <if test="name != null">
         Name,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -166,6 +170,9 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.PersonExample" resultType="java.lang.Integer">
@@ -194,6 +201,9 @@
       <if test="record.name != null">
         Name = #{record.name,jdbcType=VARCHAR},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -207,7 +217,8 @@
     update jsh_person
     set Id = #{record.id,jdbcType=BIGINT},
       Type = #{record.type,jdbcType=VARCHAR},
-      Name = #{record.name,jdbcType=VARCHAR}
+      Name = #{record.name,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -225,6 +236,9 @@
       <if test="name != null">
         Name = #{name,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where Id = #{id,jdbcType=BIGINT}
   </update>
@@ -235,7 +249,8 @@
     -->
     update jsh_person
     set Type = #{type,jdbcType=VARCHAR},
-      Name = #{name,jdbcType=VARCHAR}
+      Name = #{name,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/RoleMapper.xml

@@ -11,6 +11,7 @@
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="value" jdbcType="VARCHAR" property="value" />
     <result column="description" jdbcType="VARCHAR" property="description" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -83,7 +84,7 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    Id, Name, type, value, description
+    Id, Name, type, value, description, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultMap="BaseResultMap">
     <!--
@@ -137,9 +138,11 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     insert into jsh_role (Id, Name, type, 
-      value, description)
+      value, description, tenant_id
+      )
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
-      #{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR})
+      #{value,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Role">
     <!--
@@ -163,6 +166,9 @@
       <if test="description != null">
         description,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -180,6 +186,9 @@
       <if test="description != null">
         #{description,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.RoleExample" resultType="java.lang.Integer">
@@ -214,6 +223,9 @@
       <if test="record.description != null">
         description = #{record.description,jdbcType=VARCHAR},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -229,7 +241,8 @@
       Name = #{record.name,jdbcType=VARCHAR},
       type = #{record.type,jdbcType=VARCHAR},
       value = #{record.value,jdbcType=VARCHAR},
-      description = #{record.description,jdbcType=VARCHAR}
+      description = #{record.description,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -253,6 +266,9 @@
       <if test="description != null">
         description = #{description,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where Id = #{id,jdbcType=BIGINT}
   </update>
@@ -265,7 +281,8 @@
     set Name = #{name,jdbcType=VARCHAR},
       type = #{type,jdbcType=VARCHAR},
       value = #{value,jdbcType=VARCHAR},
-      description = #{description,jdbcType=VARCHAR}
+      description = #{description,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where Id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/SerialNumberMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.SerialNumberMapper">
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.SerialNumber">
     <!--
@@ -17,6 +17,7 @@
     <result column="update_Time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="updater" jdbcType="BIGINT" property="updater" />
     <result column="depothead_Id" jdbcType="BIGINT" property="depotheadId" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -90,7 +91,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
     id, material_Id, serial_Number, is_Sell, remark, delete_Flag, create_Time, creator, 
-    update_Time, updater,depothead_Id
+    update_Time, updater, depothead_Id, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample" resultMap="BaseResultMap">
     <!--
@@ -146,11 +147,13 @@
     insert into jsh_serial_number (id, material_Id, serial_Number, 
       is_Sell, remark, delete_Flag, 
       create_Time, creator, update_Time, 
-      updater,depothead_Id)
+      updater, depothead_Id, tenant_id
+      )
     values (#{id,jdbcType=BIGINT}, #{materialId,jdbcType=BIGINT}, #{serialNumber,jdbcType=VARCHAR}, 
-      #{isSell,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR},
+      #{isSell,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{deleteFlag,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{creator,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{updater,jdbcType=BIGINT},#{depotheadId,jdbcType=BIGINT})
+      #{updater,jdbcType=BIGINT}, #{depotheadId,jdbcType=BIGINT}, #{tenantId,jdbcType=BIGINT}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SerialNumber">
     <!--
@@ -192,6 +195,9 @@
       <if test="depotheadId != null">
         depothead_Id,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -227,6 +233,9 @@
       <if test="depotheadId != null">
         #{depotheadId,jdbcType=BIGINT},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SerialNumberExample" resultType="java.lang.Integer">
@@ -279,6 +288,9 @@
       <if test="record.depotheadId != null">
         depothead_Id = #{record.depotheadId,jdbcType=BIGINT},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -300,7 +312,8 @@
       creator = #{record.creator,jdbcType=BIGINT},
       update_Time = #{record.updateTime,jdbcType=TIMESTAMP},
       updater = #{record.updater,jdbcType=BIGINT},
-      depothead_Id = #{record.depotheadId,jdbcType=BIGINT}
+      depothead_Id = #{record.depotheadId,jdbcType=BIGINT},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -342,6 +355,9 @@
       <if test="depotheadId != null">
         depothead_Id = #{depotheadId,jdbcType=BIGINT},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -360,7 +376,8 @@
       creator = #{creator,jdbcType=BIGINT},
       update_Time = #{updateTime,jdbcType=TIMESTAMP},
       updater = #{updater,jdbcType=BIGINT},
-      depothead_Id = #{depotheadId,jdbcType=BIGINT}
+      depothead_Id = #{depotheadId,jdbcType=BIGINT},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/SupplierMapper.xml

@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsh.erp.datasource.mappers.SupplierMapper">
   <resultMap id="BaseResultMap" type="com.jsh.erp.datasource.entities.Supplier">
     <!--
@@ -27,6 +27,7 @@
     <result column="bankName" jdbcType="VARCHAR" property="bankname" />
     <result column="accountNumber" jdbcType="VARCHAR" property="accountnumber" />
     <result column="taxRate" jdbcType="DECIMAL" property="taxrate" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -101,7 +102,7 @@
     -->
     id, supplier, contacts, phonenum, email, description, isystem, type, enabled, AdvanceIn, 
     BeginNeedGet, BeginNeedPay, AllNeedGet, AllNeedPay, fax, telephone, address, taxNum, 
-    bankName, accountNumber, taxRate
+    bankName, accountNumber, taxRate, tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultMap="BaseResultMap">
     <!--
@@ -160,16 +161,16 @@
       AdvanceIn, BeginNeedGet, BeginNeedPay, 
       AllNeedGet, AllNeedPay, fax, 
       telephone, address, taxNum, 
-      bankName, accountNumber, taxRate
+      bankName, accountNumber, taxRate, 
-      )
+      tenant_id)
     values (#{id,jdbcType=BIGINT}, #{supplier,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
       #{phonenum,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, 
       #{isystem,jdbcType=TINYINT}, #{type,jdbcType=VARCHAR}, #{enabled,jdbcType=BIT}, 
       #{advancein,jdbcType=DECIMAL}, #{beginneedget,jdbcType=DECIMAL}, #{beginneedpay,jdbcType=DECIMAL}, 
       #{allneedget,jdbcType=DECIMAL}, #{allneedpay,jdbcType=DECIMAL}, #{fax,jdbcType=VARCHAR}, 
       #{telephone,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{taxnum,jdbcType=VARCHAR}, 
-      #{bankname,jdbcType=VARCHAR}, #{accountnumber,jdbcType=VARCHAR}, #{taxrate,jdbcType=DECIMAL}
+      #{bankname,jdbcType=VARCHAR}, #{accountnumber,jdbcType=VARCHAR}, #{taxrate,jdbcType=DECIMAL}, 
-      )
+      #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.Supplier">
     <!--
@@ -241,6 +242,9 @@
       <if test="taxrate != null">
         taxRate,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -306,6 +310,9 @@
       <if test="taxrate != null">
         #{taxrate,jdbcType=DECIMAL},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SupplierExample" resultType="java.lang.Integer">
@@ -388,6 +395,9 @@
       <if test="record.taxrate != null">
         taxRate = #{record.taxrate,jdbcType=DECIMAL},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -419,7 +429,8 @@
       taxNum = #{record.taxnum,jdbcType=VARCHAR},
       bankName = #{record.bankname,jdbcType=VARCHAR},
       accountNumber = #{record.accountnumber,jdbcType=VARCHAR},
-      taxRate = #{record.taxrate,jdbcType=DECIMAL}
+      taxRate = #{record.taxrate,jdbcType=DECIMAL},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -491,6 +502,9 @@
       <if test="taxrate != null">
         taxRate = #{taxrate,jdbcType=DECIMAL},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -519,7 +533,8 @@
       taxNum = #{taxnum,jdbcType=VARCHAR},
       bankName = #{bankname,jdbcType=VARCHAR},
       accountNumber = #{accountnumber,jdbcType=VARCHAR},
-      taxRate = #{taxrate,jdbcType=DECIMAL}
+      taxRate = #{taxrate,jdbcType=DECIMAL},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

src/main/resources/mapper_xml/SystemConfigMapper.xml

@@ -13,6 +13,7 @@
     <result column="company_tel" jdbcType="VARCHAR" property="companyTel" />
     <result column="company_fax" jdbcType="VARCHAR" property="companyFax" />
     <result column="company_post_code" jdbcType="VARCHAR" property="companyPostCode" />
+    <result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
@@ -85,7 +86,8 @@
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.
     -->
-    id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code
+    id, company_name, company_contacts, company_address, company_tel, company_fax, company_post_code, 
+    tenant_id
   </sql>
   <select id="selectByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultMap="BaseResultMap">
     <!--
@@ -140,10 +142,10 @@
     -->
     insert into jsh_systemconfig (id, company_name, company_contacts, 
       company_address, company_tel, company_fax, 
-      company_post_code)
+      company_post_code, tenant_id)
     values (#{id,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, #{companyContacts,jdbcType=VARCHAR}, 
       #{companyAddress,jdbcType=VARCHAR}, #{companyTel,jdbcType=VARCHAR}, #{companyFax,jdbcType=VARCHAR}, 
-      #{companyPostCode,jdbcType=VARCHAR})
+      #{companyPostCode,jdbcType=VARCHAR}, #{tenantId,jdbcType=BIGINT})
   </insert>
   <insert id="insertSelective" parameterType="com.jsh.erp.datasource.entities.SystemConfig">
     <!--
@@ -173,6 +175,9 @@
       <if test="companyPostCode != null">
         company_post_code,
       </if>
+      <if test="tenantId != null">
+        tenant_id,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -196,6 +201,9 @@
       <if test="companyPostCode != null">
         #{companyPostCode,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        #{tenantId,jdbcType=BIGINT},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.jsh.erp.datasource.entities.SystemConfigExample" resultType="java.lang.Integer">
@@ -236,6 +244,9 @@
       <if test="record.companyPostCode != null">
         company_post_code = #{record.companyPostCode,jdbcType=VARCHAR},
       </if>
+      <if test="record.tenantId != null">
+        tenant_id = #{record.tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -253,7 +264,8 @@
       company_address = #{record.companyAddress,jdbcType=VARCHAR},
       company_tel = #{record.companyTel,jdbcType=VARCHAR},
       company_fax = #{record.companyFax,jdbcType=VARCHAR},
-      company_post_code = #{record.companyPostCode,jdbcType=VARCHAR}
+      company_post_code = #{record.companyPostCode,jdbcType=VARCHAR},
+      tenant_id = #{record.tenantId,jdbcType=BIGINT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -283,6 +295,9 @@
       <if test="companyPostCode != null">
         company_post_code = #{companyPostCode,jdbcType=VARCHAR},
       </if>
+      <if test="tenantId != null">
+        tenant_id = #{tenantId,jdbcType=BIGINT},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -297,7 +312,8 @@
       company_address = #{companyAddress,jdbcType=VARCHAR},
       company_tel = #{companyTel,jdbcType=VARCHAR},
       company_fax = #{companyFax,jdbcType=VARCHAR},
-      company_post_code = #{companyPostCode,jdbcType=VARCHAR}
+      company_post_code = #{companyPostCode,jdbcType=VARCHAR},
+      tenant_id = #{tenantId,jdbcType=BIGINT}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>