Merge remote-tracking branch 'origin/master'

Pu Zhibing

9 天以前 4041cb7dafbd2fd394b31d95c5e64528b9f91505

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Driver.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModelProperty;

import java.util.Date;

@@ -344,21 +345,124 @@
     */
    @TableField("appletsOpenId")
    private String appletsOpenId;

    /**
     * 司机二维码
     */
    @TableField("qrCode")
    private String qrCode;
    /**
     * 中台员工ID
     */
    @TableField("empId")
    private Long empId;
    /**
     * 中台员工所属企业ID
     */
    @TableField("enterId")
    private Long enterId;
    /**
     * 中台员工所属企业编号
     */
    @TableField("entercode")
    private String entercode;


    @ApiModelProperty("省")
    private String province;

    @ApiModelProperty("省代码")
    private String provinceCode;

    @ApiModelProperty("市")
    private String city;

    @ApiModelProperty("市代码")
    private String cityCode;

    @ApiModelProperty("区")
    private String area;

    @ApiModelProperty("区代码")
    private String areaCode;

    @ApiModelProperty("分享图片")
    private String shareImg;

    @ApiModelProperty("分享链接")
    private String shareLink;

    public String getShareImg() {
        return shareImg;
    }

    public void setShareImg(String shareImg) {
        this.shareImg = shareImg;
    }

    public String getShareLink() {
        return shareLink;
    }

    public void setShareLink(String shareLink) {
        this.shareLink = shareLink;
    }

    public String getProvince() {
        return province;
    }

    public void setProvince(String province) {
        this.province = province;
    }

    public String getProvinceCode() {
        return provinceCode;
    }

    public void setProvinceCode(String provinceCode) {
        this.provinceCode = provinceCode;
    }

    public String getCity() {
        return city;
    }

    public void setCity(String city) {
        this.city = city;
    }

    public String getCityCode() {
        return cityCode;
    }

    public void setCityCode(String cityCode) {
        this.cityCode = cityCode;
    }

    public String getArea() {
        return area;
    }

    public void setArea(String area) {
        this.area = area;
    }

    public String getAreaCode() {
        return areaCode;
    }

    public void setAreaCode(String areaCode) {
        this.areaCode = areaCode;
    }

    public String getQrCode() {
        return qrCode;
    }

    
    public void setQrCode(String qrCode) {
        this.qrCode = qrCode;
    }

    
    @Override
    public Integer getId() {
        return id;
@@ -872,15 +976,39 @@
    public void setAppletsOpenId(String appletsOpenId) {
        this.appletsOpenId = appletsOpenId;
    }

    
    public String getWithdrawPassword() {
        return withdrawPassword;
    }

    
    public void setWithdrawPassword(String withdrawPassword) {
        this.withdrawPassword = withdrawPassword;
    }

    
    public Long getEmpId() {
        return empId;
    }
    
    public void setEmpId(Long empId) {
        this.empId = empId;
    }
    
    public Long getEnterId() {
        return enterId;
    }
    
    public void setEnterId(Long enterId) {
        this.enterId = enterId;
    }
    
    public String getEntercode() {
        return entercode;
    }
    
    public void setEntercode(String entercode) {
        this.entercode = entercode;
    }
    
    @Override
    public String toString() {
        return "Driver{" +