修改冲突

puzhibing

2024-08-17 ffae18d7a8e21b93bc837d889504d2c8b55368c0

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TActivityStatisticsController.java

@@ -28,7 +28,7 @@
 * @since 2024-08-06
 */
@RestController
@RequestMapping("/activity")
@RequestMapping("/activityStatistics")
public class TActivityStatisticsController {
    @Autowired
    private OrderClient orderClient;