Merge remote-tracking branch 'origin/master'

rk

2 天以前 55642c818f14bf8cf52c98e6858014bd8dc3d3a7

 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;