From 31216f98ac2888b08674db8759fe3ec8c84345f3 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Wed, 3 Sep 2025 08:53:57 +0800 Subject: [PATCH] commit --- .../conteoller/ActivityBudgetApplyController.java | 5 +++-- .../resources/views/platform/activityBudget/common/apply.js | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/v/nutz/zhgh/activityBudget/conteoller/ActivityBudgetApplyController.java b/src/main/java/io/v/nutz/zhgh/activityBudget/conteoller/ActivityBudgetApplyController.java index b62de0c..5c0799d 100644 --- a/src/main/java/io/v/nutz/zhgh/activityBudget/conteoller/ActivityBudgetApplyController.java +++ b/src/main/java/io/v/nutz/zhgh/activityBudget/conteoller/ActivityBudgetApplyController.java @@ -47,8 +47,9 @@ public class ActivityBudgetApplyController { @At @Aop(TransAop.READ_COMMITTED) + @ViReturn @RequiresPermissions("activity.budget.apply") - public Result doSubmit(@Param("activityBudget") ActivityBudget activityBudget, Boolean flag) { + public Object doSubmit(@Param("activityBudget") ActivityBudget activityBudget, Boolean flag) { Dao dao = baseService.dao(); if (flag) { activityBudget.setAuditState(1); @@ -139,7 +140,7 @@ public class ActivityBudgetApplyController { ActivityBudgetUserApplyToDoHandler.COMPLETE_APPLY_TASK.exec(activityBudget,null); } - return Result.success(); + return null; } @At diff --git a/src/main/resources/views/platform/activityBudget/common/apply.js b/src/main/resources/views/platform/activityBudget/common/apply.js index c256bc5..6c31c27 100644 --- a/src/main/resources/views/platform/activityBudget/common/apply.js +++ b/src/main/resources/views/platform/activityBudget/common/apply.js @@ -6,12 +6,12 @@ const BUDGET_APPLY = {
填写申报信息 - +