Merge remote-tracking branch 'origin/master'

lin

2024-02-29 97ad7e7702c7dbcef19d8fc05b23b7357670c6d7

 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java

@@ -84,7 +84,7 @@
      taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
      List<String> addressCodeList = new ArrayList<>();
      if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
          if (taskReportForRepairs.getRoleName().equals("居民")) {
          if (taskReportForRepairs.getRoleName().equals("inhabitant")) {
            taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
            taskReportForRepairs.setConfirmUserId(null);
            //