From 8246ec51e9cf0fdb37a76bc62cac4ac2b3ffc893 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期五, 14 三月 2025 14:49:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
cnas-require/src/main/resources/mapper/FeStandardSubstanceAcceptanceMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/FeStandardSubstanceAcceptanceMapper.xml b/cnas-require/src/main/resources/mapper/FeStandardSubstanceAcceptanceMapper.xml
index 011dda2..e336198 100644
--- a/cnas-require/src/main/resources/mapper/FeStandardSubstanceAcceptanceMapper.xml
+++ b/cnas-require/src/main/resources/mapper/FeStandardSubstanceAcceptanceMapper.xml
@@ -1,9 +1,9 @@
<?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.FeStandardSubstanceAcceptanceMapper">
+<mapper namespace="com.ruoyi.require.mapper.FeStandardSubstanceAcceptanceMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.FeStandardSubstanceAcceptance">
+ <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.FeStandardSubstanceAcceptance">
<id column="id" property="id" />
<result column="substance_id" property="substanceId" />
<result column="arrive_date" property="arriveDate" />
@@ -20,7 +20,7 @@
<result column="update_user" property="updateUser" />
<result column="update_time" property="updateTime" />
</resultMap>
- <select id="getPageAcceptance" resultType="com.ruoyi.requier.vo.AcceptanceVo">
+ <select id="getPageAcceptance" resultType="com.ruoyi.require.vo.AcceptanceVo">
SELECT
sa.id,
ss.name,
--
Gitblit v1.9.3