20210430v1.1

mt/src/main/java/com/ccsens/mt/api/CompeteController.java

@@ -36,10 +36,10 @@ public class CompeteController {
 
 
     @ApiOperation(value = "查看比赛列表", notes = "")
-    @RequestMapping(value = "/competeTime", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    @RequestMapping(value = "/competeTimeList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<CompeteVo.CompeteTime> getCompeteTimeList() {
         log.info("查看比赛列表");
-        List<CompeteVo.CompeteTime> competeTime = competeService.getCompeteTimeList();
+        List<CompeteVo.CompeteTimeList> competeTime = competeService.getCompeteTimeList();
         return JsonResponse.newInstance().ok(competeTime);
     }
 

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteTimeDao.java

@@ -68,5 +68,5 @@ public interface CompeteTimeDao extends CompeteTimeMapper {
      * 查询2021比赛列表
      * @return
      */
-    List<CompeteVo.CompeteTime> getCompeteTimeList();
+    List<CompeteVo.CompeteTimeList> getCompeteTimeList();
 }

mt/src/main/java/com/ccsens/mt/service/CompeteService.java

@@ -348,7 +348,7 @@ public class CompeteService implements ICompeteService {
     }
 
     @Override
-    public List<CompeteVo.CompeteTime> getCompeteTimeList() {
+    public List<CompeteVo.CompeteTimeList> getCompeteTimeList() {
         return competeTimeDao.getCompeteTimeList();
     }
 

mt/src/main/java/com/ccsens/mt/service/ICompeteService.java

@@ -233,7 +233,7 @@ public interface ICompeteService {
      * 查看比赛列表
      * @return
      */
-    List<CompeteVo.CompeteTime> getCompeteTimeList();
+    List<CompeteVo.CompeteTimeList> getCompeteTimeList();
 }
 
 

mt/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test
 
 

mt/src/main/resources/mapper_dao/CompeteTimeDao.xml

@@ -37,7 +37,7 @@
         and
         end_time > #{time}
     </select>
-    <select id="getCompeteTimeList" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteTime">
+    <select id="getCompeteTimeList" resultType="com.ccsens.mt.bean.vo.CompeteVo$CompeteTimeList">
          SELECT
         id,
         `name`,

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: greenvalley
+    include: util-greenvalley,common