Merge remote-tracking branch 'origin/hph' into test

eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/ViewConInfoFlow.java

@@ -123,6 +123,10 @@ public class ViewConInfoFlow implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
+    @Column(name = "price")
+    @ApiModelProperty(value = "单价")
+    private BigDecimal price;
+
 
 
     public void copy(ViewConInfoFlow source){

eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowDto.java

@@ -68,4 +68,6 @@ public class ViewConInfoFlowDto implements Serializable {
     private String isCheck;
     private Date createTime;
     private Date updateTime;
+
+    private BigDecimal price;
 }