From b95699652357c6218b45eceb81170ddfebb30e1d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jul 2022 16:06:25 +0800
Subject: [PATCH] fix conflect

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/IArticleService.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/IArticleService.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/IArticleService.java
index 1113a5e..81c3cd5 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/IArticleService.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/IArticleService.java
@@ -29,4 +29,5 @@
     Result updateIstop(Long id);
 
     Result updateIstopOff(Long id);
+
 }

--
Gitblit v1.9.1