Merge remote-tracking branch 'origin/master'

xuhy

1 天以前 092a98a583c4fe822a3eb4c4dac086f84b16189c

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

@@ -38,29 +38,12 @@
    @TableField("clinic_id")
    private String clinicId;

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

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

    @ApiModelProperty(value = "供应商名称")
    @TableField("supplier_name")
    private String supplierName;

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

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

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

    @ApiModelProperty(value = "总价")
    @TableField("total_price")
@@ -74,10 +57,14 @@
    @TableField("warehouse_no")
    private String warehouseNo;

    @ApiModelProperty(value = "单价")
    @TableField("unit_amount")
    private BigDecimal unitAmount;
    @ApiModelProperty(value = "1正常 2盘点")
    @ApiModelProperty(value = "1采购 2盘点 3手动")
    private Integer type;

    @ApiModelProperty(value = "供应商id")
    @TableField("supplier_id")
    private String supplierId;

    @ApiModelProperty(value = "盘点id")
    @TableField("inventory_id")
    private String inventoryId;
}