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

puzhibing

2024-03-11 75d8795d4a8444071f348be4082455f2ca078ffe

 cloud-server-course/src/main/java/com/dsh/course/entity/dto/ConsumeQuery.java

@@ -14,5 +14,5 @@

    String reason;

    Integer payId;
    Long payId;
}