Merge remote-tracking branch 'origin/master'

fuliqi

2024-06-03 6c87a7ad0ae6ae9b5d8b6ab4d0e5b93169171972

 src/main/resources/mapper/SubjectMapper.xml

@@ -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