Merge remote-tracking branch 'origin/master'

doum

22 小时以前 f2b6fdd955f8ac6e5b351e0b5e3a9f583ed6da2e

 server/services/src/main/java/com/doumee/dao/business/model/DriverInfo.java

@@ -186,6 +186,10 @@
    private Long memberAmount;

    @TableField(exist = false)
    @ApiModelProperty(value = "驾驶车辆类型： 机动车 = driving 非机动车 = bicycling")
    private String driverType;

    @TableField(exist = false)
    @ApiModelProperty(value = "图片前缀地址")
    private String imgPrefix;

@@ -233,4 +237,7 @@
    @ApiModelProperty(value = "审批人名称")
    private String auditUserName;

    @ApiModelProperty(value = "极光推送别名")
    private String jpushAlias;

}