Merge branch '04/19-newPermission' into test

src/views/teamBuild/signupList.vue

@@ -86,7 +86,12 @@
             class="newBand"
             v-permission="'musicGroup/addMusicGroupRegs'"
             @click="mergeVisible = true"
-            v-show="status == 'PAY' || status == 'APPLY'"
+             v-show="
+              (status == 'PAY' ||
+              status == 'APPLY' ||
+              status == 'PROGRESS' ||
+              status == 'PREPARE')&&ischeckCanReg
+            "
           >
             合并学员
           </div>
@@ -258,7 +263,7 @@
           <el-table-column align="center" label="入团年份">
             <template slot-scope="scope">
               <div>
-                {{ scope.row.currentGradeDate | dayjsFormat("YYYY年") }}
+                {{ scope.row.createTime | dayjsFormat("YYYY年") }}
               </div>
             </template>
           </el-table-column>