From d69ee0edbb5df260ac6b872357b88499d7914610 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 09:08:53 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java b/manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java
index 7877a5c..3f33780 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java
@@ -11,6 +11,8 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@@ -26,7 +28,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_order_goods")
@ApiModel(value="TOrderGoods对象", description="销售订单商品详情表")
-public class TOrderGoods extends BaseModel {
+public class TOrderGoods implements Serializable {
private static final long serialVersionUID = 1L;
@@ -69,9 +71,27 @@
@ApiModelProperty(value = "镜架-型号名称")
@TableField("modelName")
private String modelName;
+ @ApiModelProperty(value = "镜架型号id 前端忽略")
+ @TableField("modelId")
+ private Integer modelId;
+ @ApiModelProperty(value = "类型 1镜架 2镜片")
+ @TableField("status")
+ private Integer status;
@ApiModelProperty(value = "商品价格")
@TableField("goodsMoney")
private BigDecimal goodsMoney;
+ @ApiModelProperty(value = "系统成本价")
+ @TableField("cost")
+ private BigDecimal cost;
+ @ApiModelProperty(value = "核算成本价")
+ @TableField("constConfirm")
+ private BigDecimal constConfirm;
+ @ApiModelProperty(value = "镜片右 球镜+柱镜")
+ @TableField(exist = false)
+ private String rightLens;
+ @ApiModelProperty(value = "镜片左 球镜+柱镜")
+ @TableField(exist = false)
+ private String leftLens;
}
--
Gitblit v1.7.1