From b3f7434579733ff774e94120164e8da570cee9e0 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 22 一月 2024 16:03:31 +0800
Subject: [PATCH] 修改部分界面
---
north-glass-erp/src/main/resources/mapper/sd/Product.xml | 17 -----------------
1 files changed, 0 insertions(+), 17 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/Product.xml b/north-glass-erp/src/main/resources/mapper/sd/Product.xml
index b774dab..0a9096a 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/Product.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/Product.xml
@@ -33,7 +33,6 @@
</resultMap>
<select id="defaultProduct" resultMap="productmap">
-<<<<<<< HEAD
select a.id as id,
a.product_name,
a.total_thickness,
@@ -71,22 +70,6 @@
and date(a.create_time) regexp #{product.createTime}
</if>
</where>
-=======
- select a.id as id,
- a.product,
- a.total_thickness,
- a.thickness,
- a.query,
- a.remarks,
- a.state,
- a.creator,
- date(a.create_time) as create_time,
- a.update_time as update_time,
- bgt.type_id as type_id,
- bgt.type as type
- from product as a
- left join glass_type bgt on bgt.type_id = a.type_id
->>>>>>> 2bf272a9d41a2b6c67910b23371af9537a9153a5
order by id desc
limit #{offset},#{pageSize}
--
Gitblit v1.8.0