From f3bb76fa668530d5613700e57a30e6c7394d5224 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 06 三月 2025 16:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
basic-server/src/main/resources/mapper/ProductMapper.xml | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/ProductMapper.xml b/basic-server/src/main/resources/mapper/ProductMapper.xml
index a13b18d..78a1353 100644
--- a/basic-server/src/main/resources/mapper/ProductMapper.xml
+++ b/basic-server/src/main/resources/mapper/ProductMapper.xml
@@ -14,12 +14,6 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="objectId" column="object_id" jdbcType="INTEGER"/>
</resultMap>
-
- <sql id="Base_Column_List">
- id,name,name_en,
- create_user,update_user,create_time,
- update_time,object_id
- </sql>
<select id="selectProductListByObjectId" resultType="com.ruoyi.basic.pojo.Product">
select * from (
select p.id,
--
Gitblit v1.9.3