From 2e5ec4c7c528437a20fd7212096dedd26ed0f5cd Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 02 九月 2025 15:36:09 +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 | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 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 2e020a8..7970679 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,6 +6,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.aspectj.weaver.ast.Not;
import java.io.Serializable;
import java.time.LocalDateTime;
@@ -32,10 +33,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")
@@ -99,7 +96,7 @@
@ApiModelProperty(value = "商品售价")
@TableField("sales_amount")
- private Double salesAmount;
+ private BigDecimal salesAmount;
@ApiModelProperty(value = "包装单位,单位id")
@TableField("packing_unit_id")
@@ -115,11 +112,11 @@
@ApiModelProperty(value = "诊所采购价")
@TableField("clinic_purchase_price")
- private Double clinicPurchasePrice;
+ private BigDecimal clinicPurchasePrice;
@ApiModelProperty(value = "平台分佣金额")
@TableField("platform_commission_price")
- private Double platformCommissionPrice;
+ private BigDecimal platformCommissionPrice;
@ApiModelProperty(value = "1启用 2禁用")
private Integer state;
@@ -129,5 +126,56 @@
@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