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

mitao

2025-04-11 7d22ca5a1c9416e84430a3997664e17861a2951e

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/ConsumeQuery.java

@@ -15,5 +15,5 @@

    String reason;

    Integer payId;
    Long payId;
}