BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts

Browse Source
This commit is contained in:
rajesh
2024-10-25 12:37:51 +05:30
parent d27b7f1a2e 5818eff396
commit 03e487500a
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/net/gepafin/tendermanagement/util/Utils.java
View File

@@ -369,4 +369,5 @@ public class Utils {
throw new RuntimeException("Error converting map to string", e); throw new RuntimeException("Error converting map to string", e);
} }
} }
} }

2
src/main/java/net/gepafin/tendermanagement/web/rest/api/CallApi.java
View File

@@ -74,7 +74,7 @@ public interface CallApi {
public ResponseEntity<Response<CallResponse>> updateCallStep1(HttpServletRequest request, public ResponseEntity<Response<CallResponse>> updateCallStep1(HttpServletRequest request,
@Parameter(description = "The call id", required = true) @PathVariable("callId") Long callId, @Parameter(description = "The call id", required = true) @PathVariable("callId") Long callId,
@Parameter(description = "Call request object", required = true) @Valid @RequestBody UpdateCallRequestStep1 updateCallRequest); @Parameter(description = "Call request object", required = true) @Valid @RequestBody UpdateCallRequestStep1 updateCallRequest);
@Operation(summary = "Api to get call by id", @Operation(summary = "Api to get call by id updated today to check the bug",
responses = { responses = {
@ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "200", description = "OK"),
@ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {

4
src/main/resources/application.properties
View File

@@ -1,8 +1,8 @@
spring.application.name=tendermanagement spring.application.name=tendermanagement
# Multipart Configuration # Multipart Configuration
spring.servlet.multipart.max-file-size=15MB spring.servlet.multipart.max-file-size=300MB
spring.servlet.multipart.max-request-size=15MB spring.servlet.multipart.max-request-size=300MB
spring.profiles.active=testing spring.profiles.active=testing