Merge remote-tracking branch 'origin/master'

liujie

2023-10-10 cd45ac2fa0097de2fd9bf637fc5a23593be1aef0

 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java

@@ -69,7 +69,10 @@
     * 可使用的门店id
     */
    private Integer storeId;

    /**
     * 1=正常 2= 删除
     */
    private Integer state;


}