Merge remote-tracking branch 'origin/master'

44323

2023-09-05 63b6d78b7f906d7464eca710695bef600772651d

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

@@ -24,6 +24,10 @@
     */
    Integer quantityIssued;
    /**
     * 已领数量
     */
    Integer quantityHas;
    /**
     * 限领数量
     */
    Integer pickUpQuantity;