fix 合并

zhongzheng-admin/src/main/java/com/zhongzheng/controller/grade/ClassStudentController.java

@@ -184,8 +184,8 @@ public class ClassStudentController extends BaseController {
     @ApiOperation("批量官方信息推送")
     @PreAuthorize("@ss.hasPermi('app:user:edit')")
     @PostMapping("/pushInfo")
-    public AjaxResult<Void> pushInfo(@RequestBody List<ClassGradeUserQueryBo>  list) {
-        return toAjax(Validator.isEmpty(iClassGradeUserService.pushOfficialInfoMore(list)) ? 1 : 0);
+    public AjaxResult pushInfo(@RequestBody List<ClassGradeUserQueryBo>  list) {
+        return AjaxResult.success(iClassGradeUserService.pushOfficialInfoMore(list));
     }
 
     /**
@@ -204,7 +204,7 @@ public class ClassStudentController extends BaseController {
     @ApiOperation("批量学时信息推送")
     @PreAuthorize("@ss.hasPermi('app:user:edit')")
     @PostMapping("/pushPeriod")
-    public AjaxResult<Void> pushPeriod(@RequestBody List<ClassGradeUserQueryBo>  list) {
-        return toAjax(Validator.isEmpty(iClassGradeUserService.pushOfficialPeriodMore(list)) ? 1 : 0);
+    public AjaxResult pushPeriod(@RequestBody List<ClassGradeUserQueryBo>  list) {
+        return AjaxResult.success(iClassGradeUserService.pushOfficialPeriodMore(list));
     }
 }