From 135aeb3706b445d6d1a937168a0fe781cf3060a8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 14:47:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java
index 8ca1f39..c86181f 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java
+++ b/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;
-
-
-
}
--
Gitblit v1.7.1