diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/sysconfig/entity/SysConfig.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/sysconfig/entity/SysConfig.java index df685619..04917758 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/sysconfig/entity/SysConfig.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/sysconfig/entity/SysConfig.java @@ -80,4 +80,8 @@ public class SysConfig implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; + /**类型*/ + @ApiModelProperty(value = "类型") + @Dict(dicCode = "config_type") + private java.lang.String configType; } diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java index 8ccc99ad..57551511 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java @@ -210,6 +210,7 @@ public class SysDepart implements Serializable { private String oldDirectorUserIds; //update-end---author:wangshuai ---date:20200308 for:[JTC-119]新增字段负责人ids和旧的负责人ids + private String picUrl; /** * 重写equals方法 */ diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java index 83803925..e396846c 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/model/SysDepartTreeModel.java @@ -109,6 +109,7 @@ public class SysDepartTreeModel implements Serializable { private List children = new ArrayList<>(); + private String picUrl; /** * 将SysDepart对象转换成SysDepartTreeModel对象 @@ -150,6 +151,7 @@ public class SysDepartTreeModel implements Serializable { this.updateTime = sysDepart.getUpdateTime(); this.directorUserIds = sysDepart.getDirectorUserIds(); this.payableAmount = sysDepart.getPayableAmount(); + this.picUrl = sysDepart.getPicUrl(); if (0 == sysDepart.getIzLeaf()) { this.isLeaf = false; } else { @@ -461,6 +463,14 @@ public class SysDepartTreeModel implements Serializable { this.contractEndTime = contractEndTime; } + public String getPicUrl() { + return picUrl; + } + + public void setPicUrl(String picUrl) { + this.picUrl = picUrl; + } + /** * 重写equals方法 */