Merge remote-tracking branch 'origin/master'

“mitao”

2025-12-23 ae80fa80a5131f4dd9c04d82b07da8fe3c607f1e

 ruoyi-system/src/main/java/com/ruoyi/system/query/AppUserListQuery.java

@@ -15,4 +15,6 @@
    private String phoneNumber;
    @ApiModelProperty(value = "状态 1=使用中 2=冻结")
    private Integer status;
    @ApiModelProperty(value = "推广状态有条件1 其他不传")
    private Integer promotionStatus;
}