Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

2026-04-25 a96948456e0a21ab33deeb2edfdd7ef343aec5bf

 src/main/java/com/ruoyi/production/service/ProductionProductMainService.java

@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.production.dto.ProductionProductMainDto;
import com.ruoyi.production.bean.dto.ProductionProductMainDto;
import com.ruoyi.production.pojo.ProductionProductMain;

import java.util.ArrayList;