Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-03 a390fec8fd0821ad5e31e335d34de227ef59c65f

 src/main/resources/mapper/SubjectMapper.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.ycl.jxkg.mapper.SubjectMapper">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.Subject">
    <resultMap id="BaseResultMap" type="com.ycl.jxkg.domain.entity.Subject">
        <id column="id" jdbcType="INTEGER" property="id"/>
        <result column="name" jdbcType="VARCHAR" property="name"/>
        <result column="level" jdbcType="INTEGER" property="level"/>
@@ -29,7 +29,7 @@
        from t_subject
    </select>

    <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.admin.education.SubjectPageRequestVO">
    <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.education.SubjectPageRequestVO">
        SELECT
        <include refid="Base_Column_List"/>
        FROM t_subject