Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg

liding

5 天以前 1d915922d8197aa5d5dc3e40e3088d983dd6e141

 src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java

@@ -50,4 +50,22 @@
    private LocalDateTime weighingDate;

    private String  parentName;

    @ApiModelProperty("净重(总数)")
    private BigDecimal netWeight;

    @ApiModelProperty("车牌号")
    private String licensePlateNo;

    @ApiModelProperty("毛重")
    private BigDecimal grossWeight;

    @ApiModelProperty("皮重")
    private BigDecimal tareWeight;

    @ApiModelProperty("过磅员")
    private String weighingOperator;

    @ApiModelProperty("磅单文件路径")
    private String weighbridgeDocPath;
}