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

xiangpei

2025-07-09 a1c289e7dfc5d9a3b8dc7ca9b05857f276c05f8d

 pages/userPermissions/userPermissions.vue

@@ -5,7 +5,7 @@
         <text class="title">用户列表</text>
      </view>
      <view>
         <button class="add-btn" @click="navigateToAdd()" :disabled="!isShopkeeper">新增用户</button>
         <button class="add-btn" @click="navigateToAdd()">新增用户</button>
      </view>
      <!-- 搜索框 -->
      <view class="search-box">