From 4f84f1d45e0624685a558436359bfff7b754ecb1 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 23 一月 2024 10:55:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
index 6d05b9d..15f2563 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/sd/ProductService.java
@@ -22,9 +22,10 @@
glassTypeId = glassType.get(1);
}
Map<String,Object> map = new HashMap<>();
- map.put("list",productMapper.defaultProduct(offset,pageSize,glassTypeId,product));
- map.put("pageNum",pageNum);
-
+ map.put("data",productMapper.defaultProduct(offset,pageSize,glassTypeId,product));
+ map.put("total",productMapper.getPageTotal(offset,pageSize,glassTypeId,product));
return map;
}
+
+
}
--
Gitblit v1.8.0