Merge remote-tracking branch 'origin/master'

xuhy

6 天以前 72aaf45389cd09c206ee1b90f0c7f5bf59782930

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpGoodsInventoryVO.java

@@ -51,9 +51,13 @@
    private String packingUnitId;


    @ApiModelProperty(value = "商品单价")

    @ApiModelProperty(value = "商品售价")
    private BigDecimal salesAmount;

    @ApiModelProperty(value = "商品单价")
    private BigDecimal unitAmount;

    @ApiModelProperty(value = "失效日期")
    private LocalDateTime expiryDate;