From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-require/src/main/resources/mapper/ProcurementSuppliesStoreMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/ProcurementSuppliesStoreMapper.xml b/cnas-require/src/main/resources/mapper/ProcurementSuppliesStoreMapper.xml
index 0df7937..4ff4fa7 100644
--- a/cnas-require/src/main/resources/mapper/ProcurementSuppliesStoreMapper.xml
+++ b/cnas-require/src/main/resources/mapper/ProcurementSuppliesStoreMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.requier.mapper.ProcurementSuppliesStoreMapper">
- <resultMap id="map" type="com.ruoyi.requier.dto.StoreDto">
+<mapper namespace="com.ruoyi.require.mapper.ProcurementSuppliesStoreMapper">
+ <resultMap id="map" type="com.ruoyi.require.dto.StoreDto">
<id column="id" property="id"/>
<result column="consumables_id" property="consumablesId"/>
<result column="odd_numbers" property="oddNumbers"/>
@@ -17,7 +17,7 @@
<result column="registrantName" property="registrantName"/>
</resultMap>
- <resultMap id="storeExcelMap" type="com.ruoyi.requier.excel.StoreExcel">
+ <resultMap id="storeExcelMap" type="com.ruoyi.require.excel.StoreExcel">
<result column="odd_numbers" property="oddNumbers"/>
<result column="consumables_name" property="consumablesName"/>
<result column="store_number" property="storeNumber"/>
--
Gitblit v1.9.3