- *
+ *
* @Author Steve
* @Since 2019-01-22
*/
@@ -25,7 +26,7 @@ import java.util.Objects;
@TableName("sys_depart")
public class SysDepart implements Serializable {
private static final long serialVersionUID = 1L;
-
+
/**ID*/
@TableId(type = IdType.ASSIGN_ID)
private String id;
@@ -85,7 +86,17 @@ public class SysDepart implements Serializable {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
-
+
+ /**图片*/
+ @Excel(name = "图片", width = 15)
+ @ApiModelProperty(value = "图片")
+ private java.lang.String goodsPicture;
+
+ /**视频*/
+ @Excel(name = "视频", width = 15)
+ @ApiModelProperty(value = "视频")
+ private java.lang.String goodsVideo;
+
/**
* 重写equals方法
*/
@@ -120,7 +131,9 @@ public class SysDepart implements Serializable {
Objects.equals(createBy, depart.createBy) &&
Objects.equals(createTime, depart.createTime) &&
Objects.equals(updateBy, depart.updateBy) &&
- Objects.equals(updateTime, depart.updateTime);
+ Objects.equals(updateTime, depart.updateTime) &&
+ Objects.equals(goodsPicture, depart.goodsPicture) &&
+ Objects.equals(goodsVideo, depart.goodsVideo);
}
/**
@@ -129,9 +142,9 @@ public class SysDepart implements Serializable {
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), id, parentId, departName,
- departNameEn, departNameAbbr, departOrder, description,orgCategory,
- orgType, orgCode, mobile, fax, address, memo, status,
- delFlag, createBy, createTime, updateBy, updateTime);
+ return Objects.hash(super.hashCode(), id, parentId, departName,
+ departNameEn, departNameAbbr, departOrder, description,orgCategory,
+ orgType, orgCode, mobile, fax, address, memo, status,
+ delFlag, createBy, createTime, updateBy, updateTime,goodsPicture,goodsVideo);
}
}
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
index b835c93a..840e8768 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java
@@ -77,6 +77,10 @@ public class SysDepartTreeModel implements Serializable{
private Date updateTime;
+ private java.lang.String goodsPicture;
+
+ private java.lang.String goodsVideo;
+
private List