Merge remote-tracking branch 'origin/master'

jiangping

2024-07-17 3a355771834c39d38a628132031ce1c52bc64478

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

@@ -155,4 +155,8 @@
    @TableField(exist = false)
    private String openid;

    @ApiModelProperty(value = "C端用户主键")
    @TableField(exist = false)
    private Long memberId;

}