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

无关风月

2025-08-19 e8f01399a49bb718f184e31d0f6de27c3dc64cef

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

@@ -24,10 +24,6 @@
     */
    Integer quantityIssued;
    /**
     * 已领数量
     */
    Integer quantityHas;
    /**
     * 限领数量
     */
    Integer pickUpQuantity;
@@ -39,4 +35,8 @@
     * 排序
     */
    Integer sort;
    /**
     * 已换数量
     */
    private Integer num;
}