3.14优化

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppRegisteredProjectRes.java

@@ -75,4 +75,9 @@ public class WgzAppRegisteredProjectRes implements Serializable {
 	private String statusApply;
 
 
+	@ApiModelProperty("招工创建人")
+	private String userId;
+
+	@ApiModelProperty("消息主键ID")
+	private Long messageId;
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserGetTheApproverRes.java

@@ -14,18 +14,16 @@ import java.io.Serializable;
 @Accessors(chain = true)
 @ApiModel("通用审批人信息返回")
 public class WgzAppUserGetTheApproverRes implements Serializable {
-	/** 唯一标识 */
-	@Excel(name = "唯一标识")
+
 	@ApiModelProperty("唯一标识")
 	private Long userId;
 
-	/** 姓名 */
-	@Excel(name = "姓名")
 	@ApiModelProperty("姓名")
 	private String username;
 
-	/** 头像地址 */
-	@Excel(name = "头像地址")
 	@ApiModelProperty("头像地址")
 	private String avatarName;
+
+	@ApiModelProperty("招工主题")
+	private String recruitName;
 }

ruoyi-system/src/main/java/com/ruoyi/wgz/bo/res/WgzAppUserLeaveDetailsRes.java

@@ -0,0 +1,95 @@
+package com.ruoyi.wgz.bo.res;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@ApiModel("请假详情返回")
+public class WgzAppUserLeaveDetailsRes implements Serializable {
+	@TableId(value = "id", type = IdType.AUTO)
+	private Long id;
+
+	@ApiModelProperty("请假人")
+	private Long userId;
+
+	@ApiModelProperty("请假人名称")
+	private String username;
+
+	@ApiModelProperty("请假人头像")
+	private String avatarName;
+
+	@ApiModelProperty("招工主题")
+	private String subject;
+
+	@ApiModelProperty("请假类型（字典）")
+	private String leaveType;
+
+	@ApiModelProperty("开始时间")
+	private LocalDateTime startTime;
+
+	@ApiModelProperty("结束时间")
+	private LocalDateTime endTime;
+
+	@ApiModelProperty("请假事由")
+	private String reason;
+
+	@ApiModelProperty("审核人ID")
+	private Long auditorUserId;
+
+	@ApiModelProperty("审核人名称")
+	private String auditorname;
+
+	@ApiModelProperty("审核人头像")
+	private String auditorHead;
+
+	@ApiModelProperty("审核状态（0待审核 1审核中 2已同意 3已拒绝 4=已取消）")
+	private String auditorType;
+
+	@ApiModelProperty("审核意见")
+	private String auditorOpinion;
+
+	@ApiModelProperty("同意|拒绝时间")
+	private LocalDateTime auditorTime;
+
+	@ApiModelProperty("上班时间")
+	private LocalTime workingTime;
+
+	@ApiModelProperty("下班时间")
+	private LocalTime closingTime;
+
+	@ApiModelProperty("取消请假")
+	private LocalDateTime cancelLeave;
+
+	@ApiModelProperty("删除标志（0代表存在 2代表删除）")
+	private String delFlag;
+
+	@ApiModelProperty("创建者")
+	private String createBy;
+
+	@ApiModelProperty("创建时间")
+	private LocalDateTime createTime;
+
+	@ApiModelProperty("更新者")
+	private String updateBy;
+
+	@ApiModelProperty("更新时间")
+	private LocalDateTime updateTime;
+
+	@ApiModelProperty("备注")
+	private String remark;
+}