Merge remote-tracking branch 'origin/master'

jiang

2024-01-25 901b68695fcdab7e3ff1d5df3df88bd5001b0181

 jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/controller/DaPassingStationCollectionController.java

@@ -50,6 +50,17 @@
        return getDataTable(list);
    }

    /**
     * 查询产品过站采集列表
     */
    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
    @GetMapping("/noPageList")
    public TableDataInfo noPageList(DaPassingStationCollection daPassingStationCollection)
    {
        List<DaPassingStationCollection> list = daPassingStationCollectionService.selectDaPassingStationCollectionList(daPassingStationCollection);
        return getDataTable(list);
    }

    @PreAuthorize("@ss.hasPermi('da:passingStationCollection:list')")
    @GetMapping("/getProduceNumToday")
    public R getProduceNumToday(String fieldName)