Commit af30617c authored by 刘基明's avatar 刘基明

Merge remote-tracking branch 'origin/dev' into dev

parents e590b6ee 8b1cfc89
package com.tanpu.community.api.beans.vo.feign.fatools; package com.tanpu.community.api.beans.vo.feign.fatools;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
...@@ -20,9 +22,7 @@ import java.util.Date; ...@@ -20,9 +22,7 @@ import java.util.Date;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@ApiModel(description = "用户信息 机构") @ApiModel(description = "用户信息 机构")
public class UserInfoNewOrg implements Serializable { public class UserInfoNewOrg {
private static final long serialVersionUID = 1L;
//↓↓↓↓ 机构 ↓↓↓↓ //↓↓↓↓ 机构 ↓↓↓↓
@ApiModelProperty(value = "机构id") @ApiModelProperty(value = "机构id")
...@@ -42,6 +42,8 @@ public class UserInfoNewOrg implements Serializable { ...@@ -42,6 +42,8 @@ public class UserInfoNewOrg implements Serializable {
@ApiModelProperty(value = "审核状态 0待审核 1通过 2驳回") @ApiModelProperty(value = "审核状态 0待审核 1通过 2驳回")
private Integer auditStatus; private Integer auditStatus;
@ApiModelProperty(value = "审核时间") @ApiModelProperty(value = "审核时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditTime; private Date auditTime;
@ApiModelProperty(value = "运营人员姓名") @ApiModelProperty(value = "运营人员姓名")
private String operatorName; private String operatorName;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment