Merge remote-tracking branch 'origin/master'

doum

2026-01-27 0d0e67818a45161af14114211f43aafd232a6da2

 server/dmmall_web/src/main/java/com/doumee/api/web/ActivityApi.java

@@ -25,7 +25,7 @@
 */
@Api(tags = "活动业务")
@Trace(exclude = true)
@RestController
//@RestController
@RequestMapping("/web/activity")
@Slf4j
public class ActivityApi extends ApiController{