From 055fb8d085efd7e120d69aba6c0fbb8db5867553 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 14:37:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigCategory.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigCategory.java b/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigCategory.java
index 4746191..fd3d56d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigCategory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigCategory.java
@@ -31,6 +31,7 @@
 		maskControl("閬僵鎺у埗"), 
 		guanXuan("瀹樺浠诲姟"), 
 		specialHelper("灏忓姪鎵�"), 
+		article("瀛﹂櫌鐩稿叧"), 
 		extract("鎻愮幇鐩稿叧");
 
 		private final String desc;

--
Gitblit v1.8.0