Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-28 948cb5be3f62683c7edd8180d1b2cac0c426d0c9

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