Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

# Conflicts:
#	xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodOrderFindVo.java

+package com.xxfc.platform.tour.vo;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 订单列表查询条件
+ * @data 2019/6/14 16:32
+ */
+@Data
+public class TourGoodOrderFindVo extends PageParam {
+
+
+    /**
+     * 公司id
+     */
+    @NotEmpty(message = "公司id不能为空")
+    private Integer companyId;
+
+    /**
+     * 订单状态
+     */
+    @NotEmpty(message = "订单状态不能为空")
+    private Integer  orderStatus;
+
+    /**
+     *出发时间
+     */
+    @NotEmpty(message = "出发时间不断能空")
+    private Long trvaelTime;
+
+}

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodOrderVo.java

+package com.xxfc.platform.tour.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 旅游订单列表
+ * @data 2019/6/14 15:19
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TourGoodOrderVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 商品名称
+     */
+     private String name;
+
+    /**
+     * 封面
+     */
+    private String coverUrl;
+
+    /**
+     * 出行时间
+     */
+    private String travelTime;
+
+    /**
+     * 总人数
+     */
+    private int  headcount;
+
+    /**
+     * 未上车人数
+     */
+    private int  tripOfNum;
+
+    /**
+     * 已上车人数
+     */
+    private  int  leaveOfnum;
+
+    /**
+     * 分公司名称
+     */
+    private  String companyName;
+
+    /**
+     * 是否出行  '状态：0-未出行；1-已出行'
+     */
+    private  Integer  travelStatus;
+}