Merge branch 'dev-meta' of xiongzhu/raex_back into master

src/main/java/com/izouma/nineth/domain/MetaUserGold.java

@@ -1,6 +1,7 @@
 package com.izouma.nineth.domain;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.nineth.annotations.Searchable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -16,6 +17,7 @@ import javax.persistence.Entity;
 @ApiModel("元宇宙玩家金币")
 public class MetaUserGold extends BaseEntity {
 
+    @Searchable
     @ApiModelProperty("用户id")
     @ExcelProperty("用户id")
     private Long userId;

src/main/java/com/izouma/nineth/domain/MetaUserGoldRecord.java

@@ -1,6 +1,7 @@
 package com.izouma.nineth.domain;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.izouma.nineth.annotations.Searchable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -16,6 +17,7 @@ import javax.persistence.Entity;
 @ApiModel("元宇宙玩家金币明细")
 public class MetaUserGoldRecord extends BaseEntity {
 
+    @Searchable
     @ApiModelProperty("用户id")
     @ExcelProperty("用户id")
     private Long userId;

src/main/vue/src/views/MetaTaskNewEdit.vue

@@ -28,7 +28,7 @@
                         </el-select>
                     </el-form-item>
                     <template v-if="formData && formData.type == 'MAIN_LINE'">
-                        <el-form-item prop="metaNodeTask" label="节点任务配置" style="width: calc(100vw - 1550px)" size="mini">
+                        <el-form-item prop="metaNodeTask" label="节点任务配置" style="width: calc(100vw - 450px)" size="mini">
                             <el-table :data="formData.metaNodeTask">
                                 <el-table-column prop="atomTaskIndex" label="索引" align="center" width="50">
                                     <template v-slot="{ row, $index }">
@@ -58,7 +58,7 @@
                         <el-form-item>
                             <el-button size="mini" @click="addNodeTask" :disabled="!canEdit"> 添加节点任务 </el-button>
                         </el-form-item>
-                        <el-form-item prop="metaBranchLineTask" label="支线任务配置" style="width: calc(100vw - 1550px)"
+                        <el-form-item prop="metaBranchLineTask" label="支线任务配置" style="width: calc(100vw - 450px)"
                             size="mini">
                             <el-table :data="formData.metaBranchLineTask">
                                 <el-table-column prop="atomTaskIndex" label="索引" align="center" width="50">
@@ -91,7 +91,7 @@
                         </el-form-item>
                     </template>
                     <template v-if="formData && formData.type == 'BRANCH_LINE'">
-                        <el-form-item prop="metaBranchLineTask" label="支线任务配置" style="width: calc(100vw - 1550px)"
+                        <el-form-item prop="metaBranchLineTask" label="支线任务配置" style="width: calc(100vw - 450px)"
                             size="mini">
                             <el-table :data="formData.metaBranchLineTask">
                                 <el-table-column prop="atomTaskIndex" label="索引" align="center" width="50">
@@ -124,7 +124,7 @@
                         </el-form-item>
                     </template>
                     <template v-if="formData && formData.type == 'DAILY'">
-                        <el-form-item prop="metaDailyTask" label="日常任务配置" style="width: calc(100vw - 1550px)" size="mini">
+                        <el-form-item prop="metaDailyTask" label="日常任务配置" style="width: calc(100vw - 450px)" size="mini">
                             <el-table :data="formData.metaDailyTask">
                                 <el-table-column prop="atomTaskIndex" label="索引" align="center" width="50">
                                     <template v-slot="{ row, $index }">