Merge remote-tracking branch 'origin/dev' into dev

fuliqi

2024-07-04 b911167866ad611a7f266d846bb15c21ae7540f4

 src/main/resources/mapper/TaskExamMapper.xml

@@ -18,7 +18,7 @@
    </sql>


    <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.vo.admin.task.TaskPageRequestVO">
    <select id="page" resultMap="BaseResultMap" parameterType="com.ycl.jxkg.domain.vo.admin.task.TaskPageRequestVO">
        select
        <include refid="Base_Column_List"/>
        from t_task_exam