From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 28 三月 2024 14:04:24 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcProcessQuantityMapper.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcProcessQuantityMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcProcessQuantityMapper.java index 93e6343..dd2f909 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcProcessQuantityMapper.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcProcessQuantityMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; import org.jeecg.modules.mdc.dto.MdcProcessQuantityDto; import org.jeecg.modules.mdc.entity.MdcProcessQuantity; +import org.jeecg.modules.mdc.vo.MdcProcessQuantityVo; import java.util.List; @@ -25,7 +26,7 @@ * @param mdcProcessQuantity * @return */ - IPage<MdcProcessQuantityDto> pageList(Page<MdcProcessQuantityDto> page, @Param("mdcProcessQuantity") MdcProcessQuantity mdcProcessQuantity); + IPage<MdcProcessQuantityDto> pageList(Page<MdcProcessQuantityDto> page, @Param("mdcProcessQuantity") MdcProcessQuantityVo mdcProcessQuantity); /** * 瀵煎嚭鏁版嵁 @@ -33,7 +34,7 @@ * @param mdcProcessQuantity * @return */ - List<MdcProcessQuantityDto> list(@Param("mdcProcessQuantity") MdcProcessQuantity mdcProcessQuantity); + List<MdcProcessQuantityDto> list(@Param("mdcProcessQuantity") MdcProcessQuantityVo mdcProcessQuantity); /** * 鏍规嵁id鏌ヨ -- Gitblit v1.9.3