Merge branch '1.0-bug' of http://120.76.84.145:10101/gitblit/r/java/PlayPai...

puzhibing

2024-02-22 11f6d2627ce8eb37c6460892509460b0e19e5656

 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;





}