Merge branch 'ww' into test

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java

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

@@ -97,6 +97,12 @@ public class TbConsInfoFlow implements Serializable {
     @Column(name = "`order_no`")
     @ApiModelProperty(value = "订单编号")
     private String orderNo;
+    @Column(name = "`cover_img`")
+    @ApiModelProperty(value = "图片")
+    private String coverImg;
+    @Column(name = "`remark`")
+    @ApiModelProperty(value = "备注")
+    private String remark;
 
     @Transient
     @TableField(exist = false)

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

@@ -51,6 +51,9 @@ public class TbConsInfoFlowDto implements Serializable {
     private Integer orderId;
 
     private String orderNo;
+    private String coverImg;
+    private String remark;
+
 
 
 }