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

无关风月

5 天以前 c560f1a14ae1fc468d90e50e6a32d805295875da

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

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

    private Integer num;
}