From e83d4cecece6e8677392229e996dea22bbe2d1e9 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期二, 24 六月 2025 18:05:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/mapper/inventory/StockProductMapper.xml |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/main/resources/mapper/StockProductMapper.xml b/src/main/resources/mapper/inventory/StockProductMapper.xml
similarity index 76%
rename from src/main/resources/mapper/StockProductMapper.xml
rename to src/main/resources/mapper/inventory/StockProductMapper.xml
index c9a745a..ad820b3 100644
--- a/src/main/resources/mapper/StockProductMapper.xml
+++ b/src/main/resources/mapper/inventory/StockProductMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="inventory.mapper.StockProductMapper">
+<mapper namespace="com.ruoyi.inventory.mapper.StockProductMapper">
 
     <resultMap id="BaseResultMap" type="inventory.domain.StockProduct">
             <id property="id" column="id" jdbcType="INTEGER"/>
@@ -22,18 +22,17 @@
         from stock_product
         where  id = #{id,jdbcType=INTEGER} 
     </select>
+    <select id="selectList" resultType="inventory.domain.StockProduct">
+        select
+        <include refid="Base_Column_List" />
+        from stock_product
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from stock_product
         where  id = #{id,jdbcType=INTEGER} 
     </delete>
-    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="inventory.domain.StockProduct" useGeneratedKeys="true">
-        insert into stock_product
-        ( id,product_category,spec_model
-        ,unit)
-        values (#{id,jdbcType=INTEGER},#{productCategory,jdbcType=VARCHAR},#{specModel,jdbcType=VARCHAR}
-        ,#{unit,jdbcType=VARCHAR})
-    </insert>
+
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="inventory.domain.StockProduct" useGeneratedKeys="true">
         insert into stock_product
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -64,12 +63,5 @@
         </set>
         where   id = #{id,jdbcType=INTEGER} 
     </update>
-    <update id="updateByPrimaryKey" parameterType="inventory.domain.StockProduct">
-        update stock_product
-        set 
-            product_category =  #{productCategory,jdbcType=VARCHAR},
-            spec_model =  #{specModel,jdbcType=VARCHAR},
-            unit =  #{unit,jdbcType=VARCHAR}
-        where   id = #{id,jdbcType=INTEGER} 
-    </update>
+
 </mapper>

--
Gitblit v1.9.3