解决冲突

mg

2022-10-28 2d964c50c7ac6557e968328e5931006686c4cfbb

 ycl-platform/src/main/java/com/ycl/remote/service/CityPlatformService.java

@@ -24,7 +24,7 @@
     * @date 2022-09-28 16:12
     */
    @PostMapping("/unauthorized/external/event/add")
    ResultResponseDto<EventAddResponseDto> addEvent(EventAddParamDto paramDto);
    String addEvent(EventAddParamDto paramDto);

    /**
     * 事件详情
@@ -35,7 +35,7 @@
     * @date 2022-09-28 16:12
     */
    @PostMapping("/unauthorized/external/event/process")
    ResultResponseDto<EventProcessResponseDto> getEventProcess(EventProcessParamDto paramDto);
    String getEventProcess(EventProcessParamDto paramDto);


}