From c22b895afe54ea30e395e00ed225883243fb8309 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 30 八月 2024 18:15:24 +0800
Subject: [PATCH] 用户角色接口
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderSale.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderSale.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderSale.java
index 9503c82..82b9c02 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderSale.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderSale.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.domain;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -9,7 +10,9 @@
import java.io.Serializable;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -31,8 +34,9 @@
private Long id;
@ApiModelProperty(value = "下单时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("orderTime")
- private LocalDateTime orderTime;
+ private LocalDate orderTime;
@ApiModelProperty(value = "备注说明")
@TableField("remark")
@@ -53,6 +57,13 @@
@ApiModelProperty(value = "支付状态 1=待支付 2=已支付")
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "店铺id")
+ @TableField("shopId")
+ private Long shopId;
+
+ @ApiModelProperty(value = "销售订单商品")
+ @TableField(exist = false)
+ private List<TOrderSaleGoods> orderSaleGoods;
}
--
Gitblit v1.7.1