From 92f43487ae2d2147cea2f9930ddeb61f98edb5e9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 17:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java | 10 +++++++++-
1 files changed, 9 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 9aa6b92..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;
@@ -85,5 +87,11 @@
@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