From 508f3e225df87e0da974424981e7782fc5ce875c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 19 五月 2025 14:21:39 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderStock.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderStock.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderStock.java
index 063b394..c3057ba 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderStock.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TOrderStock.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>
@@ -35,11 +38,28 @@
private String stockNum;
@ApiModelProperty(value = "进货日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("stockTime")
- private LocalDateTime stockTime;
+ private LocalDate stockTime;
@ApiModelProperty(value = "进货总价")
@TableField("stockTotalPrice")
private BigDecimal stockTotalPrice;
+ @ApiModelProperty(value = "是否覆盖 1=是 0=否")
+ @TableField("isCover")
+ private Integer isCover;
+ @ApiModelProperty(value = "数据生成id")
+ @TableField("generatorId")
+ private Long generatorId;
+ @ApiModelProperty(value = "店铺id")
+ @TableField("shopId")
+ private Long shopId;
+// @ApiModelProperty(value = "支付方式 1=现金 2=支付宝 3=微信 4=银行卡 5=其他")
+// @TableField("payType")
+// private Integer payType;
+
+ @ApiModelProperty(value = "进货数据商品集合")
+ @TableField(exist = false)
+ private List<TOrderStockGoods> orderStockGoods;
}
--
Gitblit v1.7.1