diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsStockCountQueryCriteria.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsStockCountQueryCriteria.java
index 195b4785..7c2e24f5 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsStockCountQueryCriteria.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsStockCountQueryCriteria.java
@@ -13,7 +13,7 @@ public class TbConsStockCountQueryCriteria extends BaseQueryDto {
 
     private String conName;
 
-    private String conTypeId;
+    private Integer conTypeId;
 
     private String column;
 
@@ -23,12 +23,6 @@ public class TbConsStockCountQueryCriteria extends BaseQueryDto {
 
     private Integer size = 10;
 
-    public void setConTypeId(String conTypeId) {
-        if (StringUtils.isNotBlank(conTypeId)) {
-            this.conTypeId = conTypeId;
-        }
-    }
-
 
     public void setConName(String conName) {
         if (StringUtils.isNotBlank(conName)) {
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java
index b01546f5..e8e77ffd 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java
@@ -33,7 +33,7 @@ public interface TbConsInfoFlowRepository extends JpaRepository<TbConsInfoFlow,
             "AND flow.createTime < :endTime " +
             "AND flow.bizName IN :types " +
             "ORDER BY flow.id DESC")
-    Page<TbConsInfoFlow> findByConsParam(Integer shopId, Integer consId, String conName, String conTypeId, List<String> types,
+    Page<TbConsInfoFlow> findByConsParam(Integer shopId, Integer consId, String conName, Integer conTypeId, List<String> types,
                                          Date startTime, Date endTime, Pageable pageable);
 
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
index e29d6eab..b555391f 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
@@ -43,7 +43,7 @@ public class TbConsInfoFlowController {
 
     @PostMapping("/stock")
     @ApiOperation("耗材库存记录列表")
-    public ResponseEntity<Object> queryPage(@RequestBody TbConsStockCountQueryCriteria criteria){
+    public ResponseEntity<Object> queryPage(@RequestBody TbConsStockCountQueryCriteria criteria) throws ParseException {
         return new ResponseEntity<>(tbConsInfoFlowService.queryPage(criteria),HttpStatus.OK);
     }
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoFlowService.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoFlowService.java
index 72036654..a9e62631 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoFlowService.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoFlowService.java
@@ -35,7 +35,7 @@ public interface TbConsInfoFlowService {
     */
     List<TbConsInfoFlowDto> queryAll(TbConsInfoFlowQueryCriteria criteria);
 
-    Map<String,Object> queryPage(TbConsStockCountQueryCriteria criteria);
+    Map<String,Object> queryPage(TbConsStockCountQueryCriteria criteria) throws ParseException;
     TbProductStockCountVo stockCount(TbConsStockCountQueryCriteria criteria) throws ParseException;
     Map<String,Object> stockList(TbProductStockCountQueryCriteria criteria) throws ParseException;
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
index 93f2e3e7..56c45ecf 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
@@ -75,7 +75,12 @@ public class TbConsInfoFlowServiceImpl implements TbConsInfoFlowService {
     //入库stockInNumber;  stockIn
     //出库stockOutNumber; stockout
     @Override
-    public Map<String,Object> queryPage(TbConsStockCountQueryCriteria criteria){
+    public Map<String,Object> queryPage(TbConsStockCountQueryCriteria criteria) throws ParseException {
+        if (criteria.getStartTime() == null || criteria.getEndTime() == null) {
+            criteria.setEndTime(new Date());//
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            criteria.setStartTime(sdf.parse("2024-01-01"));//创建2024年1月1日的Date对象
+        }
         if(StringUtils.isNotBlank(criteria.getColumn())){
             switch (criteria.getColumn()){
                 case "addCountNumber":
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
index 8d6c6aa4..883f3c72 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
@@ -160,6 +160,6 @@ public interface ProductStockCountRepository extends JpaRepository<TbProductStoc
             " AND flow.createTime > :startTime  " +
             " AND flow.createTime < :endTime  ")
     TbProductStockCountVo consStockCount(Integer shopId, Integer consId, String conName,
-                                         String conTypeId, Date startTime, Date endTime);
+                                         Integer conTypeId, Date startTime, Date endTime);
 
 }