Merge remote-tracking branch 'origin/dev' into dev

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodVerificationBiz.java

@@ -107,7 +107,7 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
                 if (list.size()==0){
                     return  ObjectRestResponse.succ();
                 }
-            }else if (list!=null&&companyIds.size()>0){
+            }else if (companyIds!=null&&companyIds.size()>0){
                 list=mapper.getSiteList(null,null,companyIds);
             }
             list=mapper.getGoodList(list);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookRecord.java

@@ -176,7 +176,7 @@ public class VehicleBookRecord {
     private Integer haveViolation;
 
     /**
-     * 订单号
+     * 租车订单号或者旅游路线id
      */
     private String orderNo;