--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/animation/SaveUpdateAnimationLibraryForm.java

@@ -48,8 +48,10 @@ public class SaveUpdateAnimationLibraryForm {
 	private List<String> labelContentId;
 	@ApiModelProperty(value = "标签内容code")
 	private List<String> labelContentCode;
+	@ApiModelProperty("所属部门id")
+	private String departmentId;
 	@ApiModelProperty("所属部门")
-	private Integer department;
+	private String department;
 	@ApiModelProperty("商品编码")
 	private String goosCode;
 	@ApiModelProperty("数据来源  1:本版 2外版")

com.zrqx.core/src/main/java/com/zrqx/core/form/resource/bg/ebook/SaveUpdateEbookForm.java

@@ -48,8 +48,10 @@ public class SaveUpdateEbookForm {
 	private String cover;
 	@ApiModelProperty("数据类型:0 纸质版  1电子版  2纸质版+电子版  3其他")
 	private Integer dataType;
+	@ApiModelProperty("所属部门id")
+	private String departmentId;
 	@ApiModelProperty("所属部门")
-	private Integer department;
+	private String department;
 	@ApiModelProperty("审核状态  0：录入中  1：待审核  2：审核中 3：审核通过  4：审核未通过")
 	private Integer bookStatus;
 	/**纸质书信息**/

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/animationlibrary/AnimationLibrary.java

@@ -47,8 +47,10 @@ public class AnimationLibrary {
 	private String bookName;
 	@ApiModelProperty("状态：0已录入，1审核已通过，2审核未通过")
 	private Integer status;
+	@ApiModelProperty("所属部门id")
+	private Integer departmentId;
 	@ApiModelProperty("所属部门")
-	private Integer department;
+	private String department;
 	@ApiModelProperty("上传时间")
 	private Date uploadTime;
 	@ApiModelProperty("更新时间")

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/audiolibrary/AudioLibrary.java

@@ -49,8 +49,10 @@ public class AudioLibrary {
 	private Integer resourceType=7;
 	@ApiModelProperty("是否删除 0:未删除 1:已删除")
     private Integer isDelete=0;	
+	@ApiModelProperty("所属部门id")
+	private Integer departmentId;
 	@ApiModelProperty("所属部门")
-	private Integer department;
+	private String department;
 	@ApiModelProperty("图书id")
 	private String bookId;
 	@ApiModelProperty("所属图书")

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/coursewarelibrary/CoursewareLibrary.java

@@ -42,10 +42,10 @@ public class CoursewareLibrary {
 	private Integer resourceType=9;
 	@ApiModelProperty("是否删除 0:未删除 1:已删除")
 	private Integer isDelete=0;
-	@ApiModelProperty("所属部门Id")
+	@ApiModelProperty("所属部门id")
 	private Integer departmentId;
 	@ApiModelProperty("所属部门")
-	private Integer department;
+	private String department;
 	@ApiModelProperty("封面")
 	private String cover;
 	@ApiModelProperty("图书id")

com.zrqx.core/src/main/java/com/zrqx/core/model/resource/ebook/Book.java

@@ -64,8 +64,11 @@ public class Book {
 	private String cover;
 	@ApiModelProperty("数据类型:0 纸质版  1电子版  2纸质版+电子版  3其他")
 	private Integer dataType;
+	@ApiModelProperty("所属部门id")
+	private Integer
+	departmentId;
 	@ApiModelProperty("所属部门")
-	private Integer department;
+	private String department;
 	@ApiModelProperty("审核状态  0：录入中  1：待审核  2：审核中 3：审核通过  4：审核未通过")
 	private Integer status;
 	@ApiModelProperty(value = "创建时间")