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

无关风月

8 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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

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

    private Integer num;
}