参数设置字段添加

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusNightTrialController.java

@@ -221,6 +221,7 @@ public class BusNightTrialController extends JeecgController<BusNightTrial, IBus
 		 if (busNightTrial.getId() != null && !busNightTrial.getId().equals("")){
 			 BusNightTrial editModel = busNightTrialService.getById(busNightTrial.getId());
 			 editModel.setAutoHand(busNightTrial.getAutoHand());
+			 editModel.setRoomToDirty(busNightTrial.getRoomToDirty());
 			 busNightTrialService.updateById(editModel);
 			 return Result.OK(editModel);
 		 }else{

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusOtherRoomCardController.java

@@ -220,6 +220,7 @@ public class BusOtherRoomCardController extends JeecgController<BusOtherRoomCard
 		 if (busOtherRoomCard.getId() != null && !busOtherRoomCard.getId().equals("")){
 			 BusOtherRoomCard editModel = busOtherRoomCardService.getById(busOtherRoomCard.getId());
 			 editModel.setStatus(busOtherRoomCard.getStatus());
+			 editModel.setLogoutCard(busOtherRoomCard.getLogoutCard());
 			 busOtherRoomCardService.updateById(editModel);
 			 return Result.OK(editModel);
 		 }else{

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusNightTrial.java

@@ -90,4 +90,9 @@ public class BusNightTrial implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+
+    /**住房转脏房*/
+    @Excel(name = "住房转脏房", width = 15)
+    @ApiModelProperty(value = "住房转脏房")
+    private Boolean roomToDirty;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusOtherRoomCard.java

@@ -69,4 +69,9 @@ public class BusOtherRoomCard implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
+
+    /**结账离店时，是否强制性先注销房卡，才能结账*/
+    @Excel(name = "结账离店时，是否强制性先注销房卡，才能结账", width = 15)
+    @ApiModelProperty(value = "结账离店时，是否强制性先注销房卡，才能结账")
+    private Boolean logoutCard;
 }