修改商品字段

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/PmsProduct.java

@@ -11,9 +11,18 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "品牌id")
     private Long brandId;
 
+    @ApiModelProperty(value = "产品大类标识")
+    private Long productBigCategoryId;
+
+    @ApiModelProperty(value = "产品大类类别名称")
+    private String productBigCategoryName;
+
     @ApiModelProperty(value = "产品类别标识")
     private Long productCategoryId;
 
+    @ApiModelProperty(value = "商品分类名称")
+    private String productCategoryName;
+
     @ApiModelProperty(value = "运费模版id")
     private Long feightTemplateId;
 
@@ -62,9 +71,6 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "限制使用的积分数")
     private Integer usePointLimit;
 
-    @ApiModelProperty(value = "副标题")
-    private String subTitle;
-
     @ApiModelProperty(value = "市场价")
     private BigDecimal originalPrice;
 
@@ -90,9 +96,6 @@ public class PmsProduct implements Serializable {
 
     private String note;
 
-    @ApiModelProperty(value = "画册图片，连产品图片限制为5张，以逗号分割")
-    private String albumPics;
-
     private String detailTitle;
 
     @ApiModelProperty(value = "促销开始时间")
@@ -110,14 +113,11 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "品牌名称")
     private String brandName;
 
-    @ApiModelProperty(value = "商品分类名称")
-    private String productCategoryName;
-
     @ApiModelProperty(value = "供应商id")
-    private Long umsCompanyInfoId;
+    private Long compId;
 
     @ApiModelProperty(value = "供应商")
-    private String umsCompanyInfo;
+    private String compName;
 
     @ApiModelProperty(value = "批发价")
     private BigDecimal tradePrice;
@@ -134,9 +134,6 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "生产地")
     private String placeOfProduction;
 
-    @ApiModelProperty(value = "使用说明")
-    private String instructions;
-
     @ApiModelProperty(value = "保质期")
     private String qualityGuaranteePeriod;
 
@@ -144,13 +141,13 @@ public class PmsProduct implements Serializable {
     private String pointsForAttention;
 
     @ApiModelProperty(value = "创建人")
-    private Long createUser;
+    private Long createId;
 
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
     @ApiModelProperty(value = "更新人")
-    private Long updateUser;
+    private Long updateId;
 
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
@@ -158,9 +155,15 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "0:后台发布1：移动端发布")
     private Integer createType;
 
+    @ApiModelProperty(value = "副标题")
+    private String subTitle;
+
     @ApiModelProperty(value = "商品描述")
     private String description;
 
+    @ApiModelProperty(value = "画册图片，连产品图片限制为5张，以逗号分割")
+    private String albumPics;
+
     private String detailDesc;
 
     @ApiModelProperty(value = "产品详情网页内容")
@@ -169,6 +172,9 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "移动端网页详情")
     private String detailMobileHtml;
 
+    @ApiModelProperty(value = "使用说明")
+    private String instructions;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -187,6 +193,22 @@ public class PmsProduct implements Serializable {
         this.brandId = brandId;
     }
 
+    public Long getProductBigCategoryId() {
+        return productBigCategoryId;
+    }
+
+    public void setProductBigCategoryId(Long productBigCategoryId) {
+        this.productBigCategoryId = productBigCategoryId;
+    }
+
+    public String getProductBigCategoryName() {
+        return productBigCategoryName;
+    }
+
+    public void setProductBigCategoryName(String productBigCategoryName) {
+        this.productBigCategoryName = productBigCategoryName;
+    }
+
     public Long getProductCategoryId() {
         return productCategoryId;
     }
@@ -195,6 +217,14 @@ public class PmsProduct implements Serializable {
         this.productCategoryId = productCategoryId;
     }
 
+    public String getProductCategoryName() {
+        return productCategoryName;
+    }
+
+    public void setProductCategoryName(String productCategoryName) {
+        this.productCategoryName = productCategoryName;
+    }
+
     public Long getFeightTemplateId() {
         return feightTemplateId;
     }
@@ -331,14 +361,6 @@ public class PmsProduct implements Serializable {
         this.usePointLimit = usePointLimit;
     }
 
-    public String getSubTitle() {
-        return subTitle;
-    }
-
-    public void setSubTitle(String subTitle) {
-        this.subTitle = subTitle;
-    }
-
     public BigDecimal getOriginalPrice() {
         return originalPrice;
     }
@@ -411,14 +433,6 @@ public class PmsProduct implements Serializable {
         this.note = note;
     }
 
-    public String getAlbumPics() {
-        return albumPics;
-    }
-
-    public void setAlbumPics(String albumPics) {
-        this.albumPics = albumPics;
-    }
-
     public String getDetailTitle() {
         return detailTitle;
     }
@@ -467,28 +481,20 @@ public class PmsProduct implements Serializable {
         this.brandName = brandName;
     }
 
