diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/NuBizEmployeesServcieTagsController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/NuBizEmployeesServcieTagsController.java index fda7aaa..fabd4a6 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/NuBizEmployeesServcieTagsController.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/NuBizEmployeesServcieTagsController.java @@ -83,7 +83,7 @@ public class NuBizEmployeesServcieTagsController extends JeecgController add(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) { nuBizEmployeesServcieTagsService.save(nuBizEmployeesServcieTags); @@ -113,7 +113,7 @@ public class NuBizEmployeesServcieTagsController extends JeecgController delete(@RequestParam(name="id",required=true) String id) { nuBizEmployeesServcieTagsService.removeById(id); diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/entity/BizEmployeesInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/entity/BizEmployeesInfo.java index bc94b6b..c1b33d0 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/entity/BizEmployeesInfo.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/entity/BizEmployeesInfo.java @@ -59,6 +59,9 @@ public class BizEmployeesInfo implements Serializable { @Excel(name = "联系电话", width = 15) @ApiModelProperty(value = "联系电话") private java.lang.String tel; + /**头像*/ + @ApiModelProperty(value = "头像") + private java.lang.String headPath; /**入职时间*/ @Excel(name = "入职时间", width = 15, format = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") diff --git a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java index 32d4b49..7a0bc6f 100644 --- a/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java +++ b/nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java @@ -68,6 +68,7 @@ public class LoginUser { @SensitiveField private String avatar; + private String loginType; /** * 生日 */ diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java index 52d03d9..04d8813 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java @@ -167,6 +167,10 @@ public class SysUser implements Serializable { */ private Integer activitiSync; + + @Dict(dicCode = "login_type") + private String loginType; + /** * 身份(0 普通成员 1 上级) */