From e2c5017787d7fc5eea2afb8bc84bca0db054ad8c Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期三, 09 四月 2025 17:46:36 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
basic-server/src/main/resources/mapper/ProductMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/resources/mapper/ProductMapper.xml b/basic-server/src/main/resources/mapper/ProductMapper.xml
index a13b18d..823e5dc 100644
--- a/basic-server/src/main/resources/mapper/ProductMapper.xml
+++ b/basic-server/src/main/resources/mapper/ProductMapper.xml
@@ -13,6 +13,8 @@
<result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
<result property="objectId" column="object_id" jdbcType="INTEGER"/>
+ <result property="workShopId" column="work_shop_id" jdbcType="INTEGER"/>
+ <result property="workShopName" column="work_shop_name" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
@@ -29,7 +31,9 @@
p.update_user,
p.create_time,
p.update_time,
- p.object_id
+ p.object_id,
+ p.work_shop_id,
+ p.work_shop_name
from product p
WHERE 1=1
<if test="partNo != null and partNo != ''">
--
Gitblit v1.9.3