Merge remote-tracking branch 'origin/master'

Crunchy

2024-05-23 196c31f1f040c315de09a6808fc9cd63c63f9950

 src/components/view/role-manage.vue

@@ -96,6 +96,7 @@
        <el-button type="primary" @click="saveAddData" :loading="addLoad" v-if="type!='查看'">确 定</el-button>
      </span>
    </el-dialog>

  </div>
</template>

@@ -114,7 +115,7 @@
          entity: {
            name: null,
            orderBy: {
              field: 'id',
                field: 'id',
              order: 'asc'
            }
          },