Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 3530f728388d91b09a62fbd8f82d3a56b1ff265b

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