Skip to content
Snippets Groups Projects

Merge 'develop' into 'master'.

Merged BEAUVAIS ANTOINE requested to merge develop into master
Viewing commit 97c630e9
Show latest version
7 files
+ 20
8
Preferences
Compare changes
Files
7
@@ -30,8 +30,8 @@ public class ApiRetrieveItemsController implements IRetrieveInfoController {
* Returns all products as a JSON response.
* @param cat an optional category.
* @return a JSON response.
* @throws fr.unistra.sil.erp.back.controller.api.ApiServerErrorException
* @throws fr.unistra.sil.erp.back.controller.api.ApiBadRequestException
* @throws ApiServerErrorException if the request could not be served.
* @throws ApiBadRequestException if the category parameter is invalid.
*/
@GetMapping(MAPPING_RETRIEVEALL)
public ResponseEntity<Object> retrieveInfo(