Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-18 09897d2adec822b398c652bc3b8e6b6cfd6a6b2b

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java

@@ -25,7 +25,7 @@

    Boolean updateDamageDetails(@Param("patchLog") PatchLog patchLog);

    Boolean updateReportingWorkDetail(@Param("patchLog") PatchLog patchLog);
    Boolean updateReportingWorkDetail(@Param("reportingWorkId") String reportingWorkId,@Param("orderSort") Integer orderSort,@Param("technologyNumber") Integer technologyNumber);

    Boolean updateReplenish(@Param("patchLog") PatchLog patchLog ,  @Param("userName") String userName);