合并代码

Pu Zhibing

2024-09-24 a736a3d09dd52bb81fa922861fc8938c8eb26550

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