Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_jshvc

.gitignore

@@ -25,4 +25,4 @@ target/
 hs_err_pid*
 
 src/main/resources/application.yaml
-src/main/resources/application-dev.yaml
+src/main/resources/application.yaml

src/main/resources/views/platform/zhgh/club/register/apply/clubRegisterManager.js

@@ -58,8 +58,7 @@ const CLUB_MANAGER_TEMPLATE = {
                             </template>
                             <template slot-scope="scope">
                                 <el-button 
-                                           :disabled="scope.row.roleCode === 'CLUB_PRESIDENT'
-                                            || scope.row.roleCode === 'CLUB_SECRETARY'""
+                                           :disabled="scope.row.roleCode === 'CLUB_PRESIDENT'"
                                            @click="deleteRow(scope.row, scope.$index)"
                                            size="mini" type="danger">删除
                                 </el-button>

src/test/java/com/budwk/app/JugTest.java

@@ -83,8 +83,8 @@ public class JugTest {
 
     @Test
     public void userPwd(){
-        List<Sys_user> users = dao.query(Sys_user.class, Cnd.NEW());
-        String pwd = "1";
+        List<Sys_user> users = dao.query(Sys_user.class, Cnd.where("loginname","in",List.of("safeadmin","safemember")));
+        String pwd = "@Gonghui_jshvc1024";
         for (Sys_user user : users) {
             user.setSalt(R.UU32());
             user.setPassword(PwdUtil.getPassword(pwd, user.getSalt()));