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

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/ExchangeDetailsResponse.java

@@ -38,9 +38,7 @@
    private Integer goodType;


    private Integer  userId;


    private Integer userId;


    private List<Integer> rid;