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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

 cloud-server-activity/src/main/java/com/dsh/activity/entity/PointsMerchandiseStore.java

@@ -37,6 +37,8 @@
     */
    @TableField("pointsMerchandiseId")
    private Integer pointsMerchandiseId;
    @TableField("siteId")
    private Integer siteId;
    /**
     * 门店id
     */