From 83c4dd24f674b5f2c3d10ab98d04e8562202449b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 21:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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..9aa6b92 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOrderGoods.java
@@ -69,9 +69,21 @@
@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;
}
--
Gitblit v1.7.1