Merge remote-tracking branch 'origin/master'

src/views/main-sidebar.vue

@@ -113,7 +113,7 @@ export default {
     $route: 'routeHandle'
   },
   created() {
-    this.menuList = JSON.parse(sessionStorage.getItem('menuList') || '[]').filter(item => item.menuId != 999)
+    this.menuList = JSON.parse(sessionStorage.getItem('menuList') || '[]').filter(item => item.menuId != 999 && item.menuId != 2025100401)
     this.favoriteList = JSON.parse(sessionStorage.getItem('menuList') || '[]').filter(item => item.menuId == 999)
     this.userFavorites()
     this.dynamicMenuRoutes = JSON.parse(sessionStorage.getItem('dynamicMenuRoutes') || '[]')

src/views/modules/labelSetting/com_add_update_user_label_printer.vue

@@ -7,7 +7,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item class="customer-item"  :label=labels.userId>
-              <el-input  v-model="pageData.userId" :readonly="readOnlyUserId" @blur="checkUserIdMethod()"  style="width: 120px;" >
+              <el-input  v-model="pageData.userId" @blur="checkUserIdMethod()"  style="width: 120px;" >
               </el-input >
             </el-form-item>
           </el-col>