From af27c7e07d7717d25ef06d4a4ae9e56ea184116a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 09 九月 2023 14:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm

---
 src/main/java/com/zy/crm/system/entity/User.java |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/crm/system/entity/User.java b/src/main/java/com/zy/crm/system/entity/User.java
index 9ddf617..1218904 100644
--- a/src/main/java/com/zy/crm/system/entity/User.java
+++ b/src/main/java/com/zy/crm/system/entity/User.java
@@ -264,6 +264,4 @@
     public void setStatus(Integer status) {
         this.status = status;
     }
-
-
 }

--
Gitblit v1.9.1