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

src/main/java/com/yxproject/start/api/FailedCardApi.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -51,8 +52,10 @@ public class FailedCardApi {
         for (Object o:jsonarray) {
             Map<String,Object> resultMap =failedCardService.selectInfoByCardId(o.toString());
             if (resultMap==null){
+                resultMap = new LinkedHashMap<>();
                 resultMap.put("ID_NO",o.toString());
                 resultMap.put("NAME","查无此人");
+                resultMap.put("SEX_NO","-1");
             }
             resultList.add(resultMap);
         }