--no commit message

com.zrqx.core/.classpath

@@ -28,6 +28,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_151"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/fg/browseRecord/BrowseRecordVo.java

+package com.zrqx.core.vo.sysuser.fg.browseRecord;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import com.zrqx.core.vo.resource.fg.goods.ele.FgEleResourceVo;
+import com.zrqx.core.vo.resource.fg.goods.phy.FgPhyResourceVo;
+import com.zrqx.core.vo.sysuser.fg.collections.CollectionsVo;
+
+@Data
+@ApiModel("浏览记录")
+public class BrowseRecordVo {
+
+	@ApiModelProperty("浏览记录id")
+	private Integer id;
+	@ApiModelProperty("商品id")
+	private String goodsId;
+	@ApiModelProperty("商品类别")
+	private String goodsType;
+	@ApiModelProperty("实体资源书籍")
+	private FgPhyResourceVo fgPhyResourceVo;
+	@ApiModelProperty("电子资源")
+	private FgEleResourceVo fgEleResourceVo;
+	@ApiModelProperty("创建时间")
+	protected String createTime;
+}

com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/fg/collections/CollectionsVo.java

 package com.zrqx.core.vo.sysuser.fg.collections;
 
-import java.util.List;
-
-import com.zrqx.core.vo.resource.fg.goods.FgResourceVo;
-
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import com.zrqx.core.vo.resource.fg.goods.ele.FgEleResourceVo;
+import com.zrqx.core.vo.resource.fg.goods.phy.FgPhyResourceVo;
+
 @Data
-@ApiModel("收藏/浏览Vo")
+@ApiModel("收藏")
 public class CollectionsVo {
 
+	@ApiModelProperty("收藏id")
+	private Integer id;
 	@ApiModelProperty("商品id")
 	private String goodsId;
-	@ApiModelProperty(value="商品类别 ")
+	@ApiModelProperty("商品类别")
 	private String goodsType;
-	@ApiModelProperty("收藏使用的商品vo")
-	private FgResourceVo fgResourceVo;
+	@ApiModelProperty("实体资源书籍")
+	private FgPhyResourceVo fgPhyResourceVo;
+	@ApiModelProperty("电子资源")
+	private FgEleResourceVo fgEleResourceVo;
 	@ApiModelProperty("创建时间")
 	protected String createTime;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/sysuser/fg/collections/GoodsVo.java

@@ -22,4 +22,7 @@ public class GoodsVo {
 	private String fileSize;
 	@ApiModelProperty(value="下载次数")
 	private Integer num;
+	/**图书资源*/
+	@ApiModelProperty("出版社")
+	private String publisher;
 }