Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm

src/api/mall/promotion/seckill/seckillConfig.ts

@@ -19,7 +19,7 @@ export const SeckillConfigApi = {
 
 
   // 查询秒杀时段列表
   // 查询秒杀时段列表
   getSimpleSeckillConfigList: async () => {
   getSimpleSeckillConfigList: async () => {
-    return await request.get({ url: `/promotion/seckill-config/simple-list` })
+    return await request.get({ url: `/promotion/seckill-config/list` })
   },
   },
 
 
   // 查询秒杀时段详情
   // 查询秒杀时段详情

src/views/bpm/processInstance/detail/index.vue

@@ -363,7 +363,7 @@ const loadRunningTask = (tasks) => {
     // 2.4 处理 approve 表单
     // 2.4 处理 approve 表单
     if (task.formId && task.formConf) {
     if (task.formId && task.formConf) {
       const approveForm = {}
       const approveForm = {}
-      setConfAndFields2(approveForm, task.formConf, task.formFields, task.formVariable)
+      setConfAndFields2(approveForm, task.formConf, task.formFields, task.formVariables)
       approveForms.value.push(approveForm)
       approveForms.value.push(approveForm)
     } else {
     } else {
       approveForms.value.push({}) // 占位，避免为空
       approveForms.value.push({}) // 占位，避免为空

src/views/mp/account/index.vue

@@ -37,7 +37,7 @@
       <el-table-column label="appId" align="center" prop="appId" width="180" />
       <el-table-column label="appId" align="center" prop="appId" width="180" />
       <el-table-column label="服务器地址(URL)" align="center" prop="appId" width="360">
       <el-table-column label="服务器地址(URL)" align="center" prop="appId" width="360">
         <template #default="scope">
         <template #default="scope">
-          {{ 'http://服务端地址/mp/open/' + scope.row.appId }}
+          {{ 'http://服务端地址/admin-api/mp/open/' + scope.row.appId }}
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column label="二维码" align="center" prop="qrCodeUrl">
       <el-table-column label="二维码" align="center" prop="qrCodeUrl">

src/views/system/operatelog/index.vue

@@ -13,7 +13,8 @@
       <el-form-item label="操作人" prop="userId">
       <el-form-item label="操作人" prop="userId">
         <el-select
         <el-select
           v-model="queryParams.userId"
           v-model="queryParams.userId"
-          multiple
+          clearable
+          filterable
           placeholder="请输入操作人员"
           placeholder="请输入操作人员"
           class="!w-240px"
           class="!w-240px"
         >
         >