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

Pu Zhibing

2025-03-19 e064c1165e0f7047e0a0d564569cd7c418009e67

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

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

    private Integer num;
}