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

liyong

9 天以前 88e384da863bb2f7324cb1e1474885df3b7cce91

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

@@ -53,6 +53,16 @@
     */
    private Long accountId;
    /**
     * 关联采购申请编号
     *
     * 关联 {@link ErpPurchaseRequestDO#getId()}
     */
    private Long requestId;
    /**
     * 采购申请单号
     */
    private String requestNo;
    /**
     * 下单时间
     */
    private LocalDateTime orderTime;
@@ -112,4 +122,11 @@
     */
    private BigDecimal returnCount;

    /**
     * 入库状态
     *
     * 枚举 {@link cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderInStatusEnum}
     */
    private Integer inStatus;

}