合并代码

puzhibing

2024-03-04 31ee7996a480adb1b284bd75ea59903a9a2b8a86

 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;





}