Merge remote-tracking branch 'origin/dev' into dev

mitao

2025-04-04 28d40a97ffa0acfda8e3766b0edd08e24c8dd21f

 ruoyi-system/src/main/java/com/ruoyi/system/dto/OfflinePayCheckDto.java

@@ -41,7 +41,7 @@
    private String flowId;

    @ApiModelProperty("支付类型")
    @NotEmpty(message = "支付类型不能为空")
    @NotNull(message = "支付类型不能为空")
    private Integer payType;