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

liyong

4 天以前 be5783c8a7e13bbc76d33c95643d75779cce21db

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/purchase/ErpPurchaseRequestDO.java

@@ -100,6 +100,11 @@
    private BigDecimal discountPrice;

    /**
     * 定金金额
     */
    private BigDecimal depositPrice;

    /**
     * 附件地址
     */
    private String fileUrl;
@@ -124,4 +129,13 @@
     */
    private String orderNo;

    /**
     * 入库状态
     *
     * 0: 未入库
     * 1: 部分入库
     * 2: 全部入库
     */
    private Integer inStatus;

}