Merge remote-tracking branch 'origin/master'

liujie

2023-08-09 efc09045da6ca5fc06ff9221723ed9ddf81e568e

 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;

}