From f38b9b10de303806a8d27734dbbf0ff8815dba49 Mon Sep 17 00:00:00 2001 From: chenlu <1320612696@qq.com> Date: 星期五, 08 三月 2024 19:37:30 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override --- north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java index e284bb8..293f6c9 100644 --- a/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java +++ b/north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java @@ -1,6 +1,7 @@ package com.example.erp.mapper.pp; import com.example.erp.entity.pp.PatchLog; +import com.example.erp.entity.pp.ReportingWork; import com.example.erp.entity.pp.Rework; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -26,7 +27,7 @@ Boolean updateReplenish(@Param("patchLog") PatchLog patchLog , @Param("userName") String userName); - Boolean updateOrderProcessDetail(@Param("patchLog") PatchLog patchLog ); + Boolean updateOrderProcessDetail(@Param("patchLog") PatchLog patchLog,@Param("reportingWork") ReportingWork reportingWork ); List<Map<String,Object>> getSelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz); -- Gitblit v1.8.0