Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionRecordServiceImpl.java

@@ -165,7 +165,9 @@ public class PatrolInspectionRecordServiceImpl extends AbstractCrudService<Patro
             contentOptionVo.setCreateTime(contentOptionList.get(i).getCreateTime());
             contentOptionVo.setSelectStatus(false);
             for (int j = 0; j < patrolInspectionRecordOptionList.size(); j++) {
-                contentOptionVo.setRemarks(patrolInspectionRecordOptionList.get(j).getRemarks());
+                if(contentOptionList.get(i).getContentId()==patrolInspectionContentList.get(j).getId()){
+                    contentOptionVo.setRemarks(patrolInspectionRecordOptionList.get(j).getRemarks());
+                }
                 if (contentOptionList.get(i).getId() == patrolInspectionRecordOptionList.get(j).getContentOptionId()) {
                     contentOptionVo.setSelectStatus(true);
                 }