diff --git a/aircraft-common/src/main/java/com/aircraft/base/BaseEntity.java b/aircraft-common/src/main/java/com/aircraft/base/BaseEntity.java index 569aeb4..663a5f1 100644 --- a/aircraft-common/src/main/java/com/aircraft/base/BaseEntity.java +++ b/aircraft-common/src/main/java/com/aircraft/base/BaseEntity.java @@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @@ -42,21 +43,25 @@ public class BaseEntity implements Serializable { @CreatedBy @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建人", hidden = true) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @ApiModelProperty(value = "创建人") private String createBy; @LastModifiedBy @TableField(fill = FieldFill.INSERT_UPDATE) - @ApiModelProperty(value = "更新人", hidden = true) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @ApiModelProperty(value = "更新人") private String updateBy; @TableField(fill = FieldFill.INSERT) - @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) + @ApiModelProperty(value = "创建时间: yyyy-MM-dd HH:mm:ss") + @JsonProperty(access = JsonProperty.Access.READ_ONLY) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp createTime; @TableField(fill = FieldFill.INSERT_UPDATE) - @ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @ApiModelProperty(value = "更新时间: yyyy-MM-dd HH:mm:ss") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp updateTime; diff --git a/aircraft-system/src/main/resources/mapper/aircraft/AircraftDeviceMapper.xml b/aircraft-system/src/main/resources/mapper/aircraft/AircraftDeviceMapper.xml index acf7666..6a23ab2 100644 --- a/aircraft-system/src/main/resources/mapper/aircraft/AircraftDeviceMapper.xml +++ b/aircraft-system/src/main/resources/mapper/aircraft/AircraftDeviceMapper.xml @@ -50,7 +50,8 @@ a.name as areaName, d.scenic_id, s.name as scenicName, - d.employees_id + d.employees_id, + d.create_time from fms_ac_aircraft_device d left join em_area a on d.area_id = a.id left join em_scenic s on d.scenic_id = s.id