Merge branch 'master' into debug

# Conflicts:
#	sp-server/app.pid

sp-server/app.pid

@@ -0,0 +1 @@
+19384

sp-server/src/main/java/com/pj/api/service/ApiService.java

@@ -323,6 +323,9 @@ public class ApiService {
             if (db == null) {
                 db = new TbBusinessCar();
             }
+        }else {
+            db.setBusinessType(TbBusiness.BusinessType.CAR_DISINCLE.getCode());
+            tbBusinessCarService.updateById(db);
         }
         db.setPay(0).setCarNo(carNo).setBusinessType(TbBusiness.BusinessType.CAR_DISINCLE.getCode())
                 .setBusinessType(TbBusiness.BusinessType.CAR_DISINCLE.getCode())