Merge remote-tracking branch 'origin/master'

guoshilong

2024-02-20 c2fa12a34eab9acf275915f551bf7c7d720ca2b1

 src/main/java/org/springblade/modules/ownersCommittee/controller/OwnersCommitteeController.java

@@ -99,6 +99,7 @@
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入ownersCommittee")
   public R update(@Valid @RequestBody OwnersCommitteeEntity ownersCommittee) {
      // 负责人修改了需要去更新负责人
      return R.status(ownersCommitteeService.updateById(ownersCommittee));
   }

@@ -109,7 +110,7 @@
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入ownersCommittee")
   public R submit(@Valid @RequestBody OwnersCommitteeEntity ownersCommittee) {
      return R.status(ownersCommitteeService.saveOrUpdate(ownersCommittee));
      return R.status(ownersCommitteeService.saveOrUpdateOwnersCommittee(ownersCommittee));
   }

   /**