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 d15646af..a5848254 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
@@ -75,6 +75,11 @@ public class ViewConInfoFlow implements Serializable {
     private BigDecimal balance;
 
 
+    @Column(name = "`status`")
+    @ApiModelProperty(value = "status")
+    private String status;
+
+
 
     @Column(name = "`product_id`")
     @ApiModelProperty(value = "商品id")
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 3b35c877..6e5e19ed 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
@@ -50,7 +50,7 @@ public class ViewConInfoFlowDto implements Serializable {
     private String productId;
 
     private String productName;
-
+    private String status;
 
     private String conCode;
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
index c40a90fc..d78df579 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
@@ -155,12 +155,12 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
                 throw new Exception("耗材信息不存在");
             }
 
-            tbConsInfo.setConName(resource.getConName());
-            tbConsInfo.setPrice(resource.getPrice());
-            tbConsInfo.setConUnit(resource.getConUnit());
-            tbConsInfo.setConWarning(resource.getConWarning());
-            tbConsInfo.setStatus(resource.getStatus());
-            tbConsInfo.setIsCheck(resource.getIsCheck());
+            tbConsInfo.setConName(ObjectUtil.isEmpty(resource.getConName())||ObjectUtil.isNull(resource.getConName())?tbConsInfo.getConName():resource.getConName());
+            tbConsInfo.setPrice(ObjectUtil.isEmpty(resource.getPrice())||ObjectUtil.isNull(resource.getPrice())?tbConsInfo.getPrice():resource.getPrice());
+            tbConsInfo.setConUnit(ObjectUtil.isEmpty(resource.getConUnit())||ObjectUtil.isNull(resource.getConUnit())?tbConsInfo.getConUnit(): resource.getConUnit());
+            tbConsInfo.setConWarning(ObjectUtil.isEmpty(resource.getConWarning())||ObjectUtil.isNull(resource.getConWarning())?tbConsInfo.getConWarning():resource.getConWarning());
+            tbConsInfo.setStatus(ObjectUtil.isEmpty(resource.getStatus())||ObjectUtil.isNull(resource.getStatus())?tbConsInfo.getStatus():resource.getStatus());
+            tbConsInfo.setIsCheck(ObjectUtil.isEmpty(resource.getIsCheck())||ObjectUtil.isNull(resource.getIsCheck())?tbConsInfo.getIsCheck():resource.getIsCheck());
             tbConsInfo.setUpdateTime(new Timestamp(System.currentTimeMillis()));
 
             tbConsInfoRepository.save(tbConsInfo);