Merge remote-tracking branch 'origin/master'

jiangping

2024-09-27 04b4bddaac0a222760113899568d20b45af701f4

 server/service/src/main/java/com/doumee/dao/business/model/Member.java

@@ -91,6 +91,9 @@
    @ApiModelProperty(value = "中台临时票据")
    @ExcelColumn(name="中台临时票据")
    private String token;
    @ApiModelProperty(value = "中台用户主键")
    @ExcelColumn(name="中台用户主键")
    private String ztUserId;

    @ApiModelProperty(value = "性别 1男 2女", example = "1")
    @ExcelColumn(name="性别 1男 2女")