Merge remote-tracking branch 'origin/dev' into dev

zhanghl

2025-05-20 fa1a70790ff7fd4df4ab114f56bee9476128152e

 aps-modules/aps-core/src/main/java/com/aps/core/controller/mainPlan/ApsWeldSeamStatisticsController.java

@@ -42,7 +42,7 @@
    @GetMapping("/list")
    public TableDataInfo list(ApsWeldSeamStatistics apsWeldSeamStatistics)
    {
        startPage();
//        startPage();
        List<ApsWeldSeamStatistics> list = apsWeldSeamStatisticsService.selectApsWeldSeamStatisticsList(apsWeldSeamStatistics);
        return getDataTable(list);
    }