Merge remote-tracking branch 'origin/master'

puzhibing

2023-07-26 b4f51073e4a5ac0fc14a2087af339cd39e267f0d

 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;

}