Merge remote-tracking branch 'origin/master'

national-motion-base-core/src/main/java/org/jeecg/common/api/CommonAPI.java

@@ -13,7 +13,7 @@ import java.util.Set;
 public interface CommonAPI {
 
     /**
-     * 1查询用户角色信息
+     *     查询用户角色信息
      * @param username
      * @return
      */

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/controller/stadium/StadiumController.java

@@ -8,6 +8,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.app.service.IDetailService;
 import org.jeecg.modules.app.vo.PlaceInfoVO;
 import org.jeecg.modules.app.vo.stadium.StadiumConcertsVO;
+import org.jeecg.modules.app.vo.stadium.StadiumFindById;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,7 +35,7 @@ public class StadiumController {
      **/
     @GetMapping("/getPlaceInfo")
     @Operation(summary = "场次详情查询-缺少已定状态和可预约数逻辑 ")
-    public Result<List<StadiumConcertsVO>> findConcerts(){
+    public Result<List<StadiumConcertsVO>> findConcerts(StadiumFindById stadiumFindById){
         String site_id = "1942781931946946561";
         String category_id = "1942391828774895617";
         return iDetailService.findConcerts(site_id,category_id);

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/app/vo/stadium/StadiumFindById.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.app.vo.stadium;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@Schema(description="体育馆场次请求")
+public class StadiumFindById {
+    @Schema(description = "场所id")
+    private String siteId;
+    @Schema(description = "运动类型id")
+    private String categoryId;
+
+}