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

src/main/java/com/xjrsoft/module/room/controller/RoomBedController.java

@@ -100,14 +100,13 @@ public class RoomBedController {
     public RT<Boolean> add(@Valid @RequestBody AddRoomBedDto dto){
         RoomBed roomBed = BeanUtil.toBean(dto, RoomBed.class);
         boolean isSuccess = roomBedService.save(roomBed);
-    return RT.ok(isSuccess);
+        return RT.ok(isSuccess);
     }
 
     @PutMapping
     @ApiOperation(value = "修改寝室床位")
     @SaCheckPermission("roombed:edit")
     public RT<Boolean> update(@Valid @RequestBody UpdateRoomBedDto dto){
-
         RoomBed roomBed = BeanUtil.toBean(dto, RoomBed.class);
         return RT.ok(roomBedService.updateById(roomBed));
 

src/main/java/com/xjrsoft/module/student/vo/BaseStudentInfoDetailVo.java

@@ -88,8 +88,8 @@ public class BaseStudentInfoDetailVo {
     @ApiModelProperty("出生日期")
     private Date birthDate;
 
-    @ApiModelProperty("性别（1:男 2:女）")
-    private Integer gender;
+    @ApiModelProperty("性别（SB10001:男 SB10002:女）")
+    private String gender;
 
     @ApiModelProperty("民族")
     private String nation;

src/main/resources/mapper/room/RoomBedMapper.xml

@@ -382,10 +382,10 @@
         )
     </select>
     <select id="getBedInfoByUserId" resultType="com.xjrsoft.module.room.vo.RoomBedInfoVo">
-        SELECT t3.name,t2.room_name,t1.bed_number,t1.id FROM room_bed t1
+        SELECT t3.name as build_name,t2.room_name,t1.bed_number,t1.id FROM room_bed t1
         LEFT JOIN room t2 ON t1.room_id = t2.id
-        LEFT JOIN base_office_build t3 ON t2.office_build_id = t4.id
-        WHERE t4.build_type = 'FB3604'
+        LEFT JOIN base_office_build t3 ON t2.office_build_id = t3.id
+        WHERE t3.build_type = 'FB3604'
         AND t1.student_user_id = #{id}
     </select>