Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-23 3fd5b6267e4468f179d1f339fee961b89cea7afa

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/service/RemoteActivityService.java

@@ -85,7 +85,7 @@
     * @param activityId
     * @return  R
     */
    @PostMapping("/startActivity")
    @PostMapping("/activity/startActivity")
    public R startActivity(@RequestBody String activityId);

    /**
@@ -95,6 +95,6 @@
     * @param activityId
     * @return  R
     */
    @PostMapping("/endActivity")
    @PostMapping("/activity/endActivity")
    public R endActivity(@RequestBody String activityId);
}