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

zss

2 天以前 cf989c194af04a6a5705abac40fad0cc8cb56301

 src/main/java/com/ruoyi/production/mapper/ProductionProductMainMapper.java

@@ -10,6 +10,7 @@
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.ArrayList;
import java.util.List;

@Mapper
@@ -30,4 +31,6 @@
    ProductOrder getOrderByMainId(@Param("productMainId") Long productMainId);

    IPage<ProductionProductMainDto> listProductionDetails(@Param("ew") SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page);

    ArrayList<Long> listMain(List<Long> idList);
}