Merge remote-tracking branch 'origin/master'

fuliqi

2024-10-29 8883d90ba7d60a61590b715d1a3be9e3ae2adb2d

 src/main/resources/mapper/SubjectMapper.xml

@@ -18,7 +18,8 @@
    <select id="getSubjectByLevel" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>
        from t_subject where level= #{level}
        from t_subject
        where deleted = 0 and status = 1
        order by item_order
    </select>

@@ -27,9 +28,11 @@
        select
        <include refid="Base_Column_List"/>
        from t_subject
        where deleted = 0 and status = 1
        order by item_order
    </select>

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