diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java index b91594aa..c7efd392 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java @@ -73,6 +73,19 @@ public class ViewConInfoFlow implements Serializable { @ApiModelProperty(value = "balance") private BigDecimal balance; + + + @Column(name = "`product_id`") + @ApiModelProperty(value = "商品id") + private String productId; + + + @Column(name = "`product_name`") + @ApiModelProperty(value = "商品名称") + private String productName; + + + public void copy(ViewConInfoFlow source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java index 93397159..158170a4 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java @@ -15,7 +15,10 @@ */ package cn.ysk.cashier.cons.service.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import javax.persistence.Column; import java.math.BigDecimal; import java.io.Serializable; @@ -41,4 +44,9 @@ public class ViewConInfoFlowDto implements Serializable { private BigDecimal conOut; private BigDecimal balance; + + + private String productId; + + private String productName; } \ No newline at end of file