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

src/main/java/com/xjrsoft/module/student/dto/BaseStudentUserPageDto.java

@@ -53,4 +53,7 @@ public class BaseStudentUserPageDto extends PageInput {
     @ApiModelProperty("身份证号")
     private String credentialNumber;
 
+    @ApiModelProperty("年级id")
+    private Long gradeId;
+
 }

src/main/resources/mapper/student/BaseStudentMapper.xml

@@ -93,7 +93,9 @@
                 and t4.id = #{dto.queryId}
             </if>
         </if>
-
+        <if test="dto.gradeId == null">
+            and t4.grade_id = #{dto.gradeId}
+        </if>
         <if test="dto.order == null">
             order by t1.id
         </if>