Merge remote-tracking branch 'origin/master'

jiangping

2024-07-29 a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f

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

@@ -153,6 +153,10 @@
    @ExcelColumn(name="姓名")
    private String name;

    @ApiModelProperty(value = "member用户名称",hidden = true)
    @TableField(exist = false)
    private String memberName;

    @ApiModelProperty(value = "openid")
    @TableField(exist = false)
    private String openid;