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

Pu Zhibing

2025-01-24 4b1453e19306592f703aa794e238bd028f67d320

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

@@ -104,5 +104,11 @@
     * 添加时间
     */
    private Date insertTime;
    /**
     * 课包支付配置id
     */
    private Integer coursePackageConfigId;
    private Integer addUserId;
    private Integer addType;

}