Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/templates/ryfk/ryfk.html

src/main/java/com/founder/controller/CallDygabxxfw.java

@@ -51,7 +51,7 @@ public class CallDygabxxfw {
             Map<Object, Object> param = new HashMap();
             param.put("zylx", zylx);
             System.out.println(jsonStr);
-            param.put("os", jsonStr);
+            param.put("jsonStr", jsonStr);
             //String url =  "http://zhyy.xzxt.nm/getGabZyInfoByJyaqMatj.action";
             String url = p.getValue("qganurl");
             // http链接工具