Merge remote-tracking branch 'origin/master'

luo

2023-10-08 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15

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

@@ -1,12 +1,8 @@
package com.dsh.competition.controller;


import com.dsh.competition.util.ResultUtil;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.xml.transform.Result;
import java.util.List;

/**
 * <p>