Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-03 d70a64df5d6f7b3b8f68436bd92df8366219981b

 ycl-server/src/main/java/com/ycl/platform/controller/ContractResultController.java

@@ -45,8 +45,8 @@
     */
    @PreAuthorize("@ss.hasPermi('system:result:query')")
    @GetMapping("/record/list")
    public TableDataInfo recordList(Long resultId) {
        List<ContractResultRecord> list = checkResultService.selectCheckResultRecordList(resultId);
    public TableDataInfo recordList(Long resultId, Long contractId) {
        List<ContractResultRecord> list = checkResultService.selectCheckResultRecordList(resultId, contractId);
        return getDataTable(list);
    }