From 579e16edf3640235bc11934f58b4680ab809582a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 15 七月 2024 09:03:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/viewmodel/student/user/UserUpdateVM.java | 5 -----
src/main/resources/mapper/UserMapper.xml | 2 +-
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/viewmodel/student/user/UserUpdateVM.java b/src/main/java/com/mindskip/xzs/viewmodel/student/user/UserUpdateVM.java
index b7e8c13..706715f 100644
--- a/src/main/java/com/mindskip/xzs/viewmodel/student/user/UserUpdateVM.java
+++ b/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() {
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index 406aea9..4797580 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/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
--
Gitblit v1.8.0