Merge branch 'dev' of http://222.71.165.188:3000/yunxi/mes-majoys into dev

mes-ui/mes-ui-admin-vue3/src/views/biz/salarysetting/detail.vue

@@ -36,7 +36,7 @@
                 class="!w-260px"
                 v-model="formData.userName"
                 :disabled="detailDisabled || updateDisabled"
-                placeholder="请输入工价"
+                placeholder="请输入员工姓名"
               />
             </el-form-item>
           </el-col>