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

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGoodVerification.java

+package com.xxfc.platform.tour.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 旅游线路核销明细
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-14 09:36:50
+ */
+@Data
+@Table(name = "tour_good_verification")
+public class TourGoodVerification implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+	    /**
+    *  主键id
+   */
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键id")
+    private Integer id;
+	
+	    /**
+     *  分公司id
+     */
+    @Column(name = "spe_id")
+	@ApiModelProperty(value = "日期规格id")
+    private Integer speId;
+	
+	    /**
+     *  旅游路线id
+     */
+    @Column(name = "good_id")
+	@ApiModelProperty(value = "旅游路线id")
+    private Integer goodId;
+
+	/**
+	 *  旅游路线id
+	 */
+	@Column(name = "site_id")
+	@ApiModelProperty(value = "出发路线id")
+	private Integer siteId;
+	
+	
+	    /**
+     *  总人数
+     */
+    @Column(name = "total_person")
+	@ApiModelProperty(value = "总人数")
+    private Integer totalPerson;
+	
+	    /**
+     *  核销人数
+     */
+    @Column(name = "verification_person")
+	@ApiModelProperty(value = "核销人数")
+    private Integer verificationPerson;
+	
+	    /**
+     *  状态：0-未发车；1-已发车
+     */
+    @Column(name = "status")
+	@ApiModelProperty(value = "状态：0-未发车；1-已发车")
+    private Integer status;
+	
+	    /**
+     *  是否删除：0-正常；1-删除
+     */
+    @Column(name = "is_del")
+	@ApiModelProperty(value = "是否删除：0-正常；1-删除")
+    private Integer isDel;
+	
+
+}

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

+package com.xxfc.platform.tour.biz;
+
+import org.springframework.stereotype.Service;
+import  com.xxfc.platform.tour.entity.TourGoodVerification;
+import  com.xxfc.platform.tour.mapper.TourGoodVerificationMapper;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+
+/**
+ * 旅游线路核销明细
+ *
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-14 09:36:50
+ */
+@Service
+public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,TourGoodVerification> {
+}
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodVerificationMapper.java

+package com.xxfc.platform.tour.mapper;
+
+
+import  com.xxfc.platform.tour.entity.TourGoodVerification;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 旅游线路核销明细
+ * 
+ * @author zjw
+ * @email nishijjo@qq.com
+ * @date 2019-06-14 09:36:50
+ */
+public interface TourGoodVerificationMapper extends Mapper<TourGoodVerification> {
+	
+}

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodVerificationMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="package com.xxfc.platform.tour.mapper.TourGoodVerificationMapper">
+
+	<!-- 可根据自己的需求，是否要使用 -->
+    <resultMap type="package com.xxfc.platform.tour.entity.TourGoodVerification" id="tourGoodVerificationMap">
+        <result property="id" column="id"/>
+        <result property="companyId" column="company_id"/>
+        <result property="goodId" column="good_id"/>
+        <result property="departTime" column="depart_time"/>
+        <result property="totalPerson" column="total_person"/>
+        <result property="verificationPerson" column="verification_person"/>
+        <result property="status" column="status"/>
+        <result property="isDel" column="is_del"/>
+    </resultMap>
+
+</mapper>
\ No newline at end of file