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 228b0216..b91594aa 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
@@ -43,6 +43,11 @@ public class ViewConInfoFlow implements Serializable {
     @ApiModelProperty(value = "耗材名称")
     private String conName;
 
+
+    @Column(name = "`shop_id`")
+    @ApiModelProperty(value = "店铺id")
+    private Integer shopId;
+
     @Column(name = "`con_return`",nullable = false)
     @NotNull
     @ApiModelProperty(value = "con_return")
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowQueryCriteria.java
index 45b31445..5540ebe5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/dto/ViewConInfoFlowQueryCriteria.java
@@ -14,4 +14,8 @@ public class ViewConInfoFlowQueryCriteria{
     /** 模糊 */
     @Query(type = Query.Type.INNER_LIKE)
     private String conName;
+
+
+    @Query
+    private String shopId;
 }
\ No newline at end of file