Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2024-01-31 855712e41283375ad2a19544bcb7f069a0d389a2

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

@@ -18,7 +18,7 @@
 * @since 2023-06-29
 */
@Data
public class UserPointsMerchandise{
public class UserPointsMerchandise {


    private static final long serialVersionUID = 1L;
@@ -94,9 +94,6 @@
     */
    @TableField("state")
    private Integer state;





}