Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-11 c2e4ed1a6e3a14406db471304360cd45ac8177d1

 server/src/main/java/doumeemes/dao/business/model/CompanyUser.java

@@ -148,4 +148,10 @@
    @ExcelColumn(name="是否是主账户：0=否；1=是；")
    private Integer isMaster;


    @ApiModelProperty(value = "微信openid")
    private String openid;

    @ApiModelProperty(value = "微信unionid")
    private String unionid;
}