-    public String getProductCategoryName() {
-        return productCategoryName;
-    }
-
-    public void setProductCategoryName(String productCategoryName) {
-        this.productCategoryName = productCategoryName;
+    public Long getCompId() {
+        return compId;
     }
 
-    public Long getUmsCompanyInfoId() {
-        return umsCompanyInfoId;
+    public void setCompId(Long compId) {
+        this.compId = compId;
     }
 
-    public void setUmsCompanyInfoId(Long umsCompanyInfoId) {
-        this.umsCompanyInfoId = umsCompanyInfoId;
+    public String getCompName() {
+        return compName;
     }
 
-    public String getUmsCompanyInfo() {
-        return umsCompanyInfo;
-    }
-
-    public void setUmsCompanyInfo(String umsCompanyInfo) {
-        this.umsCompanyInfo = umsCompanyInfo;
+    public void setCompName(String compName) {
+        this.compName = compName;
     }
 
     public BigDecimal getTradePrice() {
@@ -531,14 +537,6 @@ public class PmsProduct implements Serializable {
         this.placeOfProduction = placeOfProduction;
     }
 
-    public String getInstructions() {
-        return instructions;
-    }
-
-    public void setInstructions(String instructions) {
-        this.instructions = instructions;
-    }
-
     public String getQualityGuaranteePeriod() {
         return qualityGuaranteePeriod;
     }
@@ -555,12 +553,12 @@ public class PmsProduct implements Serializable {
         this.pointsForAttention = pointsForAttention;
     }
 
-    public Long getCreateUser() {
-        return createUser;
+    public Long getCreateId() {
+        return createId;
     }
 
-    public void setCreateUser(Long createUser) {
-        this.createUser = createUser;
+    public void setCreateId(Long createId) {
+        this.createId = createId;
     }
 
     public Date getCreateTime() {
@@ -571,12 +569,12 @@ public class PmsProduct implements Serializable {
         this.createTime = createTime;
     }
 
-    public Long getUpdateUser() {
-        return updateUser;
+    public Long getUpdateId() {
+        return updateId;
     }
 
-    public void setUpdateUser(Long updateUser) {
-        this.updateUser = updateUser;
+    public void setUpdateId(Long updateId) {
+        this.updateId = updateId;
     }
 
     public Date getUpdateTime() {
@@ -595,6 +593,14 @@ public class PmsProduct implements Serializable {
         this.createType = createType;
     }
 
+    public String getSubTitle() {
+        return subTitle;
+    }
+
+    public void setSubTitle(String subTitle) {
+        this.subTitle = subTitle;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -603,6 +609,14 @@ public class PmsProduct implements Serializable {
         this.description = description;
     }
 
+    public String getAlbumPics() {
+        return albumPics;
+    }
+
+    public void setAlbumPics(String albumPics) {
+        this.albumPics = albumPics;
+    }
+
     public String getDetailDesc() {
         return detailDesc;
     }
@@ -627,6 +641,14 @@ public class PmsProduct implements Serializable {
         this.detailMobileHtml = detailMobileHtml;
     }
 
+    public String getInstructions() {
+        return instructions;
+    }
+
+    public void setInstructions(String instructions) {
+        this.instructions = instructions;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -635,7 +657,10 @@ public class PmsProduct implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", brandId=").append(brandId);
+        sb.append(", productBigCategoryId=").append(productBigCategoryId);
+        sb.append(", productBigCategoryName=").append(productBigCategoryName);
         sb.append(", productCategoryId=").append(productCategoryId);
+        sb.append(", productCategoryName=").append(productCategoryName);
         sb.append(", feightTemplateId=").append(feightTemplateId);
         sb.append(", productAttributeCategoryId=").append(productAttributeCategoryId);
         sb.append(", name=").append(name);
@@ -653,7 +678,6 @@ public class PmsProduct implements Serializable {
         sb.append(", giftGrowth=").append(giftGrowth);
         sb.append(", giftPoint=").append(giftPoint);
         sb.append(", usePointLimit=").append(usePointLimit);
-        sb.append(", subTitle=").append(subTitle);
         sb.append(", originalPrice=").append(originalPrice);
         sb.append(", stock=").append(stock);
         sb.append(", lowStock=").append(lowStock);
@@ -663,33 +687,33 @@ public class PmsProduct implements Serializable {
         sb.append(", serviceIds=").append(serviceIds);
         sb.append(", keywords=").append(keywords);
         sb.append(", note=").append(note);
-        sb.append(", albumPics=").append(albumPics);
         sb.append(", detailTitle=").append(detailTitle);
         sb.append(", promotionStartTime=").append(promotionStartTime);
         sb.append(", promotionEndTime=").append(promotionEndTime);
         sb.append(", promotionPerLimit=").append(promotionPerLimit);
         sb.append(", promotionType=").append(promotionType);
         sb.append(", brandName=").append(brandName);
-        sb.append(", productCategoryName=").append(productCategoryName);
-        sb.append(", umsCompanyInfoId=").append(umsCompanyInfoId);
-        sb.append(", umsCompanyInfo=").append(umsCompanyInfo);
+        sb.append(", compId=").append(compId);
+        sb.append(", compName=").append(compName);
         sb.append(", tradePrice=").append(tradePrice);
         sb.append(", spec=").append(spec);
         sb.append(", dateOfManufacture=").append(dateOfManufacture);
         sb.append(", placeOfProductionId=").append(placeOfProductionId);
         sb.append(", placeOfProduction=").append(placeOfProduction);
-        sb.append(", instructions=").append(instructions);
         sb.append(", qualityGuaranteePeriod=").append(qualityGuaranteePeriod);
         sb.append(", pointsForAttention=").append(pointsForAttention);
-        sb.append(", createUser=").append(createUser);
+        sb.append(", createId=").append(createId);
         sb.append(", createTime=").append(createTime);
-        sb.append(", updateUser=").append(updateUser);
+        sb.append(", updateId=").append(updateId);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", createType=").append(createType);
+        sb.append(", subTitle=").append(subTitle);
         sb.append(", description=").append(description);
+        sb.append(", albumPics=").append(albumPics);
         sb.append(", detailDesc=").append(detailDesc);
         sb.append(", detailHtml=").append(detailHtml);
         sb.append(", detailMobileHtml=").append(detailMobileHtml);
+        sb.append(", instructions=").append(instructions);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/PmsProductExample.java

@@ -226,6 +226,136 @@ public class PmsProductExample {
             return (Criteria) this;
         }
 
+        public Criteria andProductBigCategoryIdIsNull() {
+            addCriterion("product_big_category_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryIdIsNotNull() {
+            addCriterion("product_big_category_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryIdEqualTo(Long value) {
+            addCriterion("product_big_category_id =", value, "productBigCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryIdNotEqualTo(Long value) {
+            addCriterion("product_big_category_id <>", value, "productBigCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryIdGreaterThan(Long value) {
+            addCriterion("product_big_category_id >", value, "productBigCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("product_big_category_id >=", value, "productBigCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryIdLessThan(Long value) {
+            addCriterion("product_big_category_id <", value, "productBigCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryIdLessThanOrEqualTo(Long value) {
+            addCriterion("product_big_category_id <=", value, "productBigCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryIdIn(List<Long> values) {
+            addCriterion("product_big_category_id in", values, "productBigCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryIdNotIn(List<Long> values) {
+            addCriterion("product_big_category_id not in", values, "productBigCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryIdBetween(Long value1, Long value2) {
+            addCriterion("product_big_category_id between", value1, value2, "productBigCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryIdNotBetween(Long value1, Long value2) {
+            addCriterion("product_big_category_id not between", value1, value2, "productBigCategoryId");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameIsNull() {
+            addCriterion("product_big_category_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameIsNotNull() {
+            addCriterion("product_big_category_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameEqualTo(String value) {
+            addCriterion("product_big_category_name =", value, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameNotEqualTo(String value) {
+            addCriterion("product_big_category_name <>", value, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameGreaterThan(String value) {
+            addCriterion("product_big_category_name >", value, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameGreaterThanOrEqualTo(String value) {
+            addCriterion("product_big_category_name >=", value, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameLessThan(String value) {
+            addCriterion("product_big_category_name <", value, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameLessThanOrEqualTo(String value) {
+            addCriterion("product_big_category_name <=", value, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameLike(String value) {
+            addCriterion("product_big_category_name like", value, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameNotLike(String value) {
+            addCriterion("product_big_category_name not like", value, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameIn(List<String> values) {
+            addCriterion("product_big_category_name in", values, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameNotIn(List<String> values) {
+            addCriterion("product_big_category_name not in", values, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameBetween(String value1, String value2) {
+            addCriterion("product_big_category_name between", value1, value2, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductBigCategoryNameNotBetween(String value1, String value2) {
+            addCriterion("product_big_category_name not between", value1, value2, "productBigCategoryName");
+            return (Criteria) this;
+        }
+
         public Criteria andProductCategoryIdIsNull() {
             addCriterion("product_category_id is null");
             return (Criteria) this;
@@ -286,6 +416,76 @@ public class PmsProductExample {
             return (Criteria) this;
         }
 
+        public Criteria andProductCategoryNameIsNull() {
+            addCriterion("product_category_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameIsNotNull() {
+            addCriterion("product_category_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameEqualTo(String value) {
+            addCriterion("product_category_name =", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameNotEqualTo(String value) {
+            addCriterion("product_category_name <>", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameGreaterThan(String value) {
+            addCriterion("product_category_name >", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameGreaterThanOrEqualTo(String value) {
+            addCriterion("product_category_name >=", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameLessThan(String value) {
+            addCriterion("product_category_name <", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameLessThanOrEqualTo(String value) {
+            addCriterion("product_category_name <=", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameLike(String value) {
+            addCriterion("product_category_name like", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameNotLike(String value) {
+            addCriterion("product_category_name not like", value, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameIn(List<String> values) {
+            addCriterion("product_category_name in", values, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameNotIn(List<String> values) {
+            addCriterion("product_category_name not in", values, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameBetween(String value1, String value2) {
+            addCriterion("product_category_name between", value1, value2, "productCategoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andProductCategoryNameNotBetween(String value1, String value2) {
+            addCriterion("product_category_name not between", value1, value2, "productCategoryName");
+            return (Criteria) this;
+        }
+
         public Criteria andFeightTemplateIdIsNull() {
             addCriterion("feight_template_id is null");
             return (Criteria) this;
@@ -1336,76 +1536,6 @@ public class PmsProductExample {
             return (Criteria) this;
         }
 
-        public Criteria andSubTitleIsNull() {
-            addCriterion("sub_title is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleIsNotNull() {
-            addCriterion("sub_title is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleEqualTo(String value) {
-            addCriterion("sub_title =", value, "subTitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleNotEqualTo(String value) {
-            addCriterion("sub_title <>", value, "subTitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleGreaterThan(String value) {
-            addCriterion("sub_title >", value, "subTitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleGreaterThanOrEqualTo(String value) {
-            addCriterion("sub_title >=", value, "subTitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleLessThan(String value) {
-            addCriterion("sub_title <", value, "subTitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleLessThanOrEqualTo(String value) {
-            addCriterion("sub_title <=", value, "subTitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleLike(String value) {
-            addCriterion("sub_title like", value, "subTitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleNotLike(String value) {
-            addCriterion("sub_title not like", value, "subTitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleIn(List<String> values) {
-            addCriterion("sub_title in", values, "subTitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleNotIn(List<String> values) {
-            addCriterion("sub_title not in", values, "subTitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleBetween(String value1, String value2) {
-            addCriterion("sub_title between", value1, value2, "subTitle");
-            return (Criteria) this;
-        }
-
-        public Criteria andSubTitleNotBetween(String value1, String value2) {
-            addCriterion("sub_title not between", value1, value2, "subTitle");
-            return (Criteria) this;
-        }
-
         public Criteria andOriginalPriceIsNull() {
             addCriterion("original_price is null");
             return (Criteria) this;
@@ -1986,76 +2116,6 @@ public class PmsProductExample {
             return (Criteria) this;
         }
 
-        public Criteria andAlbumPicsIsNull() {
-            addCriterion("album_pics is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsIsNotNull() {
-            addCriterion("album_pics is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsEqualTo(String value) {
-            addCriterion("album_pics =", value, "albumPics");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsNotEqualTo(String value) {
-            addCriterion("album_pics <>", value, "albumPics");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsGreaterThan(String value) {
-            addCriterion("album_pics >", value, "albumPics");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsGreaterThanOrEqualTo(String value) {
-            addCriterion("album_pics >=", value, "albumPics");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsLessThan(String value) {
-            addCriterion("album_pics <", value, "albumPics");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsLessThanOrEqualTo(String value) {
-            addCriterion("album_pics <=", value, "albumPics");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsLike(String value) {
-            addCriterion("album_pics like", value, "albumPics");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsNotLike(String value) {
-            addCriterion("album_pics not like", value, "albumPics");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsIn(List<String> values) {
-            addCriterion("album_pics in", values, "albumPics");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsNotIn(List<String> values) {
-            addCriterion("album_pics not in", values, "albumPics");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsBetween(String value1, String value2) {
-            addCriterion("album_pics between", value1, value2, "albumPics");
-            return (Criteria) this;
-        }
-
-        public Criteria andAlbumPicsNotBetween(String value1, String value2) {
-            addCriterion("album_pics not between", value1, value2, "albumPics");
-            return (Criteria) this;
-        }
-
         public Criteria andDetailTitleIsNull() {
             addCriterion("detail_title is null");
             return (Criteria) this;
@@ -2436,203 +2496,133 @@ public class PmsProductExample {
             return (Criteria) this;
         }
 
-        public Criteria andProductCategoryNameIsNull() {
-            addCriterion("product_category_name is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameIsNotNull() {
-            addCriterion("product_category_name is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameEqualTo(String value) {
-            addCriterion("product_category_name =", value, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameNotEqualTo(String value) {
-            addCriterion("product_category_name <>", value, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameGreaterThan(String value) {
-            addCriterion("product_category_name >", value, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameGreaterThanOrEqualTo(String value) {
-            addCriterion("product_category_name >=", value, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameLessThan(String value) {
-            addCriterion("product_category_name <", value, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameLessThanOrEqualTo(String value) {
-            addCriterion("product_category_name <=", value, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameLike(String value) {
-            addCriterion("product_category_name like", value, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameNotLike(String value) {
-            addCriterion("product_category_name not like", value, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameIn(List<String> values) {
-            addCriterion("product_category_name in", values, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameNotIn(List<String> values) {
-            addCriterion("product_category_name not in", values, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameBetween(String value1, String value2) {
-            addCriterion("product_category_name between", value1, value2, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andProductCategoryNameNotBetween(String value1, String value2) {
-            addCriterion("product_category_name not between", value1, value2, "productCategoryName");
-            return (Criteria) this;
-        }
-
-        public Criteria andUmsCompanyInfoIdIsNull() {
-            addCriterion("ums_company_info_id is null");
+        public Criteria andCompIdIsNull() {
+            addCriterion("comp_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIdIsNotNull() {
-            addCriterion("ums_company_info_id is not null");
+        public Criteria andCompIdIsNotNull() {
+            addCriterion("comp_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIdEqualTo(Long value) {
-            addCriterion("ums_company_info_id =", value, "umsCompanyInfoId");
+        public Criteria andCompIdEqualTo(Long value) {
+            addCriterion("comp_id =", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIdNotEqualTo(Long value) {
-            addCriterion("ums_company_info_id <>", value, "umsCompanyInfoId");
+        public Criteria andCompIdNotEqualTo(Long value) {
+            addCriterion("comp_id <>", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIdGreaterThan(Long value) {
-            addCriterion("ums_company_info_id >", value, "umsCompanyInfoId");
+        public Criteria andCompIdGreaterThan(Long value) {
+            addCriterion("comp_id >", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIdGreaterThanOrEqualTo(Long value) {
-            addCriterion("ums_company_info_id >=", value, "umsCompanyInfoId");
+        public Criteria andCompIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("comp_id >=", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIdLessThan(Long value) {
-            addCriterion("ums_company_info_id <", value, "umsCompanyInfoId");
+        public Criteria andCompIdLessThan(Long value) {
+            addCriterion("comp_id <", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIdLessThanOrEqualTo(Long value) {
-            addCriterion("ums_company_info_id <=", value, "umsCompanyInfoId");
+        public Criteria andCompIdLessThanOrEqualTo(Long value) {
+            addCriterion("comp_id <=", value, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIdIn(List<Long> values) {
-            addCriterion("ums_company_info_id in", values, "umsCompanyInfoId");
+        public Criteria andCompIdIn(List<Long> values) {
+            addCriterion("comp_id in", values, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIdNotIn(List<Long> values) {
-            addCriterion("ums_company_info_id not in", values, "umsCompanyInfoId");
+        public Criteria andCompIdNotIn(List<Long> values) {
+            addCriterion("comp_id not in", values, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIdBetween(Long value1, Long value2) {
-            addCriterion("ums_company_info_id between", value1, value2, "umsCompanyInfoId");
+        public Criteria andCompIdBetween(Long value1, Long value2) {
+            addCriterion("comp_id between", value1, value2, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIdNotBetween(Long value1, Long value2) {
-            addCriterion("ums_company_info_id not between", value1, value2, "umsCompanyInfoId");
+        public Criteria andCompIdNotBetween(Long value1, Long value2) {
+            addCriterion("comp_id not between", value1, value2, "compId");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIsNull() {
-            addCriterion("ums_company_info is null");
+        public Criteria andCompNameIsNull() {
+            addCriterion("comp_name is null");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIsNotNull() {
-            addCriterion("ums_company_info is not null");
+        public Criteria andCompNameIsNotNull() {
+            addCriterion("comp_name is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoEqualTo(String value) {
-            addCriterion("ums_company_info =", value, "umsCompanyInfo");
+        public Criteria andCompNameEqualTo(String value) {
+            addCriterion("comp_name =", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoNotEqualTo(String value) {
-            addCriterion("ums_company_info <>", value, "umsCompanyInfo");
+        public Criteria andCompNameNotEqualTo(String value) {
+            addCriterion("comp_name <>", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoGreaterThan(String value) {
-            addCriterion("ums_company_info >", value, "umsCompanyInfo");
+        public Criteria andCompNameGreaterThan(String value) {
+            addCriterion("comp_name >", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoGreaterThanOrEqualTo(String value) {
-            addCriterion("ums_company_info >=", value, "umsCompanyInfo");
+        public Criteria andCompNameGreaterThanOrEqualTo(String value) {
+            addCriterion("comp_name >=", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoLessThan(String value) {
-            addCriterion("ums_company_info <", value, "umsCompanyInfo");
+        public Criteria andCompNameLessThan(String value) {
+            addCriterion("comp_name <", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoLessThanOrEqualTo(String value) {
-            addCriterion("ums_company_info <=", value, "umsCompanyInfo");
+        public Criteria andCompNameLessThanOrEqualTo(String value) {
+            addCriterion("comp_name <=", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoLike(String value) {
-            addCriterion("ums_company_info like", value, "umsCompanyInfo");
+        public Criteria andCompNameLike(String value) {
+            addCriterion("comp_name like", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoNotLike(String value) {
-            addCriterion("ums_company_info not like", value, "umsCompanyInfo");
+        public Criteria andCompNameNotLike(String value) {
+            addCriterion("comp_name not like", value, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoIn(List<String> values) {
-            addCriterion("ums_company_info in", values, "umsCompanyInfo");
+        public Criteria andCompNameIn(List<String> values) {
+            addCriterion("comp_name in", values, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoNotIn(List<String> values) {
-            addCriterion("ums_company_info not in", values, "umsCompanyInfo");
+        public Criteria andCompNameNotIn(List<String> values) {
+            addCriterion("comp_name not in", values, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoBetween(String value1, String value2) {
-            addCriterion("ums_company_info between", value1, value2, "umsCompanyInfo");
+        public Criteria andCompNameBetween(String value1, String value2) {
+            addCriterion("comp_name between", value1, value2, "compName");
             return (Criteria) this;
         }
 
-        public Criteria andUmsCompanyInfoNotBetween(String value1, String value2) {
-            addCriterion("ums_company_info not between", value1, value2, "umsCompanyInfo");
+        public Criteria andCompNameNotBetween(String value1, String value2) {
+            addCriterion("comp_name not between", value1, value2, "compName");
             return (Criteria) this;
         }
 
@@ -2966,76 +2956,6 @@ public class PmsProductExample {
             return (Criteria) this;
         }
 
-        public Criteria andInstructionsIsNull() {
-            addCriterion("instructions is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsIsNotNull() {
-            addCriterion("instructions is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsEqualTo(String value) {
-            addCriterion("instructions =", value, "instructions");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsNotEqualTo(String value) {
-            addCriterion("instructions <>", value, "instructions");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsGreaterThan(String value) {
-            addCriterion("instructions >", value, "instructions");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsGreaterThanOrEqualTo(String value) {
-            addCriterion("instructions >=", value, "instructions");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsLessThan(String value) {
-            addCriterion("instructions <", value, "instructions");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsLessThanOrEqualTo(String value) {
-            addCriterion("instructions <=", value, "instructions");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsLike(String value) {
-            addCriterion("instructions like", value, "instructions");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsNotLike(String value) {
-            addCriterion("instructions not like", value, "instructions");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsIn(List<String> values) {
-            addCriterion("instructions in", values, "instructions");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsNotIn(List<String> values) {
-            addCriterion("instructions not in", values, "instructions");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsBetween(String value1, String value2) {
-            addCriterion("instructions between", value1, value2, "instructions");
-            return (Criteria) this;
-        }
-
-        public Criteria andInstructionsNotBetween(String value1, String value2) {
-            addCriterion("instructions not between", value1, value2, "instructions");
-            return (Criteria) this;
-        }
-
         public Criteria andQualityGuaranteePeriodIsNull() {
             addCriterion("quality_guarantee_period is null");
             return (Criteria) this;
@@ -3176,63 +3096,63 @@ public class PmsProductExample {
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserIsNull() {
-            addCriterion("create_user is null");
+        public Criteria andCreateIdIsNull() {
+            addCriterion("create_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserIsNotNull() {
-            addCriterion("create_user is not null");
+        public Criteria andCreateIdIsNotNull() {
+            addCriterion("create_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserEqualTo(Long value) {
-            addCriterion("create_user =", value, "createUser");
+        public Criteria andCreateIdEqualTo(Long value) {
+            addCriterion("create_id =", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserNotEqualTo(Long value) {
-            addCriterion("create_user <>", value, "createUser");
+        public Criteria andCreateIdNotEqualTo(Long value) {
+            addCriterion("create_id <>", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserGreaterThan(Long value) {
-            addCriterion("create_user >", value, "createUser");
+        public Criteria andCreateIdGreaterThan(Long value) {
+            addCriterion("create_id >", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserGreaterThanOrEqualTo(Long value) {
-            addCriterion("create_user >=", value, "createUser");
+        public Criteria andCreateIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("create_id >=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserLessThan(Long value) {
-            addCriterion("create_user <", value, "createUser");
+        public Criteria andCreateIdLessThan(Long value) {
+            addCriterion("create_id <", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserLessThanOrEqualTo(Long value) {
-            addCriterion("create_user <=", value, "createUser");
+        public Criteria andCreateIdLessThanOrEqualTo(Long value) {
+            addCriterion("create_id <=", value, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserIn(List<Long> values) {
-            addCriterion("create_user in", values, "createUser");
+        public Criteria andCreateIdIn(List<Long> values) {
+            addCriterion("create_id in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserNotIn(List<Long> values) {
-            addCriterion("create_user not in", values, "createUser");
+        public Criteria andCreateIdNotIn(List<Long> values) {
+            addCriterion("create_id not in", values, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserBetween(Long value1, Long value2) {
-            addCriterion("create_user between", value1, value2, "createUser");
+        public Criteria andCreateIdBetween(Long value1, Long value2) {
+            addCriterion("create_id between", value1, value2, "createId");
             return (Criteria) this;
         }
 
-        public Criteria andCreateUserNotBetween(Long value1, Long value2) {
-            addCriterion("create_user not between", value1, value2, "createUser");
+        public Criteria andCreateIdNotBetween(Long value1, Long value2) {
+            addCriterion("create_id not between", value1, value2, "createId");
             return (Criteria) this;
         }
 
@@ -3296,63 +3216,63 @@ public class PmsProductExample {
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserIsNull() {
-            addCriterion("update_user is null");
+        public Criteria andUpdateIdIsNull() {
+            addCriterion("update_id is null");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserIsNotNull() {
-            addCriterion("update_user is not null");
+        public Criteria andUpdateIdIsNotNull() {
+            addCriterion("update_id is not null");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserEqualTo(Long value) {
-            addCriterion("update_user =", value, "updateUser");
+        public Criteria andUpdateIdEqualTo(Long value) {
+            addCriterion("update_id =", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserNotEqualTo(Long value) {
-            addCriterion("update_user <>", value, "updateUser");
+        public Criteria andUpdateIdNotEqualTo(Long value) {
+            addCriterion("update_id <>", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserGreaterThan(Long value) {
-            addCriterion("update_user >", value, "updateUser");
+        public Criteria andUpdateIdGreaterThan(Long value) {
+            addCriterion("update_id >", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserGreaterThanOrEqualTo(Long value) {
-            addCriterion("update_user >=", value, "updateUser");
+        public Criteria andUpdateIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("update_id >=", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserLessThan(Long value) {
-            addCriterion("update_user <", value, "updateUser");
+        public Criteria andUpdateIdLessThan(Long value) {
+            addCriterion("update_id <", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserLessThanOrEqualTo(Long value) {
-            addCriterion("update_user <=", value, "updateUser");
+        public Criteria andUpdateIdLessThanOrEqualTo(Long value) {
+            addCriterion("update_id <=", value, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserIn(List<Long> values) {
-            addCriterion("update_user in", values, "updateUser");
+        public Criteria andUpdateIdIn(List<Long> values) {
+            addCriterion("update_id in", values, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserNotIn(List<Long> values) {
-            addCriterion("update_user not in", values, "updateUser");
+        public Criteria andUpdateIdNotIn(List<Long> values) {
+            addCriterion("update_id not in", values, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserBetween(Long value1, Long value2) {
-            addCriterion("update_user between", value1, value2, "updateUser");
+        public Criteria andUpdateIdBetween(Long value1, Long value2) {
+            addCriterion("update_id between", value1, value2, "updateId");
             return (Criteria) this;
         }
 
-        public Criteria andUpdateUserNotBetween(Long value1, Long value2) {
-            addCriterion("update_user not between", value1, value2, "updateUser");
+        public Criteria andUpdateIdNotBetween(Long value1, Long value2) {
+            addCriterion("update_id not between", value1, value2, "updateId");
             return (Criteria) this;
         }
 

forest-admin/admin-mbg/src/main/resources/com/hwrj/cloud/admin/mapper/PmsProductMapper.xml

@@ -4,7 +4,10 @@
   <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.PmsProduct">
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="brand_id" jdbcType="BIGINT" property="brandId" />
+    <result column="product_big_category_id" jdbcType="BIGINT" property="productBigCategoryId" />
+    <result column="product_big_category_name" jdbcType="VARCHAR" property="productBigCategoryName" />
     <result column="product_category_id" jdbcType="BIGINT" property="productCategoryId" />
+    <result column="product_category_name" jdbcType="VARCHAR" property="productCategoryName" />
     <result column="feight_template_id" jdbcType="BIGINT" property="feightTemplateId" />
     <result column="product_attribute_category_id" jdbcType="BIGINT" property="productAttributeCategoryId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -22,7 +25,6 @@
     <result column="gift_growth" jdbcType="INTEGER" property="giftGrowth" />
     <result column="gift_point" jdbcType="INTEGER" property="giftPoint" />
     <result column="use_point_limit" jdbcType="INTEGER" property="usePointLimit" />
-    <result column="sub_title" jdbcType="VARCHAR" property="subTitle" />
     <result column="original_price" jdbcType="DECIMAL" property="originalPrice" />
     <result column="stock" jdbcType="INTEGER" property="stock" />
     <result column="low_stock" jdbcType="INTEGER" property="lowStock" />
@@ -32,35 +34,35 @@
     <result column="service_ids" jdbcType="VARCHAR" property="serviceIds" />
     <result column="keywords" jdbcType="VARCHAR" property="keywords" />
     <result column="note" jdbcType="VARCHAR" property="note" />
-    <result column="album_pics" jdbcType="VARCHAR" property="albumPics" />
     <result column="detail_title" jdbcType="VARCHAR" property="detailTitle" />
     <result column="promotion_start_time" jdbcType="TIMESTAMP" property="promotionStartTime" />
     <result column="promotion_end_time" jdbcType="TIMESTAMP" property="promotionEndTime" />
     <result column="promotion_per_limit" jdbcType="INTEGER" property="promotionPerLimit" />
     <result column="promotion_type" jdbcType="INTEGER" property="promotionType" />
     <result column="brand_name" jdbcType="VARCHAR" property="brandName" />
-    <result column="product_category_name" jdbcType="VARCHAR" property="productCategoryName" />
-    <result column="ums_company_info_id" jdbcType="BIGINT" property="umsCompanyInfoId" />
-    <result column="ums_company_info" jdbcType="VARCHAR" property="umsCompanyInfo" />
+    <result column="comp_id" jdbcType="BIGINT" property="compId" />
+    <result column="comp_name" jdbcType="VARCHAR" property="compName" />
     <result column="trade_price" jdbcType="DECIMAL" property="tradePrice" />
     <result column="spec" jdbcType="VARCHAR" property="spec" />
     <result column="date_of_manufacture" jdbcType="VARCHAR" property="dateOfManufacture" />
     <result column="place_of_production_id" jdbcType="BIGINT" property="placeOfProductionId" />
     <result column="place_of_production" jdbcType="VARCHAR" property="placeOfProduction" />
-    <result column="instructions" jdbcType="VARCHAR" property="instructions" />
     <result column="quality_guarantee_period" jdbcType="VARCHAR" property="qualityGuaranteePeriod" />
     <result column="points_for_attention" jdbcType="VARCHAR" property="pointsForAttention" />
-    <result column="create_user" jdbcType="BIGINT" property="createUser" />
+    <result column="create_id" jdbcType="BIGINT" property="createId" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
-    <result column="update_user" jdbcType="BIGINT" property="updateUser" />
+    <result column="update_id" jdbcType="BIGINT" property="updateId" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
     <result column="create_type" jdbcType="INTEGER" property="createType" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.hwrj.cloud.admin.model.PmsProduct">
+    <result column="sub_title" jdbcType="LONGVARCHAR" property="subTitle" />
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
+    <result column="album_pics" jdbcType="LONGVARCHAR" property="albumPics" />
     <result column="detail_desc" jdbcType="LONGVARCHAR" property="detailDesc" />
     <result column="detail_html" jdbcType="LONGVARCHAR" property="detailHtml" />
     <result column="detail_mobile_html" jdbcType="LONGVARCHAR" property="detailMobileHtml" />
+    <result column="instructions" jdbcType="LONGVARCHAR" property="instructions" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -121,18 +123,19 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, brand_id, product_category_id, feight_template_id, product_attribute_category_id, 
-    name, pic, product_sn, delete_status, publish_status, new_status, recommand_status, 
-    verify_status, sort, sale, price, promotion_price, gift_growth, gift_point, use_point_limit, 
-    sub_title, original_price, stock, low_stock, unit, weight, preview_status, service_ids, 
-    keywords, note, album_pics, detail_title, promotion_start_time, promotion_end_time, 
-    promotion_per_limit, promotion_type, brand_name, product_category_name, ums_company_info_id, 
-    ums_company_info, trade_price, spec, date_of_manufacture, place_of_production_id, 
-    place_of_production, instructions, quality_guarantee_period, points_for_attention, 
-    create_user, create_time, update_user, update_time, create_type
+    id, brand_id, product_big_category_id, product_big_category_name, product_category_id, 
+    product_category_name, feight_template_id, product_attribute_category_id, name, pic, 
+    product_sn, delete_status, publish_status, new_status, recommand_status, verify_status, 
+    sort, sale, price, promotion_price, gift_growth, gift_point, use_point_limit, original_price, 
+    stock, low_stock, unit, weight, preview_status, service_ids, keywords, note, detail_title, 
+    promotion_start_time, promotion_end_time, promotion_per_limit, promotion_type, brand_name, 
+    comp_id, comp_name, trade_price, spec, date_of_manufacture, place_of_production_id, 
+    place_of_production, quality_guarantee_period, points_for_attention, create_id, create_time, 
+    update_id, update_time, create_type
   </sql>
   <sql id="Blob_Column_List">
-    description, detail_desc, detail_html, detail_mobile_html
+    sub_title, description, album_pics, detail_desc, detail_html, detail_mobile_html, 
+    instructions
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.hwrj.cloud.admin.model.PmsProductExample" resultMap="ResultMapWithBLOBs">
     select
@@ -186,46 +189,48 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into pms_product (brand_id, product_category_id, feight_template_id, 
-      product_attribute_category_id, name, pic, 
-      product_sn, delete_status, publish_status, 
-      new_status, recommand_status, verify_status, 
-      sort, sale, price, 
-      promotion_price, gift_growth, gift_point, 
-      use_point_limit, sub_title, original_price, 
-      stock, low_stock, unit, 
-      weight, preview_status, service_ids, 
-      keywords, note, album_pics, 
+    insert into pms_product (brand_id, product_big_category_id, product_big_category_name, 
+      product_category_id, product_category_name, 
+      feight_template_id, product_attribute_category_id, 
+      name, pic, product_sn, 
+      delete_status, publish_status, new_status, 
+      recommand_status, verify_status, sort, 
+      sale, price, promotion_price, 
+      gift_growth, gift_point, use_point_limit, 
+      original_price, stock, low_stock, 
+      unit, weight, preview_status, 
+      service_ids, keywords, note, 
       detail_title, promotion_start_time, promotion_end_time, 
       promotion_per_limit, promotion_type, brand_name, 
-      product_category_name, ums_company_info_id, ums_company_info, 
-      trade_price, spec, date_of_manufacture, 
-      place_of_production_id, place_of_production, 
-      instructions, quality_guarantee_period, points_for_attention, 
-      create_user, create_time, update_user, 
-      update_time, create_type, description, 
-      detail_desc, detail_html, detail_mobile_html
-      )
-    values (#{brandId,jdbcType=BIGINT}, #{productCategoryId,jdbcType=BIGINT}, #{feightTemplateId,jdbcType=BIGINT}, 
-      #{productAttributeCategoryId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, 
-      #{productSn,jdbcType=VARCHAR}, #{deleteStatus,jdbcType=INTEGER}, #{publishStatus,jdbcType=INTEGER}, 
-      #{newStatus,jdbcType=INTEGER}, #{recommandStatus,jdbcType=INTEGER}, #{verifyStatus,jdbcType=INTEGER}, 
-      #{sort,jdbcType=INTEGER}, #{sale,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, 
-      #{promotionPrice,jdbcType=DECIMAL}, #{giftGrowth,jdbcType=INTEGER}, #{giftPoint,jdbcType=INTEGER}, 
-      #{usePointLimit,jdbcType=INTEGER}, #{subTitle,jdbcType=VARCHAR}, #{originalPrice,jdbcType=DECIMAL}, 
-      #{stock,jdbcType=INTEGER}, #{lowStock,jdbcType=INTEGER}, #{unit,jdbcType=VARCHAR}, 
-      #{weight,jdbcType=DECIMAL}, #{previewStatus,jdbcType=INTEGER}, #{serviceIds,jdbcType=VARCHAR}, 
-      #{keywords,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{albumPics,jdbcType=VARCHAR}, 
+      comp_id, comp_name, trade_price, 
+      spec, date_of_manufacture, place_of_production_id, 
+      place_of_production, quality_guarantee_period, 
+      points_for_attention, create_id, create_time, 
+      update_id, update_time, create_type, 
+      sub_title, description, album_pics, 
+      detail_desc, detail_html, detail_mobile_html, 
+      instructions)
+    values (#{brandId,jdbcType=BIGINT}, #{productBigCategoryId,jdbcType=BIGINT}, #{productBigCategoryName,jdbcType=VARCHAR}, 
+      #{productCategoryId,jdbcType=BIGINT}, #{productCategoryName,jdbcType=VARCHAR}, 
+      #{feightTemplateId,jdbcType=BIGINT}, #{productAttributeCategoryId,jdbcType=BIGINT}, 
+      #{name,jdbcType=VARCHAR}, #{pic,jdbcType=VARCHAR}, #{productSn,jdbcType=VARCHAR}, 
+      #{deleteStatus,jdbcType=INTEGER}, #{publishStatus,jdbcType=INTEGER}, #{newStatus,jdbcType=INTEGER}, 
+      #{recommandStatus,jdbcType=INTEGER}, #{verifyStatus,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, 
+      #{sale,jdbcType=INTEGER}, #{price,jdbcType=DECIMAL}, #{promotionPrice,jdbcType=DECIMAL}, 
+      #{giftGrowth,jdbcType=INTEGER}, #{giftPoint,jdbcType=INTEGER}, #{usePointLimit,jdbcType=INTEGER}, 
+      #{originalPrice,jdbcType=DECIMAL}, #{stock,jdbcType=INTEGER}, #{lowStock,jdbcType=INTEGER}, 
+      #{unit,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL}, #{previewStatus,jdbcType=INTEGER}, 
+      #{serviceIds,jdbcType=VARCHAR}, #{keywords,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, 
       #{detailTitle,jdbcType=VARCHAR}, #{promotionStartTime,jdbcType=TIMESTAMP}, #{promotionEndTime,jdbcType=TIMESTAMP}, 
       #{promotionPerLimit,jdbcType=INTEGER}, #{promotionType,jdbcType=INTEGER}, #{brandName,jdbcType=VARCHAR}, 
-      #{productCategoryName,jdbcType=VARCHAR}, #{umsCompanyInfoId,jdbcType=BIGINT}, #{umsCompanyInfo,jdbcType=VARCHAR}, 
-      #{tradePrice,jdbcType=DECIMAL}, #{spec,jdbcType=VARCHAR}, #{dateOfManufacture,jdbcType=VARCHAR}, 
-      #{placeOfProductionId,jdbcType=BIGINT}, #{placeOfProduction,jdbcType=VARCHAR}, 
-      #{instructions,jdbcType=VARCHAR}, #{qualityGuaranteePeriod,jdbcType=VARCHAR}, #{pointsForAttention,jdbcType=VARCHAR}, 
-      #{createUser,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=BIGINT}, 
-      #{updateTime,jdbcType=TIMESTAMP}, #{createType,jdbcType=INTEGER}, #{description,jdbcType=LONGVARCHAR}, 
-      #{detailDesc,jdbcType=LONGVARCHAR}, #{detailHtml,jdbcType=LONGVARCHAR}, #{detailMobileHtml,jdbcType=LONGVARCHAR}
-      )
+      #{compId,jdbcType=BIGINT}, #{compName,jdbcType=VARCHAR}, #{tradePrice,jdbcType=DECIMAL}, 
+      #{spec,jdbcType=VARCHAR}, #{dateOfManufacture,jdbcType=VARCHAR}, #{placeOfProductionId,jdbcType=BIGINT}, 
+      #{placeOfProduction,jdbcType=VARCHAR}, #{qualityGuaranteePeriod,jdbcType=VARCHAR}, 
+      #{pointsForAttention,jdbcType=VARCHAR}, #{createId,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateId,jdbcType=BIGINT}, #{updateTime,jdbcType=TIMESTAMP}, #{createType,jdbcType=INTEGER}, 
+      #{subTitle,jdbcType=LONGVARCHAR}, #{description,jdbcType=LONGVARCHAR}, #{albumPics,jdbcType=LONGVARCHAR}, 
+      #{detailDesc,jdbcType=LONGVARCHAR}, #{detailHtml,jdbcType=LONGVARCHAR}, #{detailMobileHtml,jdbcType=LONGVARCHAR}, 
+      #{instructions,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.hwrj.cloud.admin.model.PmsProduct">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -236,9 +241,18 @@
       <if test="brandId != null">
         brand_id,
       </if>
+      <if test="productBigCategoryId != null">
+        product_big_category_id,
+      </if>
+      <if test="productBigCategoryName != null">
+        product_big_category_name,
+      </if>
       <if test="productCategoryId != null">
         product_category_id,
       </if>
+      <if test="productCategoryName != null">
+        product_category_name,
+      </if>
       <if test="feightTemplateId != null">
         feight_template_id,
       </if>
@@ -290,9 +304,6 @@
       <if test="usePointLimit != null">
         use_point_limit,
       </if>
-      <if test="subTitle != null">
-        sub_title,
-      </if>
       <if test="originalPrice != null">
         original_price,
       </if>
@@ -320,9 +331,6 @@
       <if test="note != null">
         note,
       </if>
-      <if test="albumPics != null">
-        album_pics,
-      </if>
       <if test="detailTitle != null">
         detail_title,
       </if>
@@ -341,14 +349,11 @@
       <if test="brandName != null">
         brand_name,
       </if>
-      <if test="productCategoryName != null">
-        product_category_name,
-      </if>
-      <if test="umsCompanyInfoId != null">
-        ums_company_info_id,
+      <if test="compId != null">
+        comp_id,
       </if>
-      <if test="umsCompanyInfo != null">
-        ums_company_info,
+      <if test="compName != null">
+        comp_name,
       </if>
       <if test="tradePrice != null">
         trade_price,
@@ -365,23 +370,20 @@
       <if test="placeOfProduction != null">
         place_of_production,
       </if>
-      <if test="instructions != null">
-        instructions,
-      </if>
       <if test="qualityGuaranteePeriod != null">
         quality_guarantee_period,
       </if>
       <if test="pointsForAttention != null">
         points_for_attention,
       </if>
-      <if test="createUser != null">
-        create_user,
+      <if test="createId != null">
+        create_id,
       </if>
       <if test="createTime != null">
         create_time,
       </if>
-      <if test="updateUser != null">
-        update_user,
+      <if test="updateId != null">
+        update_id,
       </if>
       <if test="updateTime != null">
         update_time,
@@ -389,9 +391,15 @@
       <if test="createType != null">
         create_type,
       </if>
+      <if test="subTitle != null">
+        sub_title,
+      </if>
       <if test="description != null">
         description,
       </if>
+      <if test="albumPics != null">
+        album_pics,
+      </if>
       <if test="detailDesc != null">
         detail_desc,
       </if>
@@ -401,14 +409,26 @@
       <if test="detailMobileHtml != null">
         detail_mobile_html,
       </if>
+      <if test="instructions != null">
+        instructions,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="brandId != null">
         #{brandId,jdbcType=BIGINT},
       </if>
+      <if test="productBigCategoryId != null">
+        #{productBigCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="productBigCategoryName != null">
+        #{productBigCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="productCategoryId != null">
         #{productCategoryId,jdbcType=BIGINT},
       </if>
+      <if test="productCategoryName != null">
+        #{productCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="feightTemplateId != null">
         #{feightTemplateId,jdbcType=BIGINT},
       </if>
@@ -460,9 +480,6 @@
       <if test="usePointLimit != null">
         #{usePointLimit,jdbcType=INTEGER},
       </if>
-      <if test="subTitle != null">
-        #{subTitle,jdbcType=VARCHAR},
-      </if>
       <if test="originalPrice != null">
         #{originalPrice,jdbcType=DECIMAL},
       </if>
@@ -490,9 +507,6 @@
       <if test="note != null">
         #{note,jdbcType=VARCHAR},
       </if>
-      <if test="albumPics != null">
-        #{albumPics,jdbcType=VARCHAR},
-      </if>
       <if test="detailTitle != null">
         #{detailTitle,jdbcType=VARCHAR},
       </if>
@@ -511,14 +525,11 @@
       <if test="brandName != null">
         #{brandName,jdbcType=VARCHAR},
       </if>
-      <if test="productCategoryName != null">
-        #{productCategoryName,jdbcType=VARCHAR},
-      </if>
-      <if test="umsCompanyInfoId != null">
-        #{umsCompanyInfoId,jdbcType=BIGINT},
+      <if test="compId != null">
+        #{compId,jdbcType=BIGINT},
       </if>
-      <if test="umsCompanyInfo != null">
-        #{umsCompanyInfo,jdbcType=VARCHAR},
+      <if test="compName != null">
+        #{compName,jdbcType=VARCHAR},
       </if>
       <if test="tradePrice != null">
         #{tradePrice,jdbcType=DECIMAL},
@@ -535,23 +546,20 @@
       <if test="placeOfProduction != null">
         #{placeOfProduction,jdbcType=VARCHAR},
       </if>
-      <if test="instructions != null">
-        #{instructions,jdbcType=VARCHAR},
-      </if>
       <if test="qualityGuaranteePeriod != null">
         #{qualityGuaranteePeriod,jdbcType=VARCHAR},
       </if>
       <if test="pointsForAttention != null">
         #{pointsForAttention,jdbcType=VARCHAR},
       </if>
-      <if test="createUser != null">
-        #{createUser,jdbcType=BIGINT},
+      <if test="createId != null">
+        #{createId,jdbcType=BIGINT},
       </if>
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updateUser != null">
-        #{updateUser,jdbcType=BIGINT},
+      <if test="updateId != null">
+        #{updateId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         #{updateTime,jdbcType=TIMESTAMP},
@@ -559,9 +567,15 @@
       <if test="createType != null">
         #{createType,jdbcType=INTEGER},
       </if>
+      <if test="subTitle != null">
+        #{subTitle,jdbcType=LONGVARCHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
+      <if test="albumPics != null">
+        #{albumPics,jdbcType=LONGVARCHAR},
+      </if>
       <if test="detailDesc != null">
         #{detailDesc,jdbcType=LONGVARCHAR},
       </if>
@@ -571,6 +585,9 @@
       <if test="detailMobileHtml != null">
         #{detailMobileHtml,jdbcType=LONGVARCHAR},
       </if>
+      <if test="instructions != null">
+        #{instructions,jdbcType=LONGVARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.hwrj.cloud.admin.model.PmsProductExample" resultType="java.lang.Long">
@@ -588,9 +605,18 @@
       <if test="record.brandId != null">
         brand_id = #{record.brandId,jdbcType=BIGINT},
       </if>
+      <if test="record.productBigCategoryId != null">
+        product_big_category_id = #{record.productBigCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="record.productBigCategoryName != null">
+        product_big_category_name = #{record.productBigCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="record.productCategoryId != null">
         product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
       </if>
+      <if test="record.productCategoryName != null">
+        product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="record.feightTemplateId != null">
         feight_template_id = #{record.feightTemplateId,jdbcType=BIGINT},
       </if>
@@ -642,9 +668,6 @@
       <if test="record.usePointLimit != null">
         use_point_limit = #{record.usePointLimit,jdbcType=INTEGER},
       </if>
-      <if test="record.subTitle != null">
-        sub_title = #{record.subTitle,jdbcType=VARCHAR},
-      </if>
       <if test="record.originalPrice != null">
         original_price = #{record.originalPrice,jdbcType=DECIMAL},
       </if>
@@ -672,9 +695,6 @@
       <if test="record.note != null">
         note = #{record.note,jdbcType=VARCHAR},
       </if>
-      <if test="record.albumPics != null">
-        album_pics = #{record.albumPics,jdbcType=VARCHAR},
-      </if>
       <if test="record.detailTitle != null">
         detail_title = #{record.detailTitle,jdbcType=VARCHAR},
       </if>
@@ -693,14 +713,11 @@
       <if test="record.brandName != null">
         brand_name = #{record.brandName,jdbcType=VARCHAR},
       </if>
-      <if test="record.productCategoryName != null">
-        product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.umsCompanyInfoId != null">
-        ums_company_info_id = #{record.umsCompanyInfoId,jdbcType=BIGINT},
+      <if test="record.compId != null">
+        comp_id = #{record.compId,jdbcType=BIGINT},
       </if>
-      <if test="record.umsCompanyInfo != null">
-        ums_company_info = #{record.umsCompanyInfo,jdbcType=VARCHAR},
+      <if test="record.compName != null">
+        comp_name = #{record.compName,jdbcType=VARCHAR},
       </if>
       <if test="record.tradePrice != null">
         trade_price = #{record.tradePrice,jdbcType=DECIMAL},
@@ -717,23 +734,20 @@
       <if test="record.placeOfProduction != null">
         place_of_production = #{record.placeOfProduction,jdbcType=VARCHAR},
       </if>
-      <if test="record.instructions != null">
-        instructions = #{record.instructions,jdbcType=VARCHAR},
-      </if>
       <if test="record.qualityGuaranteePeriod != null">
         quality_guarantee_period = #{record.qualityGuaranteePeriod,jdbcType=VARCHAR},
       </if>
       <if test="record.pointsForAttention != null">
         points_for_attention = #{record.pointsForAttention,jdbcType=VARCHAR},
       </if>
-      <if test="record.createUser != null">
-        create_user = #{record.createUser,jdbcType=BIGINT},
+      <if test="record.createId != null">
+        create_id = #{record.createId,jdbcType=BIGINT},
       </if>
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="record.updateUser != null">
-        update_user = #{record.updateUser,jdbcType=BIGINT},
+      <if test="record.updateId != null">
+        update_id = #{record.updateId,jdbcType=BIGINT},
       </if>
       <if test="record.updateTime != null">
         update_time = #{record.updateTime,jdbcType=TIMESTAMP},
@@ -741,9 +755,15 @@
       <if test="record.createType != null">
         create_type = #{record.createType,jdbcType=INTEGER},
       </if>
+      <if test="record.subTitle != null">
+        sub_title = #{record.subTitle,jdbcType=LONGVARCHAR},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.albumPics != null">
+        album_pics = #{record.albumPics,jdbcType=LONGVARCHAR},
+      </if>
       <if test="record.detailDesc != null">
         detail_desc = #{record.detailDesc,jdbcType=LONGVARCHAR},
       </if>
@@ -753,6 +773,9 @@
       <if test="record.detailMobileHtml != null">
         detail_mobile_html = #{record.detailMobileHtml,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.instructions != null">
+        instructions = #{record.instructions,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -762,7 +785,10 @@
     update pms_product
     set id = #{record.id,jdbcType=BIGINT},
       brand_id = #{record.brandId,jdbcType=BIGINT},
+      product_big_category_id = #{record.productBigCategoryId,jdbcType=BIGINT},
+      product_big_category_name = #{record.productBigCategoryName,jdbcType=VARCHAR},
       product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
+      product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
       feight_template_id = #{record.feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{record.productAttributeCategoryId,jdbcType=BIGINT},
       name = #{record.name,jdbcType=VARCHAR},
@@ -780,7 +806,6 @@
       gift_growth = #{record.giftGrowth,jdbcType=INTEGER},
       gift_point = #{record.giftPoint,jdbcType=INTEGER},
       use_point_limit = #{record.usePointLimit,jdbcType=INTEGER},
-      sub_title = #{record.subTitle,jdbcType=VARCHAR},
       original_price = #{record.originalPrice,jdbcType=DECIMAL},
       stock = #{record.stock,jdbcType=INTEGER},
       low_stock = #{record.lowStock,jdbcType=INTEGER},
@@ -790,33 +815,33 @@
       service_ids = #{record.serviceIds,jdbcType=VARCHAR},
       keywords = #{record.keywords,jdbcType=VARCHAR},
       note = #{record.note,jdbcType=VARCHAR},
-      album_pics = #{record.albumPics,jdbcType=VARCHAR},
       detail_title = #{record.detailTitle,jdbcType=VARCHAR},
       promotion_start_time = #{record.promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{record.promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{record.promotionPerLimit,jdbcType=INTEGER},
       promotion_type = #{record.promotionType,jdbcType=INTEGER},
       brand_name = #{record.brandName,jdbcType=VARCHAR},
-      product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
-      ums_company_info_id = #{record.umsCompanyInfoId,jdbcType=BIGINT},
-      ums_company_info = #{record.umsCompanyInfo,jdbcType=VARCHAR},
+      comp_id = #{record.compId,jdbcType=BIGINT},
+      comp_name = #{record.compName,jdbcType=VARCHAR},
       trade_price = #{record.tradePrice,jdbcType=DECIMAL},
       spec = #{record.spec,jdbcType=VARCHAR},
       date_of_manufacture = #{record.dateOfManufacture,jdbcType=VARCHAR},
       place_of_production_id = #{record.placeOfProductionId,jdbcType=BIGINT},
       place_of_production = #{record.placeOfProduction,jdbcType=VARCHAR},
-      instructions = #{record.instructions,jdbcType=VARCHAR},
       quality_guarantee_period = #{record.qualityGuaranteePeriod,jdbcType=VARCHAR},
       points_for_attention = #{record.pointsForAttention,jdbcType=VARCHAR},
-      create_user = #{record.createUser,jdbcType=BIGINT},
+      create_id = #{record.createId,jdbcType=BIGINT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_user = #{record.updateUser,jdbcType=BIGINT},
+      update_id = #{record.updateId,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       create_type = #{record.createType,jdbcType=INTEGER},
+      sub_title = #{record.subTitle,jdbcType=LONGVARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR},
+      album_pics = #{record.albumPics,jdbcType=LONGVARCHAR},
       detail_desc = #{record.detailDesc,jdbcType=LONGVARCHAR},
       detail_html = #{record.detailHtml,jdbcType=LONGVARCHAR},
-      detail_mobile_html = #{record.detailMobileHtml,jdbcType=LONGVARCHAR}
+      detail_mobile_html = #{record.detailMobileHtml,jdbcType=LONGVARCHAR},
+      instructions = #{record.instructions,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -825,7 +850,10 @@
     update pms_product
     set id = #{record.id,jdbcType=BIGINT},
       brand_id = #{record.brandId,jdbcType=BIGINT},
+      product_big_category_id = #{record.productBigCategoryId,jdbcType=BIGINT},
+      product_big_category_name = #{record.productBigCategoryName,jdbcType=VARCHAR},
       product_category_id = #{record.productCategoryId,jdbcType=BIGINT},
+      product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
       feight_template_id = #{record.feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{record.productAttributeCategoryId,jdbcType=BIGINT},
       name = #{record.name,jdbcType=VARCHAR},
@@ -843,7 +871,6 @@
       gift_growth = #{record.giftGrowth,jdbcType=INTEGER},
       gift_point = #{record.giftPoint,jdbcType=INTEGER},
       use_point_limit = #{record.usePointLimit,jdbcType=INTEGER},
-      sub_title = #{record.subTitle,jdbcType=VARCHAR},
       original_price = #{record.originalPrice,jdbcType=DECIMAL},
       stock = #{record.stock,jdbcType=INTEGER},
       low_stock = #{record.lowStock,jdbcType=INTEGER},
@@ -853,27 +880,24 @@
       service_ids = #{record.serviceIds,jdbcType=VARCHAR},
       keywords = #{record.keywords,jdbcType=VARCHAR},
       note = #{record.note,jdbcType=VARCHAR},
-      album_pics = #{record.albumPics,jdbcType=VARCHAR},
       detail_title = #{record.detailTitle,jdbcType=VARCHAR},
       promotion_start_time = #{record.promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{record.promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{record.promotionPerLimit,jdbcType=INTEGER},
       promotion_type = #{record.promotionType,jdbcType=INTEGER},
       brand_name = #{record.brandName,jdbcType=VARCHAR},
-      product_category_name = #{record.productCategoryName,jdbcType=VARCHAR},
-      ums_company_info_id = #{record.umsCompanyInfoId,jdbcType=BIGINT},
-      ums_company_info = #{record.umsCompanyInfo,jdbcType=VARCHAR},
+      comp_id = #{record.compId,jdbcType=BIGINT},
+      comp_name = #{record.compName,jdbcType=VARCHAR},
       trade_price = #{record.tradePrice,jdbcType=DECIMAL},
       spec = #{record.spec,jdbcType=VARCHAR},
       date_of_manufacture = #{record.dateOfManufacture,jdbcType=VARCHAR},
       place_of_production_id = #{record.placeOfProductionId,jdbcType=BIGINT},
       place_of_production = #{record.placeOfProduction,jdbcType=VARCHAR},
-      instructions = #{record.instructions,jdbcType=VARCHAR},
       quality_guarantee_period = #{record.qualityGuaranteePeriod,jdbcType=VARCHAR},
       points_for_attention = #{record.pointsForAttention,jdbcType=VARCHAR},
-      create_user = #{record.createUser,jdbcType=BIGINT},
+      create_id = #{record.createId,jdbcType=BIGINT},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      update_user = #{record.updateUser,jdbcType=BIGINT},
+      update_id = #{record.updateId,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=TIMESTAMP},
       create_type = #{record.createType,jdbcType=INTEGER}
     <if test="_parameter != null">
@@ -886,9 +910,18 @@
       <if test="brandId != null">
         brand_id = #{brandId,jdbcType=BIGINT},
       </if>
+      <if test="productBigCategoryId != null">
+        product_big_category_id = #{productBigCategoryId,jdbcType=BIGINT},
+      </if>
+      <if test="productBigCategoryName != null">
+        product_big_category_name = #{productBigCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="productCategoryId != null">
         product_category_id = #{productCategoryId,jdbcType=BIGINT},
       </if>
+      <if test="productCategoryName != null">
+        product_category_name = #{productCategoryName,jdbcType=VARCHAR},
+      </if>
       <if test="feightTemplateId != null">
         feight_template_id = #{feightTemplateId,jdbcType=BIGINT},
       </if>
@@ -940,9 +973,6 @@
       <if test="usePointLimit != null">
         use_point_limit = #{usePointLimit,jdbcType=INTEGER},
       </if>
-      <if test="subTitle != null">
-        sub_title = #{subTitle,jdbcType=VARCHAR},
-      </if>
       <if test="originalPrice != null">
         original_price = #{originalPrice,jdbcType=DECIMAL},
       </if>
@@ -970,9 +1000,6 @@
       <if test="note != null">
         note = #{note,jdbcType=VARCHAR},
       </if>
-      <if test="albumPics != null">
-        album_pics = #{albumPics,jdbcType=VARCHAR},
-      </if>
       <if test="detailTitle != null">
         detail_title = #{detailTitle,jdbcType=VARCHAR},
       </if>
@@ -991,14 +1018,11 @@
       <if test="brandName != null">
         brand_name = #{brandName,jdbcType=VARCHAR},
       </if>
-      <if test="productCategoryName != null">
-        product_category_name = #{productCategoryName,jdbcType=VARCHAR},
-      </if>
-      <if test="umsCompanyInfoId != null">
-        ums_company_info_id = #{umsCompanyInfoId,jdbcType=BIGINT},
+      <if test="compId != null">
+        comp_id = #{compId,jdbcType=BIGINT},
       </if>
-      <if test="umsCompanyInfo != null">
-        ums_company_info = #{umsCompanyInfo,jdbcType=VARCHAR},
+      <if test="compName != null">
+        comp_name = #{compName,jdbcType=VARCHAR},
       </if>
       <if test="tradePrice != null">
         trade_price = #{tradePrice,jdbcType=DECIMAL},
@@ -1015,23 +1039,20 @@
       <if test="placeOfProduction != null">
         place_of_production = #{placeOfProduction,jdbcType=VARCHAR},
       </if>
-      <if test="instructions != null">
-        instructions = #{instructions,jdbcType=VARCHAR},
-      </if>
       <if test="qualityGuaranteePeriod != null">
         quality_guarantee_period = #{qualityGuaranteePeriod,jdbcType=VARCHAR},
       </if>
       <if test="pointsForAttention != null">
         points_for_attention = #{pointsForAttention,jdbcType=VARCHAR},
       </if>
-      <if test="createUser != null">
-        create_user = #{createUser,jdbcType=BIGINT},
+      <if test="createId != null">
+        create_id = #{createId,jdbcType=BIGINT},
       </if>
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
-      <if test="updateUser != null">
-        update_user = #{updateUser,jdbcType=BIGINT},
+      <if test="updateId != null">
+        update_id = #{updateId,jdbcType=BIGINT},
       </if>
       <if test="updateTime != null">
         update_time = #{updateTime,jdbcType=TIMESTAMP},
@@ -1039,9 +1060,15 @@
       <if test="createType != null">
         create_type = #{createType,jdbcType=INTEGER},
       </if>
+      <if test="subTitle != null">
+        sub_title = #{subTitle,jdbcType=LONGVARCHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
+      <if test="albumPics != null">
+        album_pics = #{albumPics,jdbcType=LONGVARCHAR},
+      </if>
       <if test="detailDesc != null">
         detail_desc = #{detailDesc,jdbcType=LONGVARCHAR},
       </if>
@@ -1051,13 +1078,19 @@
       <if test="detailMobileHtml != null">
         detail_mobile_html = #{detailMobileHtml,jdbcType=LONGVARCHAR},
       </if>
+      <if test="instructions != null">
+        instructions = #{instructions,jdbcType=LONGVARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.admin.model.PmsProduct">
     update pms_product
     set brand_id = #{brandId,jdbcType=BIGINT},
+      product_big_category_id = #{productBigCategoryId,jdbcType=BIGINT},
+      product_big_category_name = #{productBigCategoryName,jdbcType=VARCHAR},
       product_category_id = #{productCategoryId,jdbcType=BIGINT},
+      product_category_name = #{productCategoryName,jdbcType=VARCHAR},
       feight_template_id = #{feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{productAttributeCategoryId,jdbcType=BIGINT},
       name = #{name,jdbcType=VARCHAR},
@@ -1075,7 +1108,6 @@
       gift_growth = #{giftGrowth,jdbcType=INTEGER},
       gift_point = #{giftPoint,jdbcType=INTEGER},
       use_point_limit = #{usePointLimit,jdbcType=INTEGER},
-      sub_title = #{subTitle,jdbcType=VARCHAR},
       original_price = #{originalPrice,jdbcType=DECIMAL},
       stock = #{stock,jdbcType=INTEGER},
       low_stock = #{lowStock,jdbcType=INTEGER},
@@ -1085,39 +1117,42 @@
       service_ids = #{serviceIds,jdbcType=VARCHAR},
       keywords = #{keywords,jdbcType=VARCHAR},
       note = #{note,jdbcType=VARCHAR},
-      album_pics = #{albumPics,jdbcType=VARCHAR},
       detail_title = #{detailTitle,jdbcType=VARCHAR},
       promotion_start_time = #{promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{promotionPerLimit,jdbcType=INTEGER},
       promotion_type = #{promotionType,jdbcType=INTEGER},
       brand_name = #{brandName,jdbcType=VARCHAR},
-      product_category_name = #{productCategoryName,jdbcType=VARCHAR},
-      ums_company_info_id = #{umsCompanyInfoId,jdbcType=BIGINT},
-      ums_company_info = #{umsCompanyInfo,jdbcType=VARCHAR},
+      comp_id = #{compId,jdbcType=BIGINT},
+      comp_name = #{compName,jdbcType=VARCHAR},
       trade_price = #{tradePrice,jdbcType=DECIMAL},
       spec = #{spec,jdbcType=VARCHAR},
       date_of_manufacture = #{dateOfManufacture,jdbcType=VARCHAR},
       place_of_production_id = #{placeOfProductionId,jdbcType=BIGINT},
       place_of_production = #{placeOfProduction,jdbcType=VARCHAR},
-      instructions = #{instructions,jdbcType=VARCHAR},
       quality_guarantee_period = #{qualityGuaranteePeriod,jdbcType=VARCHAR},
       points_for_attention = #{pointsForAttention,jdbcType=VARCHAR},
-      create_user = #{createUser,jdbcType=BIGINT},
+      create_id = #{createId,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_user = #{updateUser,jdbcType=BIGINT},
+      update_id = #{updateId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       create_type = #{createType,jdbcType=INTEGER},
+      sub_title = #{subTitle,jdbcType=LONGVARCHAR},
       description = #{description,jdbcType=LONGVARCHAR},
+      album_pics = #{albumPics,jdbcType=LONGVARCHAR},
       detail_desc = #{detailDesc,jdbcType=LONGVARCHAR},
       detail_html = #{detailHtml,jdbcType=LONGVARCHAR},
-      detail_mobile_html = #{detailMobileHtml,jdbcType=LONGVARCHAR}
+      detail_mobile_html = #{detailMobileHtml,jdbcType=LONGVARCHAR},
+      instructions = #{instructions,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.PmsProduct">
     update pms_product
     set brand_id = #{brandId,jdbcType=BIGINT},
+      product_big_category_id = #{productBigCategoryId,jdbcType=BIGINT},
+      product_big_category_name = #{productBigCategoryName,jdbcType=VARCHAR},
       product_category_id = #{productCategoryId,jdbcType=BIGINT},
+      product_category_name = #{productCategoryName,jdbcType=VARCHAR},
       feight_template_id = #{feightTemplateId,jdbcType=BIGINT},
       product_attribute_category_id = #{productAttributeCategoryId,jdbcType=BIGINT},
       name = #{name,jdbcType=VARCHAR},
@@ -1135,7 +1170,6 @@
       gift_growth = #{giftGrowth,jdbcType=INTEGER},
       gift_point = #{giftPoint,jdbcType=INTEGER},
       use_point_limit = #{usePointLimit,jdbcType=INTEGER},
-      sub_title = #{subTitle,jdbcType=VARCHAR},
       original_price = #{originalPrice,jdbcType=DECIMAL},
       stock = #{stock,jdbcType=INTEGER},
       low_stock = #{lowStock,jdbcType=INTEGER},
@@ -1145,27 +1179,24 @@
       service_ids = #{serviceIds,jdbcType=VARCHAR},
       keywords = #{keywords,jdbcType=VARCHAR},
       note = #{note,jdbcType=VARCHAR},
-      album_pics = #{albumPics,jdbcType=VARCHAR},
       detail_title = #{detailTitle,jdbcType=VARCHAR},
       promotion_start_time = #{promotionStartTime,jdbcType=TIMESTAMP},
       promotion_end_time = #{promotionEndTime,jdbcType=TIMESTAMP},
       promotion_per_limit = #{promotionPerLimit,jdbcType=INTEGER},
       promotion_type = #{promotionType,jdbcType=INTEGER},
       brand_name = #{brandName,jdbcType=VARCHAR},
-      product_category_name = #{productCategoryName,jdbcType=VARCHAR},
-      ums_company_info_id = #{umsCompanyInfoId,jdbcType=BIGINT},
-      ums_company_info = #{umsCompanyInfo,jdbcType=VARCHAR},
+      comp_id = #{compId,jdbcType=BIGINT},
+      comp_name = #{compName,jdbcType=VARCHAR},
       trade_price = #{tradePrice,jdbcType=DECIMAL},
       spec = #{spec,jdbcType=VARCHAR},
       date_of_manufacture = #{dateOfManufacture,jdbcType=VARCHAR},
       place_of_production_id = #{placeOfProductionId,jdbcType=BIGINT},
       place_of_production = #{placeOfProduction,jdbcType=VARCHAR},
-      instructions = #{instructions,jdbcType=VARCHAR},
       quality_guarantee_period = #{qualityGuaranteePeriod,jdbcType=VARCHAR},
       points_for_attention = #{pointsForAttention,jdbcType=VARCHAR},
-      create_user = #{createUser,jdbcType=BIGINT},
+      create_id = #{createId,jdbcType=BIGINT},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      update_user = #{updateUser,jdbcType=BIGINT},
+      update_id = #{updateId,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=TIMESTAMP},
       create_type = #{createType,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UploadCompanyInfoAndProductController.java

@@ -377,7 +377,7 @@ public class UploadCompanyInfoAndProductController {
         PmsProductExample pms = new PmsProductExample();
         PmsProductExample.Criteria criteria = pms.createCriteria();
 
-        criteria.andUmsCompanyInfoEqualTo(companyName);
+        criteria.andCompNameEqualTo(companyName);
 
 //        criteria.andUmsCompanyInfoIdEqualTo(companyId);
         pms.setOrderByClause("id asc");

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsProductServiceImpl.java

@@ -181,10 +181,10 @@ public class PmsProductServiceImpl implements PmsProductService {
         productAttributeValueExample.createCriteria().andProductIdEqualTo(id);
         productAttributeValueMapper.deleteByExample(productAttributeValueExample);
         relateAndInsertList(productAttributeValueDao, productParam.getProductAttributeValueList(), id);
-        //关联专题
-        subjectService.relateAndUpdateList(productParam.getSubjectProductRelationList(), id);
-        //关联优选
-        prefrenceAreaService.relateAndUpdateList(productParam.getPrefrenceAreaProductRelationList(), id);
+//        //关联专题
+//        subjectService.relateAndUpdateList(productParam.getSubjectProductRelationList(), id);
+//        //关联优选
+//        prefrenceAreaService.relateAndUpdateList(productParam.getPrefrenceAreaProductRelationList(), id);
         count = 1;
         return count;
     }

forest-admin/admin-server/src/main/resources/dao/ProductExcelDao.xml

@@ -119,17 +119,19 @@
         </foreach>
     </insert>
     <select id="bigDataList" resultType="com.hwrj.cloud.admin.dto.param.BigDataListVo">
-     SELECT
+        SELECT
         a.id,
         a.`name` AS 'name',
         a.pic AS pic,
         a.brand_name AS brandName,
         a.price AS price,
-        a.ums_company_info AS umsCompanyInfo
-    FROM
+        b.comp_name AS umsCompanyInfo
+        FROM
         pms_product a
-        WHERE 1=1
-        AND  a.delete_status = 0
+        LEFT JOIN ums_company_info b ON a.comp_id = b.id
+        WHERE
+        1 = 1
+        AND a.delete_status = 0
     <if test="typeId != null">
         AND a.product_big_category_id = #{typeId}
     </if>

forest-admin/admin-server/src/test/java/com/hwrj/cloud/admin/FirstUploadForestData.java

@@ -379,7 +379,7 @@ private int i = 1;
         PmsProductExample pms = new PmsProductExample();
         PmsProductExample.Criteria criteria = pms.createCriteria();
 
-            criteria.andUmsCompanyInfoEqualTo(companyName);
+            criteria.andCompNameEqualTo(companyName);
 
 //        criteria.andUmsCompanyInfoIdEqualTo(companyId);
         pms.setOrderByClause("id asc");