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

无关风月

2025-08-28 cfa7d0a90e7da9b52606ab8fca364fa5bddddcd4

 cloud-server-activity/src/main/java/com/dsh/activity/model/request/PointMercharsVo.java

@@ -35,4 +35,6 @@
     * 排序
     */
    Integer sort;

    private Integer num;
}