Browse Source

修改创建时间的bug

master
yangkun 2 months ago
parent
commit
b246436dd2
  1. 9
      renren-admin/renren-admin-client/src/main/java/io/renren/dto/stock/PurchaseInfoDTO.java
  2. 5
      renren-admin/renren-admin-server/src/main/java/io/renren/stock/entity/PurchaseInfoEntity.java

9
renren-admin/renren-admin-client/src/main/java/io/renren/dto/stock/PurchaseInfoDTO.java

@ -37,8 +37,8 @@ public class PurchaseInfoDTO implements Serializable {
// @DateTimeFormat(pattern = "yyyy-MM-dd") // @DateTimeFormat(pattern = "yyyy-MM-dd")
// @JsonFormat(pattern = "yyyy-MM-dd") // @JsonFormat(pattern = "yyyy-MM-dd")
@JsonFormat(shape = JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm", timezone="GMT+8") @JsonFormat(shape = JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "购买时间") @ApiModelProperty(value = "购买时间")
private Date purchaseDate; private Date purchaseDate;
@ -67,4 +67,9 @@ public class PurchaseInfoDTO implements Serializable {
@DateTimeFormat(pattern="yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "清仓日期") @ApiModelProperty(value = "清仓日期")
private Date liquidationDate; private Date liquidationDate;
@JsonFormat(shape = JsonFormat.Shape.STRING,pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "")
private Date createDatetime;
} }

5
renren-admin/renren-admin-server/src/main/java/io/renren/stock/entity/PurchaseInfoEntity.java

@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
/** /**
@ -71,4 +69,7 @@ public class PurchaseInfoEntity {
*/ */
@JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", timezone="GMT+8")
private Date liquidationDate; private Date liquidationDate;
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
private Date createDatetime;
} }
Loading…
Cancel
Save