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

liyong

5 天以前 274dd8b724dd4485658e1d2a3f825a007f625bd7

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

@@ -112,4 +112,16 @@
     */
    private BigDecimal returnCount;

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

    /**
     * BPM 流程实例编号
     */
    private String processInstanceId;

}