Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/mall_product

This commit is contained in:
YunaiV
2023-09-03 17:59:50 +08:00
45 changed files with 429 additions and 311 deletions

View File

@@ -21,7 +21,7 @@ public class AppTradeOrderDetailRespVO {
private String no;
@Schema(description = "下单时间", requiredMode = Schema.RequiredMode.REQUIRED)
private Date createTime;
private LocalDateTime createTime;
@Schema(description = "用户备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你猜")
private String userRemark;

View File

@@ -4,7 +4,7 @@ import cn.iocoder.yudao.module.trade.controller.app.order.vo.item.AppTradeOrderI
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.util.Date;
import java.time.LocalDateTime;
import java.util.List;
@Schema(description = "用户 App - 订单交易的分页项 Response VO")
@@ -30,7 +30,7 @@ public class AppTradeOrderPageItemRespVO {
private Boolean commentStatus;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
private Date createTime;
private LocalDateTime createTime;
// ========== 价格 + 支付基本信息 ==========