Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-29 c44e660304d6599d90e23da0e52f2c734a81c2ec

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