Merge remote-tracking branch 'origin/master'

xuhy

16 小时以前 206fcf7d6afae27856f63cf0158f53b61fa1b86f

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

@@ -58,6 +58,8 @@
    @TableField("total_price")
    private BigDecimal totalPrice;

    private Integer type;


    @ApiModelProperty(value = "入库单号")
    @TableField("warehouse_no")