From 417e33605dda0f28366a1d6e13c41198a156e3a7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 16:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Activity.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Activity.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Activity.java
index a33d203..7b2e0b8 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Activity.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Activity.java
@@ -166,7 +166,6 @@
     @TableField(exist = false)
     private Integer zanCount;
 
-
     @ApiModelProperty(value = "鏄惁鐐硅禐锛�0=鍚︼紱1=鏄�")
     @TableField(exist = false)
     private Integer zanStatus;

--
Gitblit v1.9.3