Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 d72d88f9e19ead4bbc2f69c4f5fbe66b1edbdc31

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

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

    private Integer type;


    @ApiModelProperty(value = "入库单号")
    @TableField("warehouse_no")
    private String warehouseNo;



}