Merge branch 'project-jmga-2.2.0-2.0.1' into project-jmga-dev

src/main/java/com/fdkankan/contro/service/impl/HaixinServiceImpl.java

@@ -200,7 +200,7 @@ public class HaixinServiceImpl implements IHaixinService {
         params.put("kNo", sceneOrigBd.getKNo());
         params.put("num", num);
         params.put("status", status);
-        params.put("expectedTime", expectedTime);
+        params.put("expectedTime", expectedTime == null ? 0 : expectedTime);
         haixinClient.postJson(url, params);
     }
 }