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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 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
     */