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

zhanghl

2025-04-27 01bec5540f87a68ae881295f9fe06283e00f1ed2

 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);
    }