Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-11-27 e3892373f0c3c786eccb1d1de0774c3ecc103f53

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

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