yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_java

This commit is contained in:
1378012178@qq.com 2025-04-07 14:49:02 +08:00
parent 378d0bbc90 d280f24d2d
commit d3b9f4136b
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/controller/NuBizEmployeesServcieTagsController.java
View File

@ -83,7 +83,7 @@ public class NuBizEmployeesServcieTagsController extends JeecgController<NuBizEm
*/ */
@AutoLog(value = "员工配置的服务标签-添加") @AutoLog(value = "员工配置的服务标签-添加")
@ApiOperation(value="员工配置的服务标签-添加", notes="员工配置的服务标签-添加") @ApiOperation(value="员工配置的服务标签-添加", notes="员工配置的服务标签-添加")
@RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:add") // @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:add")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<String> add(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) { public Result<String> add(@RequestBody NuBizEmployeesServcieTags nuBizEmployeesServcieTags) {
nuBizEmployeesServcieTagsService.save(nuBizEmployeesServcieTags); nuBizEmployeesServcieTagsService.save(nuBizEmployeesServcieTags);
@ -113,7 +113,7 @@ public class NuBizEmployeesServcieTagsController extends JeecgController<NuBizEm
*/ */
@AutoLog(value = "员工配置的服务标签-通过id删除") @AutoLog(value = "员工配置的服务标签-通过id删除")
@ApiOperation(value="员工配置的服务标签-通过id删除", notes="员工配置的服务标签-通过id删除") @ApiOperation(value="员工配置的服务标签-通过id删除", notes="员工配置的服务标签-通过id删除")
@RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:delete") // @RequiresPermissions("bizEmployeesInfo:nu_biz_employees_servcie_tags:delete")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name="id",required=true) String id) { public Result<String> delete(@RequestParam(name="id",required=true) String id) {
nuBizEmployeesServcieTagsService.removeById(id); nuBizEmployeesServcieTagsService.removeById(id);

3
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizEmployeesInfo/entity/BizEmployeesInfo.java
View File

@ -59,6 +59,9 @@ public class BizEmployeesInfo implements Serializable {
@Excel(name = "联系电话", width = 15) @Excel(name = "联系电话", width = 15)
@ApiModelProperty(value = "联系电话") @ApiModelProperty(value = "联系电话")
private java.lang.String tel; private java.lang.String tel;
/**头像*/
@ApiModelProperty(value = "头像")
private java.lang.String headPath;
/**入职时间*/ /**入职时间*/
@Excel(name = "入职时间", width = 15, format = "yyyy-MM-dd") @Excel(name = "入职时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")

1
nursing-unit-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java
View File

@ -68,6 +68,7 @@ public class LoginUser {
@SensitiveField @SensitiveField
private String avatar; private String avatar;
private String loginType;
/** /**
* 生日 * 生日
*/ */

4
nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
View File

@ -167,6 +167,10 @@ public class SysUser implements Serializable {
*/ */
private Integer activitiSync; private Integer activitiSync;
@Dict(dicCode = "login_type")
private String loginType;
/** /**
* 身份（0 普通成员 1 上级） * 身份（0 普通成员 1 上级）
*/ */