Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-15 579e16edf3640235bc11934f58b4680ab809582a

Merge remote-tracking branch 'origin/master'

 src/main/java/com/mindskip/xzs/viewmodel/student/user/UserUpdateVM.java

@@ -1,12 +1,8 @@
package com.mindskip.xzs.viewmodel.student.user;


import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;

public class UserUpdateVM {

    @NotBlank
    private String realName;

    private String password;
@@ -19,7 +15,6 @@

    private String phone;

    @NotNull
    private Integer userLevel;

    public String getRealName() {

 src/main/resources/mapper/UserMapper.xml

@@ -597,7 +597,7 @@
    </select>

    <select id="getFailTemplateUser" resultType="com.mindskip.xzs.domain.User">
        SELECT *
        SELECT id, real_name
        FROM t_user
        WHERE id IN
        (SELECT user_id FROM t_exam_templates_user WHERE templates_id = #{id} AND user_id NOT IN