Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/supervision/police/service/impl/CaseEvidencePropertyServiceImpl.java

@@ -268,7 +268,9 @@ public class CaseEvidencePropertyServiceImpl implements CaseEvidencePropertyServ
             Field field = beanDesc.getField(StrUtil.toCamelCase(entry.getKey()));
             NotePromptExtractAttributesDto attributesDto = new NotePromptExtractAttributesDto();
             attributesDto.setAttrName(getFieldDesc(field));
-            attributesDto.setAttrValue(StrUtil.toString(entry.getValue()));
+            if (null != entry.getValue()){
+                attributesDto.setAttrValue(StrUtil.toString(entry.getValue()));
+            }
             attributesDto.setAttrValueType(getFieldType(field));
             return attributesDto;
         }).filter(a->StrUtil.isNotEmpty(a.getAttrName())).toList();