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

hongjli

2025-05-22 e4efff6637f4d598a7efdfca8b62fbb4c3286b02

 aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java

@@ -31,13 +31,14 @@
    /**
     * 查询工厂管理列表
     */
    @RequiresPermissions("plant:list")
    //@RequiresPermissions("plant:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsPlant apsPlant)
    {
        startPage();
        List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
        return getDataTable(list);
        //startPage();
        //List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
        List<ApsPlant> list1 = apsPlantService.list();
        return getDataTable(list1);
    }

    /**
@@ -95,4 +96,15 @@
    {
        return toAjax(apsPlantService.deleteApsPlantByIds(ids));
    }

    /**
     * 查询工厂管理列表
     */
//    @RequiresPermissions("plant:list")
    @GetMapping("/listAll")
    public AjaxResult listAll(ApsPlant apsPlant)
    {
        List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
        return AjaxResult.success(list);
    }
}