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

zd-modules/zd-exam/src/main/java/com/zd/exam/controller/ElPointsRecordController.java

@@ -247,7 +247,7 @@ public class ElPointsRecordController extends BaseController {
     /**
      * 兑换机服务接口
      */
-    @PostMapping("/exchangeMachineService")
+    @RequestMapping("/exchangeMachineService")
     public Map<String,String> exchangeMachineService(@RequestParam Map<String,String> machineMap) {
         return pointsRecordService.exchangeMachineService(machineMap);
     }