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

liyong

6 天以前 274dd8b724dd4485658e1d2a3f825a007f625bd7

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderItemDO.java

@@ -78,15 +78,10 @@
    private String remark;

    // ========== 销售出库 ==========

    /**
     * 销售出库数量
     */
    private BigDecimal outCount;

    // ========== 销售退货（入库）） ==========
    /**
     * 销售退货数量
     */
    private BigDecimal returnCount;

}