q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
songmingsong
2024-12-06 16:15:30 +08:00
parent 8cb58289df 5e6a52536a
commit 884ae3b9dd
9 changed files with 170 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/ycwl/basic/model/pc/order/req/OrderAddOrUpdateReq.java
View File

@ -1,6 +1,7 @@
package com.ycwl.basic.model.pc.order.req;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycwl.basic.model.mobile.goods.GoodsDetailVO;
import com.ycwl.basic.model.pc.order.entity.OrderItemEntity;
import com.ycwl.basic.model.pc.order.resp.OrderItemVO;
import io.swagger.annotations.ApiModel;
@ -96,6 +97,6 @@ public class OrderAddOrUpdateReq {
@ApiModelProperty("订单退款时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date refundAt;
@ApiModelProperty("订单明细")
private List<OrderItemDTO> orderItemList;
@ApiModelProperty("订单商品明细")
private List<GoodsDetailVO> goodsItemList;
}

2
src/main/java/com/ycwl/basic/model/pc/source/resp/SourceRespVO.java
View File

@ -51,6 +51,4 @@ public class SourceRespVO {
private String videoUrl;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
}