From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/resources/mapper/production/ProductMaterialMapper.xml | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductMaterialMapper.xml b/src/main/resources/mapper/production/ProductMaterialMapper.xml
index 32c1ba1..0f55a3b 100644
--- a/src/main/resources/mapper/production/ProductMaterialMapper.xml
+++ b/src/main/resources/mapper/production/ProductMaterialMapper.xml
@@ -3,21 +3,14 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProductMaterialMapper">
+
<resultMap id="ProductMaterialResultMap" type="com.ruoyi.production.pojo.ProductMaterial">
<id property="id" column="id"/>
<result property="tenantId" column="tenant_id"/>
- <result property="materialType" column="material_type"/>
- <result property="inventoryCategory" column="inventory_category"/>
- <result property="identifierCode" column="identifier_code"/>
- <result property="materialCode" column="material_code"/>
- <result property="productName" column="product_name"/>
+ <result property="materialTypeId" column="material_type_id"/>
+ <result property="inventoryCategoryId" column="inventory_category_id"/>
<result property="materialName" column="material_name"/>
- <result property="specification" column="specification"/>
<result property="baseUnit" column="base_unit"/>
- <result property="materialAttribute" column="material_attribute"/>
- <result property="finishedProductName" column="finished_product_name"/>
- <result property="originatorName" column="originator_name"/>
- <result property="originatorOrg" column="originator_org"/>
<result property="remark" column="remark"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
--
Gitblit v1.9.3