Merge remote-tracking branch 'origin/master'

src/main/java/com/mth/requestsecret/controller/RequestController.java

@@ -149,8 +149,8 @@ public class RequestController {
         // api参数
         MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
         paramMap.add("User_Name", param.getUserName());
-        paramMap.add("Card_Id", param.getIdCard());
-        paramMap.add("zjhm", param.getIdCard());
+        paramMap.add("User_ID", param.getIdCard());
+        paramMap.add("zjhm", param.getSfhm());
         paramMap.add("Organization", param.getOrganization());
         paramMap.add("Organization_Id", param.getOrganizationId());
         paramMap.add("additional", param.getAdditional());
@@ -1095,18 +1095,17 @@ public class RequestController {
     /**
      * 六十四.浙江省城镇三无对象供养查询
      *
-     * @param param
+     * @param xzqh
      * @return
      */
     @PostMapping("/withoutSupportInfo")
-    public ResponseEntity<String> withoutSupportInfo(BaseParamVO param) {
+    public ResponseEntity<String> withoutSupportInfo(String xzqh, String additional) {
         // api签名
         String apiMethod = "withoutSupportInfo.action";
         // api参数
         MultiValueMap<String, Object> paramMap = new LinkedMultiValueMap<>();
-        paramMap.add("name", param.getUserName());
-        paramMap.add("cardId", param.getIdCard());
-        paramMap.add("additional", param.getAdditional());
+        paramMap.add("czswdx_xzqh", xzqh);
+        paramMap.add("additional", additional);
         return restTemlateService.commonSendRequest(paramMap, apiMethod);
     }