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

doum

10 天以前 a291dd70f178d32f8b582a9c6ed1a73b5a81a62e

 server/system_service/src/main/java/com/doumee/dao/business/model/SmsEmail.java

@@ -100,4 +100,7 @@
    @ApiModelProperty(value = "结束时间")
    @TableField(exist = false)
    private Date endTime;
    @ApiModelProperty(value = "用户类型 0司机 1访客 2内部员工 3")
    @TableField(exist = false)
    private Integer userType;
}