Merge remote-tracking branch 'origin/master'

xing

2023-02-26 ba5e65e7bda57e18bd0dcf65d1d9596f967e0ae0

 src/views/userManage/authorityManage.vue

@@ -33,13 +33,13 @@
            icon="el-icon-delete"
            type="danger" size="small"
          >{{ $t('common.delete') }}</el-button>
          <el-button
            @click="submitForm('ruleForm')"
            icon="el-icon-search" size="small"
            type="primary"
          >{{
            $t('common.iquery')
          }}</el-button>
<!--          <el-button-->
<!--            @click="submitForm('ruleForm')"-->
<!--            icon="el-icon-search" size="small"-->
<!--            type="primary"-->
<!--          >{{-->
<!--            $t('common.iquery')-->
<!--          }}</el-button>-->
          <el-button
            @click="resetForm('ruleForm')"
            icon="el-icon-refresh"