合并分支 'qa' 到 'master'

refactor(promotion): 更新检查计划查询控制器的返回逻辑查看合并请求 !57

合并分支 'qa' 到 'master'
4aecd51e · lvbencai · b87acfcc · d6159d7a · 4aecd51e
--- a/src/main/java/com/wangxiaolu/promotion/controller/activity/examine/ExaPlanQueryController.java
+++ b/src/main/java/com/wangxiaolu/promotion/controller/activity/examine/ExaPlanQueryController.java
@@ -25,10 +25,10 @@ public class ExaPlanQueryController {

    @GetMapping("/{id}")
    public R selectById(@PathVariable @PathParam("id") Long id) {
-        ActivityExamineDto examineDto = exaPlanQueryService.selectById(id);
-        if (examineDto != null) {
-            return R.success(examineDto);
-        }
+//        ActivityExamineDto examineDto = exaPlanQueryService.selectById(id);
+//        if (examineDto != null) {
+//            return R.success(examineDto);
+//        }
        InspectionInfoDto inspectionInfoDto =exaPlanQueryService.selectNewByID(id);
        return R.success(inspectionInfoDto);
    }