Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 a80311f4fb0ecad83e8bc3df59a3d596d637c0ba

 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;