Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-06 f53c26884de8f3fd5b15a5a36c5743225d8b5628

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