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

hongjli

2025-05-23 48f5220bc5eb826402f43e440dc34867368ff17c

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

@@ -31,7 +31,7 @@
    /**
     * 查询车间列表
     */
    @RequiresPermissions("shop:list")
   // @RequiresPermissions("shop:list")
    @GetMapping("/list")
    public TableDataInfo list(ApsShop apsShop)
    {
@@ -95,4 +95,15 @@
    {
        return toAjax(apsShopService.deleteApsShopByIds(ids));
    }

    /**
     * 查询车间列表
     */
//    @RequiresPermissions("shop:list")
    @GetMapping("/listAll")
    public AjaxResult listAll(ApsShop apsShop)
    {
        List<ApsShop> list = apsShopService.selectApsShopList(apsShop);
        return AjaxResult.success(list);
    }
}