Merge remote-tracking branch 'origin/master'

xuhy

5 天以前 a8765eb5005943908901c6163f8e5fd2c577079c

Merge remote-tracking branch 'origin/master'

 ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TUserController.java

@@ -670,6 +670,15 @@
        if (sysUser.getDeptType() == 2) {
            TDept byId = deptService.getById(sysUser.getDeptId());
            leaveUserDetailVO.setDeptName(byId.getDeptName());
        }
        if (sysUser.getDeptType()==1){
            TProjectDept projectDept = projectDeptService.getById(sysUser.getDeptId());
            if (projectDept.getParentId().equals("0")){
                leaveUserDetailVO.setDeptName(projectDept.getProjectName());
            }else{
                TProjectDept projectDept1 = projectDeptService.getById(projectDept.getParentId());
                leaveUserDetailVO.setDeptName(projectDept1.getProjectName()+">"+projectDept.getProjectName());
            }
        }
        leaveUserDetailVO.setLeavePersonName(sysUser.getNickName());
        LeaveAuditListVO leaveAuditListVO = new LeaveAuditListVO();

 ruoyi-system/src/main/java/com/ruoyi/system/applet/vo/KnowledgeVO.java

@@ -28,6 +28,9 @@
    @ApiModelProperty(value = "浏览量")
    @TableField("views")
    private Integer views;
    @ApiModelProperty(value = "内容")
    @TableField("content")
    private String content;

    @ApiModelProperty(value = "状态 1启用 2禁用")
    @TableField("status")