From 7c48f4f841e55d8e0ec0e7481949f2004c3eaf7a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 25 十二月 2025 11:20:29 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/mapper/sd/ProductMapper.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/ProductMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/ProductMapper.java
index e0adbdd..4827b51 100644
--- a/north-glass-erp/src/main/java/com/example/erp/mapper/sd/ProductMapper.java
+++ b/north-glass-erp/src/main/java/com/example/erp/mapper/sd/ProductMapper.java
@@ -12,7 +12,7 @@
     List<Product> defaultProduct(@Param("offset") Integer offset,
                                  @Param("pageSize") Integer pageSiz,
                                  @Param("glassTypeId") String glassTypeId,
-                                 @Param("product") Product product);
+                                 @Param("product") Product product,String field, String orderBy);
 
     Integer getPageTotal(Integer offset, Integer pageSize, String glassTypeId, Product product);
 
@@ -21,4 +21,6 @@
     List<Product> selectProduct(@Param("productName") String productName,@Param("productNameValue") String productNameValue);
 
     List<Product> selectProductId(@Param("productName") String productName,@Param("productNameValue") String productNameValue,@Param("id") Long id);
+
+    Double getGlassThickness(Integer productId, Integer technologyNumber);
 }

--
Gitblit v1.8.0