Merge branch 'release_toaliyun_real' into release_real_200809

mallinkAdmin/src/main/java/com/iformall/controller/contract/WxContractBaseController.java

@@ -44,7 +44,12 @@ public class WxContractBaseController extends BaseController{
     	
     	Map contractNumberMap = new HashMap<String,Object>();
     	contractNumberMap.put("key","contractNumber");
-    	contractNumberMap.put("value", String.valueOf(contractId));
+    	//租金+物业合同时用到
+    	if (null != wholeProperyId) {
+    		contractNumberMap.put("value",  String.valueOf(contractId)+"&"+String.valueOf(wholeProperyId));
+    	}else {
+    		contractNumberMap.put("value", String.valueOf(contractId));
+    	}
     	variablesList.add(contractNumberMap);
     	
     	map.put("variables", variablesList);