Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-26 9f35dc84a6af0a9019e5ae2c8ac4b2c8e2c99fe9

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