Merge branch 'dev_v1.3.6_20221021'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/music/MusicCompareRecordStatController.java

@@ -15,10 +15,10 @@ import com.yonge.toolset.mybatis.support.PageUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -30,9 +30,9 @@ import java.util.List;
  * @author Eric
  * @since 2022-10-17
  */
-@Controller
+@RestController
 @RequestMapping("/music/compare")
-@Api(tags = "曲目练习统计表 API接口")
+@Api(tags = "曲目练习统计 ")
 public class MusicCompareRecordStatController extends BaseController {
 
     @Autowired

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicCompareRecordStatMapper.xml

@@ -43,7 +43,7 @@
                 AND t1.user_id_ = #{record.userId}
             </if>
         </where>
-        ORDER BY t1.${record.compareField} #{record.sortType}
+        ORDER BY t1.${record.compareField} ${record.sortType}
     </select>
     <!--曲目统计查询-->