Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 3c12858927ce26f277ba758e520c81be599d8df1

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

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