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

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

@@ -60,6 +60,7 @@ public class MetaTask extends BaseEntity{
 
     @ApiModelProperty("奖励类型")
     @ExcelProperty("奖励类型")
+    @Enumerated(EnumType.STRING)
     private EntryModeType awardType;
 
     @ApiModelProperty("金币奖励数量")

src/main/vue/src/views/MetaTaskList.vue

@@ -49,7 +49,7 @@
             <el-table-column prop="type" label="任务类型" :formatter="typeFormatter"> </el-table-column>
             <el-table-column prop="value" label="配置值"> </el-table-column>
             <el-table-column prop="detail" label="详情"> </el-table-column>
-            <el-table-column prop="awardType" label="奖励金币数量" :formatter="awardTypeFormatter"> </el-table-column>
+            <el-table-column prop="awardType" label="奖励类型" :formatter="awardTypeFormatter"> </el-table-column>
             <el-table-column prop="awardPic" label="奖励图片">
                 <template slot-scope="{ row }">
                     <el-image