--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/vo/works/apply/QueryApplyVo.java

@@ -33,8 +33,6 @@ public class QueryApplyVo {
 	private String userName;
 	@ApiModelProperty("所属部门")
 	private String department;
-	@ApiModelProperty("所属部门Id")
-	private Integer departmentId;
 	@ApiModelProperty("申请时间")
 	private Date applyTime;
 	@ApiModelProperty("申请原因")

com.zrqx.core/src/main/java/com/zrqx/core/vo/works/apply/QueryResourceVo.java

@@ -21,6 +21,6 @@ public class QueryResourceVo {
 
 	@ApiModelProperty("资源名")
 	private String name;
-	@ApiModelProperty("所属部门")
+	@ApiModelProperty("资源类型")
 	private Integer resourceType;
 }