--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/enums/TimeUnitEnum.java

+package com.zrqx.core.enums;
+import java.util.concurrent.TimeUnit;
+/** 
+  * 
+  * @author lpf
+  * @date 2020-07-01 13:46
+  */
+public enum TimeUnitEnum {
+	// 微秒 一百万分之一秒（就是毫秒/1000）
+	微秒(TimeUnit.MICROSECONDS),
+	// 毫秒 千分之一秒
+	毫秒(TimeUnit.MILLISECONDS),
+	// 毫微秒 十亿分之一秒（就是微秒/1000）
+	毫微秒(TimeUnit.NANOSECONDS),
+	// 秒
+	秒(TimeUnit.SECONDS),
+	// 分钟
+	分钟(TimeUnit.MINUTES),
+	// 小时
+	小时(TimeUnit.HOURS),
+	// 天
+	天(TimeUnit.DAYS);
+	
+	private final TimeUnit value;
+
+	private TimeUnitEnum(TimeUnit value) {
+		this.value = value;
+	}
+	
+	public static void main(String[] args) {
+		System.out.println(分钟.value);
+		System.out.println(TimeUnitEnum.getValue("小时"));
+	}
+	
+	public static TimeUnit getValue(String name) {
+		if (name == null) {
+			throw new IllegalArgumentException("TimeUnitEnum name is not null");
+		}
+		for (TimeUnitEnum mt : values()) {
+			if (mt.name().equals(name)) {
+				return mt.value;
+			}
+		}
+		return 天.value;
+	}
+}

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

@@ -111,4 +111,6 @@ public class Ebook {
 	private String dangDang;
 	@ApiModelProperty("当当状态：0隐藏 1显示")
 	private Integer dangDang_Status;
+	@ApiModelProperty("浏览数量")
+	private Integer browseNum;
 }

com.zrqx.core/src/main/java/com/zrqx/core/service/BaseServiceImpl.java

@@ -21,6 +21,7 @@ import com.github.pagehelper.PageHelper;
 import com.zrqx.core.exception.BaseException;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.util.bean.BeanUtils;
+import com.zrqx.core.util.datatype.ArrayUtils;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 
@@ -291,5 +292,6 @@ public abstract class BaseServiceImpl<M, ID extends Serializable> implements Bas
 		}
 		return this.notNull(m);
 	}
+	
 
 }
\ No newline at end of file

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/ebook/FgEbookVO.java

@@ -80,5 +80,7 @@ public class FgEbookVO {
 	private String jd;
 	@ApiModelProperty("当当")
 	private String dangDang;
+	@ApiModelProperty("天猫")
+	private String tmall;
 	
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/pc/index/FgIndexAnnexListVO.java

@@ -15,4 +15,6 @@ public class FgIndexAnnexListVO {
 	private String name;
 	@ApiModelProperty("封面")
 	private String cover;
+	@ApiModelProperty("下载地址")
+	private String fileName;
 }

com.zrqx.core/src/main/java/com/zrqx/core/vo/resource/fg/pc/index/FgSearchListVO.java

@@ -26,4 +26,5 @@ public class FgSearchListVO {
 	private Date newPulishDate;
 	@ApiModelProperty("下载地址")
 	private String fileName;
+
 }