Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-11 7b09f233bde70508f6db7e08e983e9a2c4bb3e99

 inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java

@@ -21,7 +21,7 @@
    @Transactional(rollbackFor = Exception.class)
    Integer addProcessInspectionSheet(FinishedInspect finishedInspect);

    Integer inspectionConclusion(Integer finishedInspectId, Integer result);
    Integer inspectionConclusion(String username,Integer finishedInspectId, Integer result);

    IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer inspectResult, String inspectDate, String inspectUsername);
}