diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/entity/TbProduct.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/entity/TbProduct.java index 40be798..fe3417f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/entity/TbProduct.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/entity/TbProduct.java @@ -107,7 +107,14 @@ public class TbProduct implements Serializable { @Excel(name = "商品规格", width = 15) @ApiModelProperty(value = "商品规格") private java.lang.String specsName; - + /**检测视频*/ + @Excel(name = "检测视频", width = 15) + @ApiModelProperty(value = "检测视频") + private java.lang.String reportVideo; + /**商品视频*/ + @Excel(name = "商品视频", width = 15) + @ApiModelProperty(value = "商品视频") + private java.lang.String video; /**交货时间*/ @Excel(name = "交货时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java index 600f11c..e880cc4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java @@ -101,7 +101,14 @@ public class TbProductOrder implements Serializable { @Excel(name = "商品规格", width = 15) @ApiModelProperty(value = "商品规格") private java.lang.String specsName; - + /**检测视频*/ + @Excel(name = "检测视频", width = 15) + @ApiModelProperty(value = "检测视频") + private java.lang.String reportVideo; + /**商品视频*/ + @Excel(name = "商品视频", width = 15) + @ApiModelProperty(value = "商品视频") + private java.lang.String video; /**暂定数量、*/ @Excel(name = "暂定数量、", width = 15) diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java index 1d5536c..90cf0eb 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java @@ -61,4 +61,12 @@ public class ProductReq implements Serializable { @Excel(name = "商品规格ID", width = 15) @ApiModelProperty(value = "商品规格ID") private java.lang.String specsId; + /**检测视频*/ + @Excel(name = "检测视频", width = 15) + @ApiModelProperty(value = "检测视频") + private java.lang.String reportVideo; + /**商品视频*/ + @Excel(name = "商品视频", width = 15) + @ApiModelProperty(value = "商品视频") + private java.lang.String video; } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java index cac0f88..d1af318 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java @@ -125,6 +125,8 @@ public class ProductServiceImpl extends ServiceImpl tbProductOrder.setPhone(one2.getPhone()); tbProductOrder.setPic(product.getPic()); tbProductOrder.setPicDetail(product.getPicDetail()); + tbProductOrder.setVideo(product.getVideo()); + tbProductOrder.setReportVideo(product.getReportVideo()); tbProductOrder.setSpecsId(product.getSpecsId()); tbProductOrder.setSpecsName(product.getSpecsName()); tbProductOrder.setPrice(product.getPrice());