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

mitao

2025-03-31 51f26723bee741bf112c8d0d965d0e2f2974bd04

 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;

}