fix car pay

mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java

@@ -87,7 +87,11 @@ public class WxMerchantController extends BaseController {
         wxMerchant.updateTenantInfo(getTenantInfo());
         wxMerchant.setSortColumns(BaseEntity.SortField.TopTime_DESC);
         wxMerchant.setIsPrivate(EnumYesOrNo.NO.getCode());
-        wxMerchant.setNoCarVendor(1);      
+        if (null != wxMerchant.getHasCarVendor()) {
+        	wxMerchant.setHasCarVendor(1);
+        }else {
+        	wxMerchant.setNoCarVendor(1);  
+        }
         final PageInfo<WxMerchant> page = wxMerchantService.listVoAsPage(wxMerchant, pageNum, pageSize,false);
         return new ResultData(page);
     }