Merge remote-tracking branch 'origin/master'

src/main/java/com/gct/aoid/controller/AoidDailyYieldController.java

@@ -25,7 +25,6 @@ import java.util.Map;
 @Api(value = "AoidDailyYieldController", description = "功图量液")
 @RestController
 @RequestMapping("/aoidDailyYield")
-@CrossOrigin
 public class AoidDailyYieldController {
 
     @Autowired