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

zhanghl

2025-05-23 0de06ac0a530227080e9b9b4c7560d4e809fed1e

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