Merge remote-tracking branch 'origin/master'

xuhy

2 天以前 092a98a583c4fe822a3eb4c4dac086f84b16189c

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

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

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

/**
@@ -43,7 +44,7 @@

    @ApiModelProperty(value = "出库总价")
    @TableField("total_money")
    private Double totalMoney;
    private BigDecimal totalMoney;

    @ApiModelProperty(value = "出库单号")
    @TableField("outbound_number")
@@ -53,5 +54,13 @@
    @TableField("outbound_reason")
    private String outboundReason;

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

    @ApiModelProperty(value = "种类数")
    @TableField("type_num")
    private Integer typeNum;


}