From 80e492653be5ab090e87c2e13c0fef6e516649d8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 02 九月 2025 20:03:56 +0800
Subject: [PATCH] crm供应商,仓库,诊所

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpGoods.java |   65 ++++++++++++++++++++++++++++++--
 1 files changed, 61 insertions(+), 4 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 98c7abe..c64a8a7 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
@@ -6,8 +6,10 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.aspectj.weaver.ast.Not;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 /**
@@ -32,10 +34,6 @@
     @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")
@@ -121,5 +119,64 @@
     @TableField("platform_commission_price")
     private BigDecimal platformCommissionPrice;
 
+    @ApiModelProperty(value = "1启用 2禁用")
+    private Integer state;
+
+
+    @ApiModelProperty(value = "商品类型名称")
+    @TableField(exist = false)
+    private String typeName;
+
+    @ApiModelProperty(value = "拼音简码")
+    @TableField("simplified_code")
+    private String simplifiedCode;
+
+    @ApiModelProperty(value = "剂型")
+    @TableField("dosage_form")
+    private String dosageForm;
+
+    @ApiModelProperty(value = "用途分类")
+    @TableField("usage_classification")
+    private String usageClassification;
+
+    @ApiModelProperty(value = "商品品牌名")
+    @TableField("product_brand")
+    private String productBrand;
+
+    @ApiModelProperty(value = "产地")
+    @TableField("place_of_origin")
+    private String placeOfOrigin;
+
+    @ApiModelProperty(value = "成分")
+    @TableField("ingredient")
+    private String ingredient;
+
+    @ApiModelProperty(value = "性状")
+    @TableField("trait")
+    private String trait;
+
+    @ApiModelProperty(value = "适应症")
+    @TableField("indication")
+    private String indication;
+
+    @ApiModelProperty(value = "禁忌")
+    @TableField("taboo")
+    private String taboo;
+
+    @ApiModelProperty(value = "注意事项")
+    @TableField("precautions")
+    private String precautions;
+
+    @ApiModelProperty(value = "相互作用")
+    @TableField("interaction")
+    private String interaction;
+
+    @ApiModelProperty(value = "贮藏")
+    @TableField("storage")
+    private String storage;
+
+
+
+
 
 }

--
Gitblit v1.7.1