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

无关风月

2 天以前 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

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