conflict resolved

This commit is contained in:
unknown 2025-11-05 20:01:18 +05:30
commit 468f2b3ded

View File

@ -342,6 +342,9 @@ router.delete("/admin_users/:id",[verifySignature, verifyToken], adminUserContro
router.get("/testEmail", establishmentController.testEmail);
/** /**
* @swagger * @swagger
@ -2103,7 +2106,7 @@ router.get("/submissions/getPreviousForecastData",[verifySignature, verifyToken]
* 500: * 500:
* description: Server error * description: Server error
*/ */
router.get("/submission-audit-history",[verifySignature, verifyToken], submissionController.getSubmissionHistory); router.get("/submission-audit-history",[verifySignature, verifyToken], submissionController.getSubmissionHistory);