Merge remote-tracking branch 'origin/master'

jiangping

2024-07-29 a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f

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

@@ -90,7 +90,7 @@
    @ExcelColumn(name="微信openid")
    private String openid;

    @ApiModelProperty(value = "账户状态 0停用，1启用", example = "1")
    @ApiModelProperty(value = "账户状态 0停用，1启用，-1删除", example = "1")
    @ExcelColumn(name="账户状态 0停用，1启用")
    private String status;