Merge remote-tracking branch 'origin/master'

doum

2 天以前 4ab710d8d70017f090dd9601099ded1a50a58a10

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

@@ -46,6 +46,9 @@
    private String remark;

    @ApiModelProperty(value = "手机号")
    private Integer memberId;

    @ApiModelProperty(value = "手机号")
    @ExcelColumn(name = "手机号", index = 2, width = 12)
    private String phone;