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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/PointsMerchandise.java

@@ -108,5 +108,7 @@
     * 课包支付配置id
     */
    private Integer coursePackageConfigId;
    private Integer addUserId;
    private Integer addType;

}