Merge remote-tracking branch 'origin/dev/dev' into dev/dev

2025-02-05 12:05:07 +08:00
parent cf76235123 8d9f51f50f
commit 464de4ee5a
6 changed files with 22 additions and 20 deletions
--- a/src/main/java/com/ai/da/controller/AffiliateController.java
+++ b/src/main/java/com/ai/da/controller/AffiliateController.java
@@ -64,8 +64,8 @@ public class AffiliateController {

    /*@ApiOperation(value = "每月发送结算邮件")
    @GetMapping("/commissionCalculation")
-    public Response<String> commissionCalculation() {
-        affiliateService.commissionCalculation(null, null);
+    public Response<String> commissionCalculation(@RequestParam("year") Integer year, @RequestParam("month") Integer month) {
+        affiliateService.commissionCalculation(year, month);
        return Response.success("success ");
    }*/