Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

2025-03-28 8064549857d1cbfc9e7b80024f666a3b006ed3e0

 cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java

@@ -127,9 +127,7 @@
            } else {
                TStudent student = new TStudent();
                student.setId(editParticipant.getId());

                TStudent student1 = studentClient.queryById(editParticipant.getId());
                student.setName(student1.getName());
                student.setName(editParticipant.getName());
                student.setIdCard(editParticipant.getIdcard());
                student.setHeadImg(editParticipant.getHeadImg());
                if (editParticipant.getHeight() != null) {
@@ -138,7 +136,7 @@
                if (editParticipant.getWeight() != null) {
                    student.setWeight(editParticipant.getWeight());
                }
                if (ToolUtil.isNotEmpty(student.getName()) && ToolUtil.isNotEmpty(student.getIdCard())) {
                if (ToolUtil.isNotEmpty(editParticipant.getName()) && ToolUtil.isNotEmpty(student.getIdCard())) {
                    Boolean aBoolean = JuHeUtil.idcardAuthentication(student.getIdCard(), student.getName());
                    if (!aBoolean) {
                        return ResultUtil.error("身份证和姓名不匹配");