diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderPreMapper.java b/hai-service/src/main/java/com/hai/dao/HighOrderPreMapper.java
index 31b715a6..65bf7d69 100644
--- a/hai-service/src/main/java/com/hai/dao/HighOrderPreMapper.java
+++ b/hai-service/src/main/java/com/hai/dao/HighOrderPreMapper.java
@@ -40,26 +40,32 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt {
 
     @Insert({
         "insert into high_order_pre (company_id, merchant_id, ",
-        "agent_id, pre_order_no, ",
-        "order_id, order_no, ",
-        "child_order_id, pay_real_price, ",
-        "goods_type, goods_id, ",
-        "goods_name, pre_user_id, ",
+        "merchant_store_id, agent_id, ",
+        "pre_order_no, order_id, ",
+        "order_no, child_order_id, ",
+        "pay_real_price, goods_type, ",
+        "goods_id, goods_name, ",
+        "pre_time, pre_user_id, ",
         "pre_user_name, pre_user_phone, ",
-        "pre_user_remark, stauts, ",
+        "pre_user_remark, `status`, ",
         "status_fail_desc, status_cancel_desc, ",
+        "reach_time, reach_address, ",
+        "op_user_id, op_user_name, ",
         "create_time, update_time, ",
         "ext_1, ext_2, ext_3, ",
         "ext_4, ext_5)",
         "values (#{companyId,jdbcType=BIGINT}, #{merchantId,jdbcType=BIGINT}, ",
-        "#{agentId,jdbcType=BIGINT}, #{preOrderNo,jdbcType=VARCHAR}, ",
-        "#{orderId,jdbcType=BIGINT}, #{orderNo,jdbcType=VARCHAR}, ",
-        "#{childOrderId,jdbcType=BIGINT}, #{payRealPrice,jdbcType=DECIMAL}, ",
-        "#{goodsType,jdbcType=INTEGER}, #{goodsId,jdbcType=BIGINT}, ",
-        "#{goodsName,jdbcType=VARCHAR}, #{preUserId,jdbcType=BIGINT}, ",
+        "#{merchantStoreId,jdbcType=BIGINT}, #{agentId,jdbcType=BIGINT}, ",
+        "#{preOrderNo,jdbcType=VARCHAR}, #{orderId,jdbcType=BIGINT}, ",
+        "#{orderNo,jdbcType=VARCHAR}, #{childOrderId,jdbcType=BIGINT}, ",
+        "#{payRealPrice,jdbcType=DECIMAL}, #{goodsType,jdbcType=INTEGER}, ",
+        "#{goodsId,jdbcType=BIGINT}, #{goodsName,jdbcType=VARCHAR}, ",
+        "#{preTime,jdbcType=TIMESTAMP}, #{preUserId,jdbcType=BIGINT}, ",
         "#{preUserName,jdbcType=VARCHAR}, #{preUserPhone,jdbcType=VARCHAR}, ",
-        "#{preUserRemark,jdbcType=VARCHAR}, #{stauts,jdbcType=INTEGER}, ",
+        "#{preUserRemark,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ",
         "#{statusFailDesc,jdbcType=VARCHAR}, #{statusCancelDesc,jdbcType=VARCHAR}, ",
+        "#{reachTime,jdbcType=TIMESTAMP}, #{reachAddress,jdbcType=VARCHAR}, ",
+        "#{opUserId,jdbcType=BIGINT}, #{opUserName,jdbcType=VARCHAR}, ",
         "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
         "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, ",
         "#{ext4,jdbcType=VARCHAR}, #{ext5,jdbcType=VARCHAR})"
@@ -76,6 +82,7 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt {
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
         @Result(column="merchant_id", property="merchantId", jdbcType=JdbcType.BIGINT),
+        @Result(column="merchant_store_id", property="merchantStoreId", jdbcType=JdbcType.BIGINT),
         @Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT),
         @Result(column="pre_order_no", property="preOrderNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT),
@@ -85,13 +92,18 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt {
         @Result(column="goods_type", property="goodsType", jdbcType=JdbcType.INTEGER),
         @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT),
         @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="pre_time", property="preTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="pre_user_id", property="preUserId", jdbcType=JdbcType.BIGINT),
         @Result(column="pre_user_name", property="preUserName", jdbcType=JdbcType.VARCHAR),
         @Result(column="pre_user_phone", property="preUserPhone", jdbcType=JdbcType.VARCHAR),
         @Result(column="pre_user_remark", property="preUserRemark", jdbcType=JdbcType.VARCHAR),
-        @Result(column="stauts", property="stauts", jdbcType=JdbcType.INTEGER),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="status_fail_desc", property="statusFailDesc", jdbcType=JdbcType.VARCHAR),
         @Result(column="status_cancel_desc", property="statusCancelDesc", jdbcType=JdbcType.VARCHAR),
+        @Result(column="reach_time", property="reachTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="reach_address", property="reachAddress", jdbcType=JdbcType.VARCHAR),
+        @Result(column="op_user_id", property="opUserId", jdbcType=JdbcType.BIGINT),
+        @Result(column="op_user_name", property="opUserName", jdbcType=JdbcType.VARCHAR),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@@ -104,10 +116,11 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt {
 
     @Select({
         "select",
-        "id, company_id, merchant_id, agent_id, pre_order_no, order_id, order_no, child_order_id, ",
-        "pay_real_price, goods_type, goods_id, goods_name, pre_user_id, pre_user_name, ",
-        "pre_user_phone, pre_user_remark, stauts, status_fail_desc, status_cancel_desc, ",
-        "create_time, update_time, ext_1, ext_2, ext_3, ext_4, ext_5",
+        "id, company_id, merchant_id, merchant_store_id, agent_id, pre_order_no, order_id, ",
+        "order_no, child_order_id, pay_real_price, goods_type, goods_id, goods_name, ",
+        "pre_time, pre_user_id, pre_user_name, pre_user_phone, pre_user_remark, `status`, ",
+        "status_fail_desc, status_cancel_desc, reach_time, reach_address, op_user_id, ",
+        "op_user_name, create_time, update_time, ext_1, ext_2, ext_3, ext_4, ext_5",
         "from high_order_pre",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -115,6 +128,7 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt {
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT),
         @Result(column="merchant_id", property="merchantId", jdbcType=JdbcType.BIGINT),
+        @Result(column="merchant_store_id", property="merchantStoreId", jdbcType=JdbcType.BIGINT),
         @Result(column="agent_id", property="agentId", jdbcType=JdbcType.BIGINT),
         @Result(column="pre_order_no", property="preOrderNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="order_id", property="orderId", jdbcType=JdbcType.BIGINT),
@@ -124,13 +138,18 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt {
         @Result(column="goods_type", property="goodsType", jdbcType=JdbcType.INTEGER),
         @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT),
         @Result(column="goods_name", property="goodsName", jdbcType=JdbcType.VARCHAR),
+        @Result(column="pre_time", property="preTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="pre_user_id", property="preUserId", jdbcType=JdbcType.BIGINT),
         @Result(column="pre_user_name", property="preUserName", jdbcType=JdbcType.VARCHAR),
         @Result(column="pre_user_phone", property="preUserPhone", jdbcType=JdbcType.VARCHAR),
         @Result(column="pre_user_remark", property="preUserRemark", jdbcType=JdbcType.VARCHAR),
-        @Result(column="stauts", property="stauts", jdbcType=JdbcType.INTEGER),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="status_fail_desc", property="statusFailDesc", jdbcType=JdbcType.VARCHAR),
         @Result(column="status_cancel_desc", property="statusCancelDesc", jdbcType=JdbcType.VARCHAR),
+        @Result(column="reach_time", property="reachTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="reach_address", property="reachAddress", jdbcType=JdbcType.VARCHAR),
+        @Result(column="op_user_id", property="opUserId", jdbcType=JdbcType.BIGINT),
+        @Result(column="op_user_name", property="opUserName", jdbcType=JdbcType.VARCHAR),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@@ -154,6 +173,7 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt {
         "update high_order_pre",
         "set company_id = #{companyId,jdbcType=BIGINT},",
           "merchant_id = #{merchantId,jdbcType=BIGINT},",
+          "merchant_store_id = #{merchantStoreId,jdbcType=BIGINT},",
           "agent_id = #{agentId,jdbcType=BIGINT},",
           "pre_order_no = #{preOrderNo,jdbcType=VARCHAR},",
           "order_id = #{orderId,jdbcType=BIGINT},",
@@ -163,13 +183,18 @@ public interface HighOrderPreMapper extends HighOrderPreMapperExt {
           "goods_type = #{goodsType,jdbcType=INTEGER},",
           "goods_id = #{goodsId,jdbcType=BIGINT},",
           "goods_name = #{goodsName,jdbcType=VARCHAR},",
+          "pre_time = #{preTime,jdbcType=TIMESTAMP},",
           "pre_user_id = #{preUserId,jdbcType=BIGINT},",
           "pre_user_name = #{preUserName,jdbcType=VARCHAR},",
           "pre_user_phone = #{preUserPhone,jdbcType=VARCHAR},",
           "pre_user_remark = #{preUserRemark,jdbcType=VARCHAR},",
-          "stauts = #{stauts,jdbcType=INTEGER},",
+          "`status` = #{status,jdbcType=INTEGER},",
           "status_fail_desc = #{statusFailDesc,jdbcType=VARCHAR},",
           "status_cancel_desc = #{statusCancelDesc,jdbcType=VARCHAR},",
+          "reach_time = #{reachTime,jdbcType=TIMESTAMP},",
+          "reach_address = #{reachAddress,jdbcType=VARCHAR},",
+          "op_user_id = #{opUserId,jdbcType=BIGINT},",
+          "op_user_name = #{opUserName,jdbcType=VARCHAR},",
           "create_time = #{createTime,jdbcType=TIMESTAMP},",
           "update_time = #{updateTime,jdbcType=TIMESTAMP},",
           "ext_1 = #{ext1,jdbcType=VARCHAR},",
diff --git a/hai-service/src/main/java/com/hai/dao/HighOrderPreSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighOrderPreSqlProvider.java
index b8e81ba2..0252972a 100644
--- a/hai-service/src/main/java/com/hai/dao/HighOrderPreSqlProvider.java
+++ b/hai-service/src/main/java/com/hai/dao/HighOrderPreSqlProvider.java
@@ -36,6 +36,10 @@ public class HighOrderPreSqlProvider {
             sql.VALUES("merchant_id", "#{merchantId,jdbcType=BIGINT}");
         }
         
+        if (record.getMerchantStoreId() != null) {
+            sql.VALUES("merchant_store_id", "#{merchantStoreId,jdbcType=BIGINT}");
+        }
+        
         if (record.getAgentId() != null) {
             sql.VALUES("agent_id", "#{agentId,jdbcType=BIGINT}");
         }
@@ -72,6 +76,10 @@ public class HighOrderPreSqlProvider {
             sql.VALUES("goods_name", "#{goodsName,jdbcType=VARCHAR}");
         }
         
+        if (record.getPreTime() != null) {
+            sql.VALUES("pre_time", "#{preTime,jdbcType=TIMESTAMP}");
+        }
+        
         if (record.getPreUserId() != null) {
             sql.VALUES("pre_user_id", "#{preUserId,jdbcType=BIGINT}");
         }
@@ -88,8 +96,8 @@ public class HighOrderPreSqlProvider {
             sql.VALUES("pre_user_remark", "#{preUserRemark,jdbcType=VARCHAR}");
         }
         
-        if (record.getStauts() != null) {
-            sql.VALUES("stauts", "#{stauts,jdbcType=INTEGER}");
+        if (record.getStatus() != null) {
+            sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
         }
         
         if (record.getStatusFailDesc() != null) {
@@ -100,6 +108,22 @@ public class HighOrderPreSqlProvider {
             sql.VALUES("status_cancel_desc", "#{statusCancelDesc,jdbcType=VARCHAR}");
         }
         
+        if (record.getReachTime() != null) {
+            sql.VALUES("reach_time", "#{reachTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getReachAddress() != null) {
+            sql.VALUES("reach_address", "#{reachAddress,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getOpUserId() != null) {
+            sql.VALUES("op_user_id", "#{opUserId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpUserName() != null) {
+            sql.VALUES("op_user_name", "#{opUserName,jdbcType=VARCHAR}");
+        }
+        
         if (record.getCreateTime() != null) {
             sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}");
         }
@@ -140,6 +164,7 @@ public class HighOrderPreSqlProvider {
         }
         sql.SELECT("company_id");
         sql.SELECT("merchant_id");
+        sql.SELECT("merchant_store_id");
         sql.SELECT("agent_id");
         sql.SELECT("pre_order_no");
         sql.SELECT("order_id");
@@ -149,13 +174,18 @@ public class HighOrderPreSqlProvider {
         sql.SELECT("goods_type");
         sql.SELECT("goods_id");
         sql.SELECT("goods_name");
+        sql.SELECT("pre_time");
         sql.SELECT("pre_user_id");
         sql.SELECT("pre_user_name");
         sql.SELECT("pre_user_phone");
         sql.SELECT("pre_user_remark");
-        sql.SELECT("stauts");
+        sql.SELECT("`status`");
         sql.SELECT("status_fail_desc");
         sql.SELECT("status_cancel_desc");
+        sql.SELECT("reach_time");
+        sql.SELECT("reach_address");
+        sql.SELECT("op_user_id");
+        sql.SELECT("op_user_name");
         sql.SELECT("create_time");
         sql.SELECT("update_time");
         sql.SELECT("ext_1");
@@ -192,6 +222,10 @@ public class HighOrderPreSqlProvider {
             sql.SET("merchant_id = #{record.merchantId,jdbcType=BIGINT}");
         }
         
+        if (record.getMerchantStoreId() != null) {
+            sql.SET("merchant_store_id = #{record.merchantStoreId,jdbcType=BIGINT}");
+        }
+        
         if (record.getAgentId() != null) {
             sql.SET("agent_id = #{record.agentId,jdbcType=BIGINT}");
         }
@@ -228,6 +262,10 @@ public class HighOrderPreSqlProvider {
             sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
         }
         
+        if (record.getPreTime() != null) {
+            sql.SET("pre_time = #{record.preTime,jdbcType=TIMESTAMP}");
+        }
+        
         if (record.getPreUserId() != null) {
             sql.SET("pre_user_id = #{record.preUserId,jdbcType=BIGINT}");
         }
@@ -244,8 +282,8 @@ public class HighOrderPreSqlProvider {
             sql.SET("pre_user_remark = #{record.preUserRemark,jdbcType=VARCHAR}");
         }
         
-        if (record.getStauts() != null) {
-            sql.SET("stauts = #{record.stauts,jdbcType=INTEGER}");
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
         }
         
         if (record.getStatusFailDesc() != null) {
@@ -256,6 +294,22 @@ public class HighOrderPreSqlProvider {
             sql.SET("status_cancel_desc = #{record.statusCancelDesc,jdbcType=VARCHAR}");
         }
         
+        if (record.getReachTime() != null) {
+            sql.SET("reach_time = #{record.reachTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getReachAddress() != null) {
+            sql.SET("reach_address = #{record.reachAddress,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getOpUserId() != null) {
+            sql.SET("op_user_id = #{record.opUserId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpUserName() != null) {
+            sql.SET("op_user_name = #{record.opUserName,jdbcType=VARCHAR}");
+        }
+        
         if (record.getCreateTime() != null) {
             sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
         }
@@ -295,6 +349,7 @@ public class HighOrderPreSqlProvider {
         sql.SET("id = #{record.id,jdbcType=BIGINT}");
         sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}");
         sql.SET("merchant_id = #{record.merchantId,jdbcType=BIGINT}");
+        sql.SET("merchant_store_id = #{record.merchantStoreId,jdbcType=BIGINT}");
         sql.SET("agent_id = #{record.agentId,jdbcType=BIGINT}");
         sql.SET("pre_order_no = #{record.preOrderNo,jdbcType=VARCHAR}");
         sql.SET("order_id = #{record.orderId,jdbcType=BIGINT}");
@@ -304,13 +359,18 @@ public class HighOrderPreSqlProvider {
         sql.SET("goods_type = #{record.goodsType,jdbcType=INTEGER}");
         sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}");
         sql.SET("goods_name = #{record.goodsName,jdbcType=VARCHAR}");
+        sql.SET("pre_time = #{record.preTime,jdbcType=TIMESTAMP}");
         sql.SET("pre_user_id = #{record.preUserId,jdbcType=BIGINT}");
         sql.SET("pre_user_name = #{record.preUserName,jdbcType=VARCHAR}");
         sql.SET("pre_user_phone = #{record.preUserPhone,jdbcType=VARCHAR}");
         sql.SET("pre_user_remark = #{record.preUserRemark,jdbcType=VARCHAR}");
-        sql.SET("stauts = #{record.stauts,jdbcType=INTEGER}");
+        sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
         sql.SET("status_fail_desc = #{record.statusFailDesc,jdbcType=VARCHAR}");
         sql.SET("status_cancel_desc = #{record.statusCancelDesc,jdbcType=VARCHAR}");
+        sql.SET("reach_time = #{record.reachTime,jdbcType=TIMESTAMP}");
+        sql.SET("reach_address = #{record.reachAddress,jdbcType=VARCHAR}");
+        sql.SET("op_user_id = #{record.opUserId,jdbcType=BIGINT}");
+        sql.SET("op_user_name = #{record.opUserName,jdbcType=VARCHAR}");
         sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
         sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
         sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
@@ -336,6 +396,10 @@ public class HighOrderPreSqlProvider {
             sql.SET("merchant_id = #{merchantId,jdbcType=BIGINT}");
         }
         
+        if (record.getMerchantStoreId() != null) {
+            sql.SET("merchant_store_id = #{merchantStoreId,jdbcType=BIGINT}");
+        }
+        
         if (record.getAgentId() != null) {
             sql.SET("agent_id = #{agentId,jdbcType=BIGINT}");
         }
@@ -372,6 +436,10 @@ public class HighOrderPreSqlProvider {
             sql.SET("goods_name = #{goodsName,jdbcType=VARCHAR}");
         }
         
+        if (record.getPreTime() != null) {
+            sql.SET("pre_time = #{preTime,jdbcType=TIMESTAMP}");
+        }
+        
         if (record.getPreUserId() != null) {
             sql.SET("pre_user_id = #{preUserId,jdbcType=BIGINT}");
         }
@@ -388,8 +456,8 @@ public class HighOrderPreSqlProvider {
             sql.SET("pre_user_remark = #{preUserRemark,jdbcType=VARCHAR}");
         }
         
-        if (record.getStauts() != null) {
-            sql.SET("stauts = #{stauts,jdbcType=INTEGER}");
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{status,jdbcType=INTEGER}");
         }
         
         if (record.getStatusFailDesc() != null) {
@@ -400,6 +468,22 @@ public class HighOrderPreSqlProvider {
             sql.SET("status_cancel_desc = #{statusCancelDesc,jdbcType=VARCHAR}");
         }
         
+        if (record.getReachTime() != null) {
+            sql.SET("reach_time = #{reachTime,jdbcType=TIMESTAMP}");
+        }
+        
+        if (record.getReachAddress() != null) {
+            sql.SET("reach_address = #{reachAddress,jdbcType=VARCHAR}");
+        }
+        
+        if (record.getOpUserId() != null) {
+            sql.SET("op_user_id = #{opUserId,jdbcType=BIGINT}");
+        }
+        
+        if (record.getOpUserName() != null) {
+            sql.SET("op_user_name = #{opUserName,jdbcType=VARCHAR}");
+        }
+        
         if (record.getCreateTime() != null) {
             sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}");
         }
diff --git a/hai-service/src/main/java/com/hai/entity/HighOrderPre.java b/hai-service/src/main/java/com/hai/entity/HighOrderPre.java
index ef71da00..d0c87fc5 100644
--- a/hai-service/src/main/java/com/hai/entity/HighOrderPre.java
+++ b/hai-service/src/main/java/com/hai/entity/HighOrderPre.java
@@ -29,6 +29,11 @@ public class HighOrderPre implements Serializable {
      */
     private Long merchantId;
 
+    /**
+     * 商户门店id
+     */
+    private Long merchantStoreId;
+
     /**
      * 代理商id
      */
@@ -74,6 +79,11 @@ public class HighOrderPre implements Serializable {
      */
     private String goodsName;
 
+    /**
+     * 预约时间
+     */
+    private Date preTime;
+
     /**
      * 预约用户id
      */
@@ -97,7 +107,7 @@ public class HighOrderPre implements Serializable {
     /**
      * 状态  1.预约中  2. 预约成功  3.预约完成  4.预约失败  5.预约取消
      */
-    private Integer stauts;
+    private Integer status;
 
     /**
      * 预约失败说明
@@ -109,6 +119,26 @@ public class HighOrderPre implements Serializable {
      */
     private String statusCancelDesc;
 
+    /**
+     * 到达时间
+     */
+    private Date reachTime;
+
+    /**
+     * 到达地点
+     */
+    private String reachAddress;
+
+    /**
+     * 操作人id
+     */
+    private Long opUserId;
+
+    /**
+     * 操作人名称
+     */
+    private String opUserName;
+
     /**
      * 创建时间
      */
@@ -155,6 +185,14 @@ public class HighOrderPre implements Serializable {
         this.merchantId = merchantId;
     }
 
+    public Long getMerchantStoreId() {
+        return merchantStoreId;
+    }
+
+    public void setMerchantStoreId(Long merchantStoreId) {
+        this.merchantStoreId = merchantStoreId;
+    }
+
     public Long getAgentId() {
         return agentId;
     }
@@ -227,6 +265,14 @@ public class HighOrderPre implements Serializable {
         this.goodsName = goodsName;
     }
 
+    public Date getPreTime() {
+        return preTime;
+    }
+
+    public void setPreTime(Date preTime) {
+        this.preTime = preTime;
+    }
+
     public Long getPreUserId() {
         return preUserId;
     }
@@ -259,12 +305,12 @@ public class HighOrderPre implements Serializable {
         this.preUserRemark = preUserRemark;
     }
 
-    public Integer getStauts() {
-        return stauts;
+    public Integer getStatus() {
+        return status;
     }
 
-    public void setStauts(Integer stauts) {
-        this.stauts = stauts;
+    public void setStatus(Integer status) {
+        this.status = status;
     }
 
     public String getStatusFailDesc() {
@@ -283,6 +329,38 @@ public class HighOrderPre implements Serializable {
         this.statusCancelDesc = statusCancelDesc;
     }
 
+    public Date getReachTime() {
+        return reachTime;
+    }
+
+    public void setReachTime(Date reachTime) {
+        this.reachTime = reachTime;
+    }
+
+    public String getReachAddress() {
+        return reachAddress;
+    }
+
+    public void setReachAddress(String reachAddress) {
+        this.reachAddress = reachAddress;
+    }
+
+    public Long getOpUserId() {
+        return opUserId;
+    }
+
+    public void setOpUserId(Long opUserId) {
+        this.opUserId = opUserId;
+    }
+
+    public String getOpUserName() {
+        return opUserName;
+    }
+
+    public void setOpUserName(String opUserName) {
+        this.opUserName = opUserName;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }
@@ -354,6 +432,7 @@ public class HighOrderPre implements Serializable {
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
             && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId()))
             && (this.getMerchantId() == null ? other.getMerchantId() == null : this.getMerchantId().equals(other.getMerchantId()))
+            && (this.getMerchantStoreId() == null ? other.getMerchantStoreId() == null : this.getMerchantStoreId().equals(other.getMerchantStoreId()))
             && (this.getAgentId() == null ? other.getAgentId() == null : this.getAgentId().equals(other.getAgentId()))
             && (this.getPreOrderNo() == null ? other.getPreOrderNo() == null : this.getPreOrderNo().equals(other.getPreOrderNo()))
             && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId()))
@@ -363,13 +442,18 @@ public class HighOrderPre implements Serializable {
             && (this.getGoodsType() == null ? other.getGoodsType() == null : this.getGoodsType().equals(other.getGoodsType()))
             && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId()))
             && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName()))
+            && (this.getPreTime() == null ? other.getPreTime() == null : this.getPreTime().equals(other.getPreTime()))
             && (this.getPreUserId() == null ? other.getPreUserId() == null : this.getPreUserId().equals(other.getPreUserId()))
             && (this.getPreUserName() == null ? other.getPreUserName() == null : this.getPreUserName().equals(other.getPreUserName()))
             && (this.getPreUserPhone() == null ? other.getPreUserPhone() == null : this.getPreUserPhone().equals(other.getPreUserPhone()))
             && (this.getPreUserRemark() == null ? other.getPreUserRemark() == null : this.getPreUserRemark().equals(other.getPreUserRemark()))
-            && (this.getStauts() == null ? other.getStauts() == null : this.getStauts().equals(other.getStauts()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getStatusFailDesc() == null ? other.getStatusFailDesc() == null : this.getStatusFailDesc().equals(other.getStatusFailDesc()))
             && (this.getStatusCancelDesc() == null ? other.getStatusCancelDesc() == null : this.getStatusCancelDesc().equals(other.getStatusCancelDesc()))
+            && (this.getReachTime() == null ? other.getReachTime() == null : this.getReachTime().equals(other.getReachTime()))
+            && (this.getReachAddress() == null ? other.getReachAddress() == null : this.getReachAddress().equals(other.getReachAddress()))
+            && (this.getOpUserId() == null ? other.getOpUserId() == null : this.getOpUserId().equals(other.getOpUserId()))
+            && (this.getOpUserName() == null ? other.getOpUserName() == null : this.getOpUserName().equals(other.getOpUserName()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
             && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
             && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
@@ -386,6 +470,7 @@ public class HighOrderPre implements Serializable {
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
         result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode());
         result = prime * result + ((getMerchantId() == null) ? 0 : getMerchantId().hashCode());
+        result = prime * result + ((getMerchantStoreId() == null) ? 0 : getMerchantStoreId().hashCode());
         result = prime * result + ((getAgentId() == null) ? 0 : getAgentId().hashCode());
         result = prime * result + ((getPreOrderNo() == null) ? 0 : getPreOrderNo().hashCode());
         result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode());
@@ -395,13 +480,18 @@ public class HighOrderPre implements Serializable {
         result = prime * result + ((getGoodsType() == null) ? 0 : getGoodsType().hashCode());
         result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode());
         result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode());
+        result = prime * result + ((getPreTime() == null) ? 0 : getPreTime().hashCode());
         result = prime * result + ((getPreUserId() == null) ? 0 : getPreUserId().hashCode());
         result = prime * result + ((getPreUserName() == null) ? 0 : getPreUserName().hashCode());
         result = prime * result + ((getPreUserPhone() == null) ? 0 : getPreUserPhone().hashCode());
         result = prime * result + ((getPreUserRemark() == null) ? 0 : getPreUserRemark().hashCode());
-        result = prime * result + ((getStauts() == null) ? 0 : getStauts().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getStatusFailDesc() == null) ? 0 : getStatusFailDesc().hashCode());
         result = prime * result + ((getStatusCancelDesc() == null) ? 0 : getStatusCancelDesc().hashCode());
+        result = prime * result + ((getReachTime() == null) ? 0 : getReachTime().hashCode());
+        result = prime * result + ((getReachAddress() == null) ? 0 : getReachAddress().hashCode());
+        result = prime * result + ((getOpUserId() == null) ? 0 : getOpUserId().hashCode());
+        result = prime * result + ((getOpUserName() == null) ? 0 : getOpUserName().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
         result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
         result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
@@ -421,6 +511,7 @@ public class HighOrderPre implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", companyId=").append(companyId);
         sb.append(", merchantId=").append(merchantId);
+        sb.append(", merchantStoreId=").append(merchantStoreId);
         sb.append(", agentId=").append(agentId);
         sb.append(", preOrderNo=").append(preOrderNo);
         sb.append(", orderId=").append(orderId);
@@ -430,13 +521,18 @@ public class HighOrderPre implements Serializable {
         sb.append(", goodsType=").append(goodsType);
         sb.append(", goodsId=").append(goodsId);
         sb.append(", goodsName=").append(goodsName);
+        sb.append(", preTime=").append(preTime);
         sb.append(", preUserId=").append(preUserId);
         sb.append(", preUserName=").append(preUserName);
         sb.append(", preUserPhone=").append(preUserPhone);
         sb.append(", preUserRemark=").append(preUserRemark);
-        sb.append(", stauts=").append(stauts);
+        sb.append(", status=").append(status);
         sb.append(", statusFailDesc=").append(statusFailDesc);
         sb.append(", statusCancelDesc=").append(statusCancelDesc);
+        sb.append(", reachTime=").append(reachTime);
+        sb.append(", reachAddress=").append(reachAddress);
+        sb.append(", opUserId=").append(opUserId);
+        sb.append(", opUserName=").append(opUserName);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", ext1=").append(ext1);
diff --git a/hai-service/src/main/java/com/hai/entity/HighOrderPreExample.java b/hai-service/src/main/java/com/hai/entity/HighOrderPreExample.java
index 4ebb056c..916a8b89 100644
--- a/hai-service/src/main/java/com/hai/entity/HighOrderPreExample.java
+++ b/hai-service/src/main/java/com/hai/entity/HighOrderPreExample.java
@@ -306,6 +306,66 @@ public class HighOrderPreExample {
             return (Criteria) this;
         }
 
+        public Criteria andMerchantStoreIdIsNull() {
+            addCriterion("merchant_store_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantStoreIdIsNotNull() {
+            addCriterion("merchant_store_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantStoreIdEqualTo(Long value) {
+            addCriterion("merchant_store_id =", value, "merchantStoreId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantStoreIdNotEqualTo(Long value) {
+            addCriterion("merchant_store_id <>", value, "merchantStoreId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantStoreIdGreaterThan(Long value) {
+            addCriterion("merchant_store_id >", value, "merchantStoreId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantStoreIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("merchant_store_id >=", value, "merchantStoreId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantStoreIdLessThan(Long value) {
+            addCriterion("merchant_store_id <", value, "merchantStoreId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantStoreIdLessThanOrEqualTo(Long value) {
+            addCriterion("merchant_store_id <=", value, "merchantStoreId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantStoreIdIn(List<Long> values) {
+            addCriterion("merchant_store_id in", values, "merchantStoreId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantStoreIdNotIn(List<Long> values) {
+            addCriterion("merchant_store_id not in", values, "merchantStoreId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantStoreIdBetween(Long value1, Long value2) {
+            addCriterion("merchant_store_id between", value1, value2, "merchantStoreId");
+            return (Criteria) this;
+        }
+
+        public Criteria andMerchantStoreIdNotBetween(Long value1, Long value2) {
+            addCriterion("merchant_store_id not between", value1, value2, "merchantStoreId");
+            return (Criteria) this;
+        }
+
         public Criteria andAgentIdIsNull() {
             addCriterion("agent_id is null");
             return (Criteria) this;
@@ -876,6 +936,66 @@ public class HighOrderPreExample {
             return (Criteria) this;
         }
 
+        public Criteria andPreTimeIsNull() {
+            addCriterion("pre_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreTimeIsNotNull() {
+            addCriterion("pre_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreTimeEqualTo(Date value) {
+            addCriterion("pre_time =", value, "preTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreTimeNotEqualTo(Date value) {
+            addCriterion("pre_time <>", value, "preTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreTimeGreaterThan(Date value) {
+            addCriterion("pre_time >", value, "preTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("pre_time >=", value, "preTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreTimeLessThan(Date value) {
+            addCriterion("pre_time <", value, "preTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreTimeLessThanOrEqualTo(Date value) {
+            addCriterion("pre_time <=", value, "preTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreTimeIn(List<Date> values) {
+            addCriterion("pre_time in", values, "preTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreTimeNotIn(List<Date> values) {
+            addCriterion("pre_time not in", values, "preTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreTimeBetween(Date value1, Date value2) {
+            addCriterion("pre_time between", value1, value2, "preTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPreTimeNotBetween(Date value1, Date value2) {
+            addCriterion("pre_time not between", value1, value2, "preTime");
+            return (Criteria) this;
+        }
+
         public Criteria andPreUserIdIsNull() {
             addCriterion("pre_user_id is null");
             return (Criteria) this;
@@ -1146,63 +1266,63 @@ public class HighOrderPreExample {
             return (Criteria) this;
         }
 
-        public Criteria andStautsIsNull() {
-            addCriterion("stauts is null");
+        public Criteria andStatusIsNull() {
+            addCriterion("`status` is null");
             return (Criteria) this;
         }
 
-        public Criteria andStautsIsNotNull() {
-            addCriterion("stauts is not null");
+        public Criteria andStatusIsNotNull() {
+            addCriterion("`status` is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStautsEqualTo(Integer value) {
-            addCriterion("stauts =", value, "stauts");
+        public Criteria andStatusEqualTo(Integer value) {
+            addCriterion("`status` =", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStautsNotEqualTo(Integer value) {
-            addCriterion("stauts <>", value, "stauts");
+        public Criteria andStatusNotEqualTo(Integer value) {
+            addCriterion("`status` <>", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStautsGreaterThan(Integer value) {
-            addCriterion("stauts >", value, "stauts");
+        public Criteria andStatusGreaterThan(Integer value) {
+            addCriterion("`status` >", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStautsGreaterThanOrEqualTo(Integer value) {
-            addCriterion("stauts >=", value, "stauts");
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+            addCriterion("`status` >=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStautsLessThan(Integer value) {
-            addCriterion("stauts <", value, "stauts");
+        public Criteria andStatusLessThan(Integer value) {
+            addCriterion("`status` <", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStautsLessThanOrEqualTo(Integer value) {
-            addCriterion("stauts <=", value, "stauts");
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+            addCriterion("`status` <=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStautsIn(List<Integer> values) {
-            addCriterion("stauts in", values, "stauts");
+        public Criteria andStatusIn(List<Integer> values) {
+            addCriterion("`status` in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStautsNotIn(List<Integer> values) {
-            addCriterion("stauts not in", values, "stauts");
+        public Criteria andStatusNotIn(List<Integer> values) {
+            addCriterion("`status` not in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStautsBetween(Integer value1, Integer value2) {
-            addCriterion("stauts between", value1, value2, "stauts");
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
+            addCriterion("`status` between", value1, value2, "status");
             return (Criteria) this;
         }
 
-        public Criteria andStautsNotBetween(Integer value1, Integer value2) {
-            addCriterion("stauts not between", value1, value2, "stauts");
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+            addCriterion("`status` not between", value1, value2, "status");
             return (Criteria) this;
         }
 
@@ -1346,6 +1466,266 @@ public class HighOrderPreExample {
             return (Criteria) this;
         }
 
+        public Criteria andReachTimeIsNull() {
+            addCriterion("reach_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachTimeIsNotNull() {
+            addCriterion("reach_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachTimeEqualTo(Date value) {
+            addCriterion("reach_time =", value, "reachTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachTimeNotEqualTo(Date value) {
+            addCriterion("reach_time <>", value, "reachTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachTimeGreaterThan(Date value) {
+            addCriterion("reach_time >", value, "reachTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("reach_time >=", value, "reachTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachTimeLessThan(Date value) {
+            addCriterion("reach_time <", value, "reachTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachTimeLessThanOrEqualTo(Date value) {
+            addCriterion("reach_time <=", value, "reachTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachTimeIn(List<Date> values) {
+            addCriterion("reach_time in", values, "reachTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachTimeNotIn(List<Date> values) {
+            addCriterion("reach_time not in", values, "reachTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachTimeBetween(Date value1, Date value2) {
+            addCriterion("reach_time between", value1, value2, "reachTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachTimeNotBetween(Date value1, Date value2) {
+            addCriterion("reach_time not between", value1, value2, "reachTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressIsNull() {
+            addCriterion("reach_address is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressIsNotNull() {
+            addCriterion("reach_address is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressEqualTo(String value) {
+            addCriterion("reach_address =", value, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressNotEqualTo(String value) {
+            addCriterion("reach_address <>", value, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressGreaterThan(String value) {
+            addCriterion("reach_address >", value, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("reach_address >=", value, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressLessThan(String value) {
+            addCriterion("reach_address <", value, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressLessThanOrEqualTo(String value) {
+            addCriterion("reach_address <=", value, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressLike(String value) {
+            addCriterion("reach_address like", value, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressNotLike(String value) {
+            addCriterion("reach_address not like", value, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressIn(List<String> values) {
+            addCriterion("reach_address in", values, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressNotIn(List<String> values) {
+            addCriterion("reach_address not in", values, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressBetween(String value1, String value2) {
+            addCriterion("reach_address between", value1, value2, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andReachAddressNotBetween(String value1, String value2) {
+            addCriterion("reach_address not between", value1, value2, "reachAddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdIsNull() {
+            addCriterion("op_user_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdIsNotNull() {
+            addCriterion("op_user_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdEqualTo(Long value) {
+            addCriterion("op_user_id =", value, "opUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdNotEqualTo(Long value) {
+            addCriterion("op_user_id <>", value, "opUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdGreaterThan(Long value) {
+            addCriterion("op_user_id >", value, "opUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("op_user_id >=", value, "opUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdLessThan(Long value) {
+            addCriterion("op_user_id <", value, "opUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdLessThanOrEqualTo(Long value) {
+            addCriterion("op_user_id <=", value, "opUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdIn(List<Long> values) {
+            addCriterion("op_user_id in", values, "opUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdNotIn(List<Long> values) {
+            addCriterion("op_user_id not in", values, "opUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdBetween(Long value1, Long value2) {
+            addCriterion("op_user_id between", value1, value2, "opUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserIdNotBetween(Long value1, Long value2) {
+            addCriterion("op_user_id not between", value1, value2, "opUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameIsNull() {
+            addCriterion("op_user_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameIsNotNull() {
+            addCriterion("op_user_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameEqualTo(String value) {
+            addCriterion("op_user_name =", value, "opUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameNotEqualTo(String value) {
+            addCriterion("op_user_name <>", value, "opUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameGreaterThan(String value) {
+            addCriterion("op_user_name >", value, "opUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameGreaterThanOrEqualTo(String value) {
+            addCriterion("op_user_name >=", value, "opUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameLessThan(String value) {
+            addCriterion("op_user_name <", value, "opUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameLessThanOrEqualTo(String value) {
+            addCriterion("op_user_name <=", value, "opUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameLike(String value) {
+            addCriterion("op_user_name like", value, "opUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameNotLike(String value) {
+            addCriterion("op_user_name not like", value, "opUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameIn(List<String> values) {
+            addCriterion("op_user_name in", values, "opUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameNotIn(List<String> values) {
+            addCriterion("op_user_name not in", values, "opUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameBetween(String value1, String value2) {
+            addCriterion("op_user_name between", value1, value2, "opUserName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpUserNameNotBetween(String value1, String value2) {
+            addCriterion("op_user_name not between", value1, value2, "opUserName");
+            return (Criteria) this;
+        }
+
         public Criteria andCreateTimeIsNull() {
             addCriterion("create_time is null");
             return (Criteria) this;