From 5a697e6fafbe3855336ca5fd7e1785de12840d16 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:49:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
cnas-require/src/main/resources/mapper/InstructionMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cnas-require/src/main/resources/mapper/InstructionMapper.xml b/cnas-require/src/main/resources/mapper/InstructionMapper.xml
index f669677..7921d1d 100644
--- a/cnas-require/src/main/resources/mapper/InstructionMapper.xml
+++ b/cnas-require/src/main/resources/mapper/InstructionMapper.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.InstructionMapper">
+<mapper namespace="com.ruoyi.require.mapper.InstructionMapper">
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.requier.pojo.Instruction">
+ <resultMap id="BaseResultMap" type="com.ruoyi.require.pojo.Instruction">
<id column="id" property="id" />
<result column="application_number" property="applicationNumber" />
<result column="person_liable" property="personLiable" />
@@ -14,7 +14,7 @@
<result column="update_user" property="updateUser" />
</resultMap>
- <select id="pageByPageQueryOfHomeworkInstructions" resultType="com.ruoyi.requier.dto.OperationInstructionDto">
+ <select id="pageByPageQueryOfHomeworkInstructions" resultType="com.ruoyi.require.dto.OperationInstructionDto">
SELECT
doi.*,di.*,d.device_name, d.management_number device_number, d.specification_model device_model, u.name uploader_name, u1.name approver_name
FROM
--
Gitblit v1.9.3