Merge branch 'Regulation' of http://git.izouma.com/licailing/wenlvju into Regulation

src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -194,7 +194,7 @@
             <!-- <el-table-column prop="examPoint" label="考级点" min-width="160"> </el-table-column> -->
             <el-table-column label="操作" align="center" fixed="right" min-width="270">
                 <template slot-scope="{ row }">
-                    <el-button @click="showRow(row)" size="mini" plain v-if="row.status == 0">查看</el-button>
+                    <el-button @click="showRow(row)" size="mini" plain v-if="row.status != 0">查看</el-button>
                     <el-button type="success" @click="editRow(row)" size="mini" plain v-else>编辑</el-button>
                     <el-button
                         type="warning"

src/test/java/com/izouma/wenlvju/repo/UserRepoTest.java

@@ -74,7 +74,7 @@ public class UserRepoTest {
 
     @Test
     public void test3() {
-        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(10148L)
+        System.out.println(jwtTokenUtil.generateToken(JwtUserFactory.create(userRepo.findById(10847L)
                 .orElseThrow(new BusinessException("用户不存在")))));
     }