From f0c023166c7a2855c93c5cacd3267cfee6077322 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 10:46:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java
index 1ffc9a2..2e020a8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java
@@ -29,13 +29,17 @@
@TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
- @ApiModelProperty(value = "供应商id")
- @TableField("supplier_id")
- private String supplierId;
+ @ApiModelProperty(value = "供应商id/诊所id")
+ @TableField("supplier_clinic_id")
+ private String supplierClinicId;
@ApiModelProperty(value = "诊所id")
@TableField("clinic_id")
private String clinicId;
+
+ @ApiModelProperty(value = "商品来源 1=平台添加 2=线下添加")
+ @TableField("goods_source")
+ private String goodsSource;
@ApiModelProperty(value = "商品名称")
@TableField("goods_name")
@@ -117,5 +121,13 @@
@TableField("platform_commission_price")
private Double platformCommissionPrice;
+ @ApiModelProperty(value = "1启用 2禁用")
+ private Integer state;
+
+
+ @ApiModelProperty(value = "商品类型名称")
+ @TableField(exist = false)
+ private String typeName;
+
}
--
Gitblit v1.7.1