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

xiangpei

2024-07-09 126c774854a74f02e5deaee308a7688e0f171aaa

 src/main/resources/mapper/UserMapper.xml

@@ -20,11 +20,14 @@
        <result column="last_active_time" jdbcType="TIMESTAMP" property="lastActiveTime"/>
        <result column="deleted" jdbcType="BIT" property="deleted"/>
        <result column="wx_open_id" jdbcType="VARCHAR" property="wxOpenId"/>
        <result column="need_update_password" property="needUpdatePassword" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
        <result column="last_update_password_time" property="lastUpdatePasswordTime"/>
    </resultMap>
    <sql id="Base_Column_List">
        id
        , user_uuid, user_name, password, real_name, age, sex, birth_day, user_level, phone,
    role, status, image_path, create_time, modify_time, last_active_time, deleted, wx_open_id
    role, status, image_path, create_time, modify_time, last_active_time, deleted, wx_open_id,
    need_update_password, last_update_password_time
    </sql>


@@ -194,5 +197,15 @@
        limit 1
    </select>

    <select id="classesStudent" resultType="com.ycl.jxkg.domain.vo.StudentVO">
        SELECT tu.id,
               tu.real_name,
               tu.phone
        FROM t_user tu
                 INNER JOIN t_classes_user tcu ON tu.id = tcu.user_id
        WHERE tcu.classes_id = #{classesId}
        and tcu.deleted = 0
        ORDER BY tcu.create_time
    </select>

</mapper>