Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-22 8019eb016f806c1166223b1e2f08c1f9d7a96117

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/UserChangeDto.java

@@ -8,4 +8,5 @@
    private Long userId;
    @ApiModelProperty("1=正常，2=冻结")
    private Integer status;
    private String remark;
}