Merge remote-tracking branch 'origin/master'

xuhy

1 天以前 092a98a583c4fe822a3eb4c4dac086f84b16189c

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpClinicWarehousingBatch.java

@@ -12,6 +12,7 @@
import lombok.EqualsAndHashCode;

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;

/**
@@ -56,4 +57,33 @@
    private LocalDateTime expiryDate;


    @ApiModelProperty(value = "商品id")
    @TableField("goods_id")
    private String goodsId;

    @ApiModelProperty(value = "商品名称")
    @TableField("goods_name")
    private String goodsName;

    @ApiModelProperty(value = "国药准字号")
    @TableField("quasi_number")
    private String quasiNumber;

    @ApiModelProperty(value = "单价")
    @TableField("unit_amount")
    private BigDecimal unitAmount;

    @ApiModelProperty(value = "所需数量（采购数量）")
    @TableField("purchase_count")
    private Integer purchaseCount;

    @ApiModelProperty(value = "售价")
    @TableField("sales_amount")
    private BigDecimal salesAmount;

    @ApiModelProperty(value = "单位")
    @TableField(exist = false)
    private String unitName;


}