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

zhanghl

2025-05-16 c3c7756721b8b29585615f6d2c6cb6166f17c7cc

 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)
    {