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

zhanghl

2025-05-16 a5c145b5b9afb665d3130bbcf8659ee1a4b15ebf

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