Merge remote-tracking branch 'origin/master'

liujie

2023-10-31 1c08cdb19aa0531dc77665dbbde052133dff9ceb

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

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