分支合并冲突解决

chenrui

2025-03-13 f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e

 basic-server/src/main/resources/mapper/StandardMethodMapper.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.basic.mapper.StandardMethodMapper">

    <resultMap id="BaseResultMap" type="com.ruoyi.inspect.pojo.StandardMethod">
    <resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.StandardMethod">
        <id property="id" column="id" jdbcType="INTEGER"/>
        <result property="code" column="code" jdbcType="VARCHAR"/>
        <result property="name" column="name" jdbcType="VARCHAR"/>
@@ -15,7 +15,7 @@
        <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <select id="selectStandardMethodList" resultType="com.ruoyi.inspect.pojo.StandardMethod">
    <select id="selectStandardMethodList" resultType="com.ruoyi.basic.pojo.StandardMethod">
        select * from (
                select sm.id,
                sm.code,
@@ -42,7 +42,7 @@
            ${ew.customSqlSegment}
        </if>
    </select>
    <select id="selectStandMethodById" resultType="com.ruoyi.inspect.pojo.StandardMethod">
    <select id="selectStandMethodById" resultType="com.ruoyi.basic.pojo.StandardMethod">
        select sm.id,
               sm.code,
               sm.name,