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

无关风月

2025-03-28 8064549857d1cbfc9e7b80024f666a3b006ed3e0

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/model/PointMercharsVo.java

@@ -35,4 +35,8 @@
     * 排序
     */
    Integer sort;
    /**
     * 已换数量
     */
    private Integer num;
}