Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

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

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