Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong

liujie

5 天以前 7df0337148d9d6d6158ad93564aa2a3c827265cc

 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;