Accept Merge Request #26: (develop-wxl -> master)

Merge Request: 修改房间数量

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/iHotel_student_houtai/git/merge/26?initial=true

src/main/java/com/template/model/pojo/ApplicationProcedureTemporary.java

@@ -43,8 +43,6 @@ public class ApplicationProcedureTemporary implements Serializable {
     @ApiModelProperty(value = "部门")
     private String department;
 
-    @ApiModelProperty(value = "房间数量")
-    private String houseCount;
 
     @ApiModelProperty(value = "申请原因")
     private String reasonApplication;

src/main/java/com/template/model/vo/LoginVO.java

@@ -2,6 +2,9 @@ package com.template.model.vo;
 
 import com.template.model.pojo.PermissionSetting;
 import lombok.Data;
+import com.template.model.pojo.Organization;
+
+import java.util.List;
 
 /**
  * @Author: codingliang
@@ -40,4 +43,6 @@ public class LoginVO {
     private PermissionSetting permissionSetting;
 
     private Integer adminMenuParentId;
+    //审批部门list
+    private List<Organization> organizations;
 }