Merge remote-tracking branch 'origin/master'

liujie

2023-07-25 738f93e8f8226518e5b0e202b1f7afd19c01656e

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

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

}