Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-08-28 a79f7d80e55319ae1a40954f6a4ce6e382cc1649

 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;
}