Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

clll

2023-10-27 254899911b6ca9b2e6085060902990cff8c84ef0

 CanadaMes-ui/src/views/user/index.vue

@@ -123,7 +123,7 @@
            </el-option>
          </el-select>
        </el-form-item>
        <el-form-item :label="$t('ElectricalPassword')" prop="dianqimima">
        <el-form-item :label="$t('ElectricalPassword')" prop="dianqimima"  v-if="editUserForm.username === 'admin'">
        <el-input   v-model="editUserForm.dianqimima"></el-input>
      </el-form-item>
      </el-form>