Merge remote-tracking branch 'origin/master'

shiwan/admin/src/main/java/com/huimv/admin/controller/secondary/MachineControlController.java

@@ -16,7 +16,8 @@ import java.util.Map;
  * @Description 料控管理Controller
  */
 @CrossOrigin
-@RestController("/machineControl")
+@RestController
+@RequestMapping("/machineControl")
 public class MachineControlController {
 
     @Autowired