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

gongchunyi

昨天 da54b18e2934c39eb21e246aeda8baef9d1af933

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

@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.production.dto.ProductProcessDto;
import com.ruoyi.production.pojo.ProductProcess;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

@Mapper
public interface ProductProcessMapper extends BaseMapper<ProductProcess> {
    IPage<ProductProcessDto> listPage(Page page,@Param("productProcessDto") ProductProcessDto productProcessDto);
}