Merge remote-tracking branch 'origin/api-dev' into api-dev

hai-service/src/main/java/com/hai/dao/ApiMemberProductMapper.java

@@ -39,18 +39,18 @@ public interface ApiMemberProductMapper extends ApiMemberProductMapperExt {
     int deleteByPrimaryKey(Long id);
 
     @Insert({
-        "insert into api_member_product (`type`, price, ",
+        "insert into api_member_product (type_id, brand_id, ",
-        "product_id, sort, ",
+        "price, product_id, ",
-        "operator_id, operator_name, ",
+        "sort, operator_id, ",
-        "create_time, update_time, ",
+        "operator_name, create_time, ",
-        "`status`, ext_1, ext_2, ",
+        "update_time, `status`, ",
-        "ext_3)",
+        "ext_1, ext_2, ext_3)",
-        "values (#{type,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, ",
+        "values (#{typeId,jdbcType=INTEGER}, #{brandId,jdbcType=INTEGER}, ",
-        "#{productId,jdbcType=BIGINT}, #{sort,jdbcType=INTEGER}, ",
+        "#{price,jdbcType=DECIMAL}, #{productId,jdbcType=BIGINT}, ",
-        "#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ",
+        "#{sort,jdbcType=INTEGER}, #{operatorId,jdbcType=BIGINT}, ",
-        "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
+        "#{operatorName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ",
-        "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
+        "#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ",
-        "#{ext3,jdbcType=VARCHAR})"
+        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(ApiMemberProduct record);
@@ -62,7 +62,8 @@ public interface ApiMemberProductMapper extends ApiMemberProductMapperExt {
     @SelectProvider(type=ApiMemberProductSqlProvider.class, method="selectByExample")
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
-        @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+        @Result(column="type_id", property="typeId", jdbcType=JdbcType.INTEGER),
+        @Result(column="brand_id", property="brandId", jdbcType=JdbcType.INTEGER),
         @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
         @Result(column="product_id", property="productId", jdbcType=JdbcType.BIGINT),
         @Result(column="sort", property="sort", jdbcType=JdbcType.INTEGER),
@@ -79,14 +80,15 @@ public interface ApiMemberProductMapper extends ApiMemberProductMapperExt {
 
     @Select({
         "select",
-        "id, `type`, price, product_id, sort, operator_id, operator_name, create_time, ",
+        "id, type_id, brand_id, price, product_id, sort, operator_id, operator_name, ",
-        "update_time, `status`, ext_1, ext_2, ext_3",
+        "create_time, update_time, `status`, ext_1, ext_2, ext_3",
         "from api_member_product",
         "where id = #{id,jdbcType=BIGINT}"
     })
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
-        @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+        @Result(column="type_id", property="typeId", jdbcType=JdbcType.INTEGER),
+        @Result(column="brand_id", property="brandId", jdbcType=JdbcType.INTEGER),
         @Result(column="price", property="price", jdbcType=JdbcType.DECIMAL),
         @Result(column="product_id", property="productId", jdbcType=JdbcType.BIGINT),
         @Result(column="sort", property="sort", jdbcType=JdbcType.INTEGER),
@@ -112,7 +114,8 @@ public interface ApiMemberProductMapper extends ApiMemberProductMapperExt {
 
     @Update({
         "update api_member_product",
-        "set `type` = #{type,jdbcType=INTEGER},",
+        "set type_id = #{typeId,jdbcType=INTEGER},",
+          "brand_id = #{brandId,jdbcType=INTEGER},",
           "price = #{price,jdbcType=DECIMAL},",
           "product_id = #{productId,jdbcType=BIGINT},",
           "sort = #{sort,jdbcType=INTEGER},",

hai-service/src/main/java/com/hai/dao/ApiMemberProductSqlProvider.java

@@ -28,8 +28,12 @@ public class ApiMemberProductSqlProvider {
         SQL sql = new SQL();
         sql.INSERT_INTO("api_member_product");
         
-        if (record.getType() != null) {
+        if (record.getTypeId() != null) {
-            sql.VALUES("`type`", "#{type,jdbcType=INTEGER}");
+            sql.VALUES("type_id", "#{typeId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getBrandId() != null) {
+            sql.VALUES("brand_id", "#{brandId,jdbcType=INTEGER}");
         }
         
         if (record.getPrice() != null) {
@@ -86,7 +90,8 @@ public class ApiMemberProductSqlProvider {
         } else {
             sql.SELECT("id");
         }
-        sql.SELECT("`type`");
+        sql.SELECT("type_id");
+        sql.SELECT("brand_id");
         sql.SELECT("price");
         sql.SELECT("product_id");
         sql.SELECT("sort");
@@ -119,8 +124,12 @@ public class ApiMemberProductSqlProvider {
             sql.SET("id = #{record.id,jdbcType=BIGINT}");
         }
         
-        if (record.getType() != null) {
+        if (record.getTypeId() != null) {
-            sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
+            sql.SET("type_id = #{record.typeId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getBrandId() != null) {
+            sql.SET("brand_id = #{record.brandId,jdbcType=INTEGER}");
         }
         
         if (record.getPrice() != null) {
@@ -176,7 +185,8 @@ public class ApiMemberProductSqlProvider {
         sql.UPDATE("api_member_product");
         
         sql.SET("id = #{record.id,jdbcType=BIGINT}");
-        sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
+        sql.SET("type_id = #{record.typeId,jdbcType=INTEGER}");
+        sql.SET("brand_id = #{record.brandId,jdbcType=INTEGER}");
         sql.SET("price = #{record.price,jdbcType=DECIMAL}");
         sql.SET("product_id = #{record.productId,jdbcType=BIGINT}");
         sql.SET("sort = #{record.sort,jdbcType=INTEGER}");
@@ -198,8 +208,12 @@ public class ApiMemberProductSqlProvider {
         SQL sql = new SQL();
         sql.UPDATE("api_member_product");
         
-        if (record.getType() != null) {
+        if (record.getTypeId() != null) {
-            sql.SET("`type` = #{type,jdbcType=INTEGER}");
+            sql.SET("type_id = #{typeId,jdbcType=INTEGER}");
+        }
+        
+        if (record.getBrandId() != null) {
+            sql.SET("brand_id = #{brandId,jdbcType=INTEGER}");
         }
         
         if (record.getPrice() != null) {

hai-service/src/main/java/com/hai/dao/HighGoodsTypeMapper.java

@@ -39,16 +39,16 @@ public interface HighGoodsTypeMapper extends HighGoodsTypeMapperExt {
     int deleteByPrimaryKey(Integer id);
 
     @Insert({
-        "insert into high_goods_type (title, img, ",
+        "insert into high_goods_type (title, user_service, ",
-        "created_user_id, created_time, ",
+        "img, created_user_id, ",
-        "updated_user_id, updated_time, ",
+        "created_time, updated_user_id, ",
-        "`status`, ext_1, ext_2, ",
+        "updated_time, `status`, ",
-        "ext_3)",
+        "ext_1, ext_2, ext_3)",
-        "values (#{title,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, ",
+        "values (#{title,jdbcType=VARCHAR}, #{userService,jdbcType=VARCHAR}, ",
-        "#{createdUserId,jdbcType=INTEGER}, #{createdTime,jdbcType=TIMESTAMP}, ",
+        "#{img,jdbcType=VARCHAR}, #{createdUserId,jdbcType=INTEGER}, ",
-        "#{updatedUserId,jdbcType=INTEGER}, #{updatedTime,jdbcType=TIMESTAMP}, ",
+        "#{createdTime,jdbcType=TIMESTAMP}, #{updatedUserId,jdbcType=INTEGER}, ",
-        "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
+        "#{updatedTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ",
-        "#{ext3,jdbcType=VARCHAR})"
+        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(HighGoodsType record);
@@ -61,6 +61,7 @@ public interface HighGoodsTypeMapper extends HighGoodsTypeMapperExt {
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true),
         @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR),
+        @Result(column="user_service", property="userService", jdbcType=JdbcType.VARCHAR),
         @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
         @Result(column="created_user_id", property="createdUserId", jdbcType=JdbcType.INTEGER),
         @Result(column="created_time", property="createdTime", jdbcType=JdbcType.TIMESTAMP),
@@ -75,14 +76,15 @@ public interface HighGoodsTypeMapper extends HighGoodsTypeMapperExt {
 
     @Select({
         "select",
-        "id, title, img, created_user_id, created_time, updated_user_id, updated_time, ",
+        "id, title, user_service, img, created_user_id, created_time, updated_user_id, ",
-        "`status`, ext_1, ext_2, ext_3",
+        "updated_time, `status`, ext_1, ext_2, ext_3",
         "from high_goods_type",
         "where id = #{id,jdbcType=INTEGER}"
     })
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.INTEGER, id=true),
         @Result(column="title", property="title", jdbcType=JdbcType.VARCHAR),
+        @Result(column="user_service", property="userService", jdbcType=JdbcType.VARCHAR),
         @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR),
         @Result(column="created_user_id", property="createdUserId", jdbcType=JdbcType.INTEGER),
         @Result(column="created_time", property="createdTime", jdbcType=JdbcType.TIMESTAMP),
@@ -107,6 +109,7 @@ public interface HighGoodsTypeMapper extends HighGoodsTypeMapperExt {
     @Update({
         "update high_goods_type",
         "set title = #{title,jdbcType=VARCHAR},",
+          "user_service = #{userService,jdbcType=VARCHAR},",
           "img = #{img,jdbcType=VARCHAR},",
           "created_user_id = #{createdUserId,jdbcType=INTEGER},",
           "created_time = #{createdTime,jdbcType=TIMESTAMP},",

hai-service/src/main/java/com/hai/dao/HighGoodsTypeSqlProvider.java

@@ -32,6 +32,10 @@ public class HighGoodsTypeSqlProvider {
             sql.VALUES("title", "#{title,jdbcType=VARCHAR}");
         }
         
+        if (record.getUserService() != null) {
+            sql.VALUES("user_service", "#{userService,jdbcType=VARCHAR}");
+        }
+        
         if (record.getImg() != null) {
             sql.VALUES("img", "#{img,jdbcType=VARCHAR}");
         }
@@ -79,6 +83,7 @@ public class HighGoodsTypeSqlProvider {
             sql.SELECT("id");
         }
         sql.SELECT("title");
+        sql.SELECT("user_service");
         sql.SELECT("img");
         sql.SELECT("created_user_id");
         sql.SELECT("created_time");
@@ -113,6 +118,10 @@ public class HighGoodsTypeSqlProvider {
             sql.SET("title = #{record.title,jdbcType=VARCHAR}");
         }
         
+        if (record.getUserService() != null) {
+            sql.SET("user_service = #{record.userService,jdbcType=VARCHAR}");
+        }
+        
         if (record.getImg() != null) {
             sql.SET("img = #{record.img,jdbcType=VARCHAR}");
         }
@@ -159,6 +168,7 @@ public class HighGoodsTypeSqlProvider {
         
         sql.SET("id = #{record.id,jdbcType=INTEGER}");
         sql.SET("title = #{record.title,jdbcType=VARCHAR}");
+        sql.SET("user_service = #{record.userService,jdbcType=VARCHAR}");
         sql.SET("img = #{record.img,jdbcType=VARCHAR}");
         sql.SET("created_user_id = #{record.createdUserId,jdbcType=INTEGER}");
         sql.SET("created_time = #{record.createdTime,jdbcType=TIMESTAMP}");
@@ -182,6 +192,10 @@ public class HighGoodsTypeSqlProvider {
             sql.SET("title = #{title,jdbcType=VARCHAR}");
         }
         
+        if (record.getUserService() != null) {
+            sql.SET("user_service = #{userService,jdbcType=VARCHAR}");
+        }
+        
         if (record.getImg() != null) {
             sql.SET("img = #{img,jdbcType=VARCHAR}");
         }

hai-service/src/main/java/com/hai/entity/ApiMemberProduct.java

@@ -20,9 +20,14 @@ public class ApiMemberProduct implements Serializable {
     private Long id;
 
     /**
-     * 充值类型 1:视听办公会员 2:外卖购物会员
+     * 类别id
      */
-    private Integer type;
+    private Integer typeId;
+
+    /**
+     * 品牌id
+     */
+    private Integer brandId;
 
     /**
      * 充值金额
@@ -89,12 +94,20 @@ public class ApiMemberProduct implements Serializable {
         this.id = id;
     }
 
-    public Integer getType() {
+    public Integer getTypeId() {
-        return type;
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public Integer getBrandId() {
+        return brandId;
     }
 
-    public void setType(Integer type) {
+    public void setBrandId(Integer brandId) {
-        this.type = type;
+        this.brandId = brandId;
     }
 
     public BigDecimal getPrice() {
@@ -198,7 +211,8 @@ public class ApiMemberProduct implements Serializable {
         }
         ApiMemberProduct other = (ApiMemberProduct) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
+            && (this.getTypeId() == null ? other.getTypeId() == null : this.getTypeId().equals(other.getTypeId()))
+            && (this.getBrandId() == null ? other.getBrandId() == null : this.getBrandId().equals(other.getBrandId()))
             && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice()))
             && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId()))
             && (this.getSort() == null ? other.getSort() == null : this.getSort().equals(other.getSort()))
@@ -217,7 +231,8 @@ public class ApiMemberProduct implements Serializable {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
+        result = prime * result + ((getTypeId() == null) ? 0 : getTypeId().hashCode());
+        result = prime * result + ((getBrandId() == null) ? 0 : getBrandId().hashCode());
         result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode());
         result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode());
         result = prime * result + ((getSort() == null) ? 0 : getSort().hashCode());
@@ -239,7 +254,8 @@ public class ApiMemberProduct implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
-        sb.append(", type=").append(type);
+        sb.append(", typeId=").append(typeId);
+        sb.append(", brandId=").append(brandId);
         sb.append(", price=").append(price);
         sb.append(", productId=").append(productId);
         sb.append(", sort=").append(sort);

hai-service/src/main/java/com/hai/entity/ApiMemberProductExample.java

@@ -186,63 +186,123 @@ public class ApiMemberProductExample {
             return (Criteria) this;
         }
 
-        public Criteria andTypeIsNull() {
+        public Criteria andTypeIdIsNull() {
-            addCriterion("`type` is null");
+            addCriterion("type_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIsNotNull() {
+        public Criteria andTypeIdIsNotNull() {
-            addCriterion("`type` is not null");
+            addCriterion("type_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andTypeEqualTo(Integer value) {
+        public Criteria andTypeIdEqualTo(Integer value) {
-            addCriterion("`type` =", value, "type");
+            addCriterion("type_id =", value, "typeId");
             return (Criteria) this;
         }
 
-        public Criteria andTypeNotEqualTo(Integer value) {
+        public Criteria andTypeIdNotEqualTo(Integer value) {
-            addCriterion("`type` <>", value, "type");
+            addCriterion("type_id <>", value, "typeId");
             return (Criteria) this;
         }
 
-        public Criteria andTypeGreaterThan(Integer value) {
+        public Criteria andTypeIdGreaterThan(Integer value) {
-            addCriterion("`type` >", value, "type");
+            addCriterion("type_id >", value, "typeId");
             return (Criteria) this;
         }
 
-        public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+        public Criteria andTypeIdGreaterThanOrEqualTo(Integer value) {
-            addCriterion("`type` >=", value, "type");
+            addCriterion("type_id >=", value, "typeId");
             return (Criteria) this;
         }
 
-        public Criteria andTypeLessThan(Integer value) {
+        public Criteria andTypeIdLessThan(Integer value) {
-            addCriterion("`type` <", value, "type");
+            addCriterion("type_id <", value, "typeId");
             return (Criteria) this;
         }
 
-        public Criteria andTypeLessThanOrEqualTo(Integer value) {
+        public Criteria andTypeIdLessThanOrEqualTo(Integer value) {
-            addCriterion("`type` <=", value, "type");
+            addCriterion("type_id <=", value, "typeId");
             return (Criteria) this;
         }
 
-        public Criteria andTypeIn(List<Integer> values) {
+        public Criteria andTypeIdIn(List<Integer> values) {
-            addCriterion("`type` in", values, "type");
+            addCriterion("type_id in", values, "typeId");
             return (Criteria) this;
         }
 
-        public Criteria andTypeNotIn(List<Integer> values) {
+        public Criteria andTypeIdNotIn(List<Integer> values) {
-            addCriterion("`type` not in", values, "type");
+            addCriterion("type_id not in", values, "typeId");
             return (Criteria) this;
         }
 
-        public Criteria andTypeBetween(Integer value1, Integer value2) {
+        public Criteria andTypeIdBetween(Integer value1, Integer value2) {
-            addCriterion("`type` between", value1, value2, "type");
+            addCriterion("type_id between", value1, value2, "typeId");
             return (Criteria) this;
         }
 
-        public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+        public Criteria andTypeIdNotBetween(Integer value1, Integer value2) {
-            addCriterion("`type` not between", value1, value2, "type");
+            addCriterion("type_id not between", value1, value2, "typeId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdIsNull() {
+            addCriterion("brand_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdIsNotNull() {
+            addCriterion("brand_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdEqualTo(Integer value) {
+            addCriterion("brand_id =", value, "brandId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdNotEqualTo(Integer value) {
+            addCriterion("brand_id <>", value, "brandId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdGreaterThan(Integer value) {
+            addCriterion("brand_id >", value, "brandId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("brand_id >=", value, "brandId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdLessThan(Integer value) {
+            addCriterion("brand_id <", value, "brandId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdLessThanOrEqualTo(Integer value) {
+            addCriterion("brand_id <=", value, "brandId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdIn(List<Integer> values) {
+            addCriterion("brand_id in", values, "brandId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdNotIn(List<Integer> values) {
+            addCriterion("brand_id not in", values, "brandId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdBetween(Integer value1, Integer value2) {
+            addCriterion("brand_id between", value1, value2, "brandId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBrandIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("brand_id not between", value1, value2, "brandId");
             return (Criteria) this;
         }
 

hai-service/src/main/java/com/hai/entity/HighGoodsType.java

@@ -23,6 +23,11 @@ public class HighGoodsType implements Serializable {
      */
     private String title;
 
+    /**
+     * 使用业务
+     */
+    private String userService;
+
     /**
      * 图片
      */
@@ -86,6 +91,14 @@ public class HighGoodsType implements Serializable {
         this.title = title;
     }
 
+    public String getUserService() {
+        return userService;
+    }
+
+    public void setUserService(String userService) {
+        this.userService = userService;
+    }
+
     public String getImg() {
         return img;
     }
@@ -172,6 +185,7 @@ public class HighGoodsType implements Serializable {
         HighGoodsType other = (HighGoodsType) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
             && (this.getTitle() == null ? other.getTitle() == null : this.getTitle().equals(other.getTitle()))
+            && (this.getUserService() == null ? other.getUserService() == null : this.getUserService().equals(other.getUserService()))
             && (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg()))
             && (this.getCreatedUserId() == null ? other.getCreatedUserId() == null : this.getCreatedUserId().equals(other.getCreatedUserId()))
             && (this.getCreatedTime() == null ? other.getCreatedTime() == null : this.getCreatedTime().equals(other.getCreatedTime()))
@@ -189,6 +203,7 @@ public class HighGoodsType implements Serializable {
         int result = 1;
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
         result = prime * result + ((getTitle() == null) ? 0 : getTitle().hashCode());
+        result = prime * result + ((getUserService() == null) ? 0 : getUserService().hashCode());
         result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode());
         result = prime * result + ((getCreatedUserId() == null) ? 0 : getCreatedUserId().hashCode());
         result = prime * result + ((getCreatedTime() == null) ? 0 : getCreatedTime().hashCode());
@@ -209,6 +224,7 @@ public class HighGoodsType implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", title=").append(title);
+        sb.append(", userService=").append(userService);
         sb.append(", img=").append(img);
         sb.append(", createdUserId=").append(createdUserId);
         sb.append(", createdTime=").append(createdTime);

hai-service/src/main/java/com/hai/entity/HighGoodsTypeExample.java

@@ -255,6 +255,76 @@ public class HighGoodsTypeExample {
             return (Criteria) this;
         }
 
+        public Criteria andUserServiceIsNull() {
+            addCriterion("user_service is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceIsNotNull() {
+            addCriterion("user_service is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceEqualTo(String value) {
+            addCriterion("user_service =", value, "userService");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceNotEqualTo(String value) {
+            addCriterion("user_service <>", value, "userService");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceGreaterThan(String value) {
+            addCriterion("user_service >", value, "userService");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceGreaterThanOrEqualTo(String value) {
+            addCriterion("user_service >=", value, "userService");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceLessThan(String value) {
+            addCriterion("user_service <", value, "userService");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceLessThanOrEqualTo(String value) {
+            addCriterion("user_service <=", value, "userService");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceLike(String value) {
+            addCriterion("user_service like", value, "userService");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceNotLike(String value) {
+            addCriterion("user_service not like", value, "userService");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceIn(List<String> values) {
+            addCriterion("user_service in", values, "userService");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceNotIn(List<String> values) {
+            addCriterion("user_service not in", values, "userService");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceBetween(String value1, String value2) {
+            addCriterion("user_service between", value1, value2, "userService");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserServiceNotBetween(String value1, String value2) {
+            addCriterion("user_service not between", value1, value2, "userService");
+            return (Criteria) this;
+        }
+
         public Criteria andImgIsNull() {
             addCriterion("img is null");
             return (Criteria) this;