Merge remote-tracking branch 'origin/master'

44323

2023-10-11 f7e51fc7c91e474e5c0bcc79c47f074c0a59b5c3

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

@@ -22,7 +22,7 @@
     */
    private Long id;
    /**
     * 优惠券id
     * 商品id
     */
    private Integer pointsMerchandiseId;
    /**
@@ -69,7 +69,10 @@
     * 可使用的门店id
     */
    private Integer storeId;

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


}