Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WarrantController.java

@@ -30,7 +30,7 @@ public class WarrantController {
     @Autowired
     private WarrantService warrantService;
 
-    @RequestMapping(value ="/{AppId}/callback")
+    @RequestMapping(value ="/{APPID}/callback")
     public void acceptMessageAndEvent(HttpServletRequest request, @PathVariable("APPID") String appid,
                                       HttpServletResponse response)throws IOException, DocumentException, AesException {
         warrantService.acceptMessageAndEvent(request, appid, response);