Merge remote-tracking branch 'origin/master'

nickchange

2023-10-17 3f2e0142a6db9720f6429848840ac6b214a1cd1b

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

@@ -93,6 +93,11 @@
     */
    @TableField("storeId")
    private Integer storeId;
    /**
     * 1=正常 2=删除
     */
    @TableField("state")
    private Integer state;


    @Override