From ed4113968cf9d5a2c1e6a618ef375e18122a3b29 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Thu, 25 Mar 2021 09:36:22 +0800
Subject: [PATCH 01/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=B9=BF=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdvertisementController.java   |  31 +-
 .../content/exception/BusinessException.java  |  20 +
 .../content/exception/ParameterException.java |  20 +
 .../mapper/CmsArticleAdInfoMapper.java        |   2 +
 .../com/ruoyi/content/redis/RedisManager.java | 784 ++++++++++++++++++
 .../service/ICmsArticleAdInfoService.java     |   3 +-
 .../impl/CmsArticleAdInfoServiceImpl.java     |  51 +-
 .../com/ruoyi/content/utils/JsonUtil.java     | 291 +++++++
 .../content/utils/ObjectMappingCustomer.java  |  33 +
 .../mapper/content/CmsArticleAdInfoMapper.xml | 118 ++-
 .../templates/content/adverts/add.html        |  24 +-
 .../templates/content/adverts/adverts.html    | 111 +--
 .../templates/content/adverts/edit.html       | 274 +++---
 13 files changed, 1526 insertions(+), 236 deletions(-)
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/exception/BusinessException.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/exception/ParameterException.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/redis/RedisManager.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/JsonUtil.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/ObjectMappingCustomer.java

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java
index 5e514be86..4d1dc1447 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java
@@ -1,22 +1,21 @@
 package com.ruoyi.content.controller;
 
-import java.util.List;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.content.domain.CmsArticleAdInfo;
+import com.ruoyi.content.service.ICmsArticleAdInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.content.domain.CmsArticleAdInfo;
-import com.ruoyi.content.service.ICmsArticleAdInfoService;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * 文章广告Controller
  *
@@ -72,7 +71,7 @@ public class AdvertisementController extends BaseController {
      * 新增保存文章广告
      */
     @Log(title = "文章广告", businessType = BusinessType.INSERT)
-    @RequestMapping("/add")
+    @PostMapping("/add")
     @ResponseBody
     public AjaxResult addSave(@RequestParam("addImg") MultipartFile[] files, CmsArticleAdInfo cmsArticleAdInfo) {
         MultipartFile file = files[0];
@@ -95,8 +94,12 @@ public class AdvertisementController extends BaseController {
     @Log(title = "文章广告", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(CmsArticleAdInfo cmsArticleAdInfo) {
-        return toAjax(cmsArticleAdInfoService.updateCmsArticleAdInfo(cmsArticleAdInfo));
+    public AjaxResult editSave(@RequestParam("addImg") MultipartFile[] files, CmsArticleAdInfo cmsArticleAdInfo) {
+        MultipartFile file = null;
+        if (files != null && files.length > 0) {
+            file = files[0];
+        }
+        return toAjax(cmsArticleAdInfoService.updateCmsArticleAdInfo(file, cmsArticleAdInfo));
     }
 
     /**
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/exception/BusinessException.java b/ruoyi-content/src/main/java/com/ruoyi/content/exception/BusinessException.java
new file mode 100644
index 000000000..bff35ff0c
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/exception/BusinessException.java
@@ -0,0 +1,20 @@
+package com.ruoyi.content.exception;
+
+/**
+ * 业务异常
+ *
+ * @author zhanghe
+ */
+public class BusinessException extends RuntimeException {
+
+    private static final long serialVersionUID = -717870860504034613L;
+
+    public BusinessException(String message) {
+        super(message);
+    }
+
+    public BusinessException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/exception/ParameterException.java b/ruoyi-content/src/main/java/com/ruoyi/content/exception/ParameterException.java
new file mode 100644
index 000000000..40cfae381
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/exception/ParameterException.java
@@ -0,0 +1,20 @@
+package com.ruoyi.content.exception;
+
+/**
+ * 参数异常
+ * 
+ * @author zhanghe
+ *
+ */
+public class ParameterException extends RuntimeException {
+
+	private static final long serialVersionUID = -796008340044578794L;
+
+	public ParameterException(String message) {
+		super(message);
+	}
+
+	public ParameterException(String message, Throwable cause) {
+		super(message, cause);
+	}
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java
index f3af767b5..d0771ad14 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsArticleAdInfoMapper.java
@@ -61,4 +61,6 @@ public interface CmsArticleAdInfoMapper {
      * @return 结果
      */
     public int deleteCmsArticleAdInfoByIds(String[] adIds);
+
+    CmsArticleAdInfo selectByPrimaryKey(Integer adId);
 }
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/redis/RedisManager.java b/ruoyi-content/src/main/java/com/ruoyi/content/redis/RedisManager.java
new file mode 100644
index 000000000..f0bf02ff1
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/redis/RedisManager.java
@@ -0,0 +1,784 @@
+package com.ruoyi.content.redis;
+
+import com.ruoyi.content.exception.ParameterException;
+import com.ruoyi.content.utils.JsonUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.core.BoundValueOperations;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.io.UnsupportedEncodingException;
+import java.util.*;
+
+/**
+ * redis操作类
+ *
+ * @author Administrator
+ */
+@Component
+public class RedisManager {
+
+    private final static Logger logger = LoggerFactory.getLogger(RedisManager.class);
+
+    private static String DEFAULT_CHARSET = "UTF-8";
+
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+    /**
+     * 获取过期时间
+     *
+     * @param key
+     * @return
+     */
+    public long ttl(String key) {
+        return redisTemplate.getExpire(key);
+    }
+
+    /**
+     * 存放set集合
+     *
+     * @param key   存放key
+     * @param value 存放集合内容（字符串数组）
+     */
+    public Long saveSet(String key, String... value) {
+        try {
+
+            return redisTemplate.opsForSet().add(key, value);
+        } catch (Exception e) {
+            logger.info("操作redis的saveSet方法出现异常！");
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    /**
+     * 存放Zset集合
+     *
+     * @param key   存放key
+     * @param value 存放集合内容（字符串数组）
+     */
+    public boolean saveZSet(String key, String value) {
+        try {
+            double score = System.currentTimeMillis();
+            return redisTemplate.opsForZSet().add(key, value, score);
+        } catch (Exception e) {
+            logger.info("操作redis的savezSet方法出现异常！");
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * 删除在Redis中的值
+     *
+     * @param key   存放key
+     * @param value 要删除的set集合中的值
+     * @return
+     */
+    public Long deleteSet(String key, String value) {
+        try {
+            return redisTemplate.opsForSet().remove(key, value);
+        } catch (Exception e) {
+            logger.info("操作redis的deleteSet方法出现异常！");
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    /**
+     * 删除在Redis中的值
+     *
+     * @param key   存放key
+     * @param value 要删除的set集合中的值
+     * @return
+     */
+    public Long deleteZSet(String key, String value) {
+        try {
+            return redisTemplate.opsForZSet().remove(key, value);
+        } catch (Exception e) {
+            logger.info("操作redis的deleteSet方法出现异常！");
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    /**
+     * 获取存放在redis中的set集合
+     *
+     * @param key 存放key
+     * @return
+     */
+    public Set<String> querySet(String key) {
+        try {
+            return redisTemplate.opsForSet().members(key);
+        } catch (Exception e) {
+            logger.info("操作redis的querySet方法出现异常！");
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取存放在redis中的ZSet集合
+     *
+     * @param key    存放key
+     * @param min    最小分
+     * @param max    最大分
+     * @param offset 开始坐标
+     * @param count  显示长度
+     * @return
+     */
+    public Set<String> queryZSet(String key, double min, double max, long offset, long count) {
+        try {
+            return redisTemplate.opsForZSet().rangeByScore(key, min, max, offset, count);
+        } catch (Exception e) {
+            logger.info("操作redis的querySet方法出现异常！");
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 倒序获取存放在redis中的ZSet集合
+     *
+     * @param key    存放key
+     * @param min    最小分
+     * @param max    最大分
+     * @param offset 开始坐标
+     * @param count  显示长度
+     * @return
+     */
+    public Set<String> reverseQueryZSet(String key, double min, double max, long offset, long count) {
+        try {
+            return redisTemplate.opsForZSet().reverseRangeByScore(key, min, max, offset, count);
+        } catch (Exception e) {
+            logger.info("操作redis的querySet方法出现异常！");
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取存放在redis中的zSet集合的成员数
+     *
+     * @param key 存放key
+     * @return
+     */
+    public Long zSetCount(String key) {
+        try {
+            return redisTemplate.opsForZSet().size(key);
+        } catch (Exception e) {
+            logger.info("操作redis的zSetCount方法出现异常！");
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 存放信息,支持覆盖
+     *
+     * @param key   存放key
+     * @param value 存放值
+     * @return
+     */
+    public boolean save(String key, String value) {
+        return save(key, value, 0);
+    }
+
+    /**
+     * 存放信息,支持覆盖
+     *
+     * @param key   存放key
+     * @param value 存放值
+     * @param time  过期时间，单位秒
+     * @return
+     */
+    public boolean save(String key, String value, long time) {
+        byte[] values = null;
+        try {
+            values = value.getBytes(DEFAULT_CHARSET);
+        } catch (UnsupportedEncodingException e) {
+            logger.info("保存时，value转换utf-8编码异常，key【{}】，value【{}】", key, value);
+            throw new ParameterException("保存时，value转换utf-8编码异常，key{" + key + "}，value{" + value + "}");
+        }
+        return save(key.getBytes(), values, time);
+    }
+
+    /**
+     * 存放信息,支持覆盖、过期时间
+     *
+     * @param key   存放key
+     * @param value 存放值
+     * @param time  过期时间,单位秒
+     * @return
+     */
+    public boolean save(final byte[] key, final byte[] value, final long time) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Boolean>() {
+                public Boolean doInRedis(RedisConnection connection) throws DataAccessException {
+                    connection.set(key, value);
+                    if (time > 0) {
+                        connection.expire(key, time);
+                    }
+                    return true;
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的save方法出现异常！");
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * 获取存放在redis中的值
+     *
+     * @param key 存放key
+     * @return
+     */
+    public String query(String key) {
+        byte[] value = qurey(key.getBytes());
+        if (value == null) {
+            logger.info("根据【{}】获取值【{}】", key, value);
+            return "";
+        } else {
+            try {
+                return new String(value, DEFAULT_CHARSET);
+            } catch (UnsupportedEncodingException e) {
+                logger.info("操作Redis的query方法出现异常！，value转换utf-8编码异常，key【{}】，value【{}】", key, value);
+                return "";
+            }
+        }
+    }
+
+    /**
+     * 获取存放在redis中的值
+     *
+     * @param key 存放key
+     * @return
+     */
+    public byte[] qurey(final byte[] key) {
+        try {
+            return redisTemplate.execute(new RedisCallback<byte[]>() {
+                @Override
+                public byte[] doInRedis(RedisConnection connection) throws DataAccessException {
+                    return connection.get(key);
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的qurey方法出现异常！");
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取与字段中存储的键哈希相关联的值
+     *
+     * @param key
+     * @param field
+     * @return
+     */
+    public String hQuery(String key, String field) {
+        try {
+            return redisTemplate.execute(new RedisCallback<String>() {
+                @Override
+                public String doInRedis(RedisConnection connection) throws DataAccessException {
+                    byte[] value = connection.hGet(key.getBytes(), field.getBytes());
+                    return value.toString();
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的queryKeys方法出现异常！");
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    /**
+     * 查询匹配的所有KEY
+     *
+     * @param pattern
+     * @return
+     */
+    public List<String> queryKeys(String pattern) {
+        try {
+            return redisTemplate.execute(new RedisCallback<List<String>>() {
+                @Override
+                public List<String> doInRedis(RedisConnection connection) throws DataAccessException {
+                    Set<byte[]> value = connection.keys(pattern.getBytes());
+                    if (value != null && !value.isEmpty()) {
+                        List<String> values = new ArrayList<String>();
+                        for (byte[] v : value) {
+                            try {
+                                values.add(new String(v, DEFAULT_CHARSET));
+                            } catch (UnsupportedEncodingException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        return values;
+                    }
+                    return null;
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的queryKeys方法出现异常！");
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 判断键值是否存在
+     *
+     * @param key
+     * @return
+     */
+    public boolean exists(String key) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Boolean>() {
+                public Boolean doInRedis(RedisConnection connection) throws DataAccessException {
+                    return connection.exists(key.getBytes());
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的exists方法出现异常！");
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * 判断键值是否存在
+     *
+     * @param key
+     * @return
+     */
+    public boolean exists(final byte[] key) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Boolean>() {
+                public Boolean doInRedis(RedisConnection connection) throws DataAccessException {
+                    return connection.exists(key);
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的exists方法出现异常！");
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * 模糊查詢所有的key,模糊查询 (key*)
+     *
+     * @param keys
+     * @return
+     */
+    public Set<byte[]> queryByVague(final String keys) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Set<byte[]>>() {
+                @Override
+                public Set<byte[]> doInRedis(RedisConnection connection) throws DataAccessException {
+                    return connection.keys(keys.getBytes());
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的queryByVague方法出现异常！");
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 删除在redis中的值
+     *
+     * @param key 存放key
+     * @return
+     */
+    public Long delete(final String key) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Long>() {
+                @Override
+                public Long doInRedis(RedisConnection connection) throws DataAccessException {
+                    return connection.del(key.getBytes());
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的delete方法出现异常！");
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    /**
+     * 删除在redis中的值
+     *
+     * @param key 存放key
+     * @return
+     */
+    public Long delete(final byte[] key) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Long>() {
+                @Override
+                public Long doInRedis(RedisConnection connection) throws DataAccessException {
+                    return connection.del(key);
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的delete方法出现异常！");
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    /**
+     * 删除在redis中的值
+     *
+     * @param keys 存放key
+     * @return
+     */
+    public Long delete(final Set<byte[]> keys) {
+        long count = 0;
+        for (byte[] key : keys) {
+            count = count + delete(key);
+        }
+        return count;
+    }
+
+    /**
+     * 增量获取redis中的值,支持数字
+     *
+     * @param key            存放key
+     * @param incrementValue 增量值
+     * @return
+     */
+    public Long increment(String key, long incrementValue) {
+        try {
+            BoundValueOperations<String, String> bo = redisTemplate.boundValueOps(key);
+            if (bo == null) {
+                return 0L;
+            } else {
+                return bo.increment(incrementValue);
+            }
+        } catch (Exception e) {
+            logger.info("操作Redis的increment方法出现异常！");
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    /**
+     * 增量获取redis中的值,每次增长1
+     *
+     * @param key 存放key
+     * @return
+     */
+    public Long increment(String key) {
+        try {
+            BoundValueOperations<String, String> bo = redisTemplate.boundValueOps(key);
+            if (bo == null) {
+                return 0L;
+            } else {
+                return bo.increment(1);
+            }
+        } catch (Exception e) {
+            logger.info("操作Redis的increment方法出现异常！");
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    /**
+     * 清空redis 所有数据
+     *
+     * @return
+     */
+    public boolean flushDB() {
+        try {
+            return redisTemplate.execute(new RedisCallback<Boolean>() {
+                public Boolean doInRedis(RedisConnection connection) throws DataAccessException {
+                    connection.flushDb();
+                    return true;
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的flushDB方法出现异常！");
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * Redis从List头部存储数据
+     *
+     * @param key
+     * @param value
+     * @return 当前List的长度
+     */
+    public Long lpush(String key, String value) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Long>() {
+                @Override
+                public Long doInRedis(RedisConnection connection) throws DataAccessException {
+                    return connection.lPush(key.getBytes(), value.getBytes());
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的lpush方法出现异常！");
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    /**
+     * Redis从List尾部提取数据
+     *
+     * @param key
+     * @return value
+     */
+    public String rPop(String key) {
+        try {
+            return redisTemplate.execute(new RedisCallback<String>() {
+                @Override
+                public String doInRedis(RedisConnection connection) throws DataAccessException {
+                    byte[] re = connection.rPop(key.getBytes());
+                    String value = "";
+                    if (re != null && re.length > 0) {
+                        try {
+                            value = new String(re, "UTF-8");
+                        } catch (UnsupportedEncodingException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    return value;
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的rPop方法出现异常！");
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    /**
+     * 获取List的长度
+     *
+     * @param key
+     * @return
+     */
+    public Long lLen(String key) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Long>() {
+                @Override
+                public Long doInRedis(RedisConnection connection) throws DataAccessException {
+                    return connection.lLen(key.getBytes());
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的lLen方法出现异常！");
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    /**
+     * 获取存储在哈希表中指定字段的值
+     *
+     * @param key
+     * @param field 哈希表的字段名
+     * @return
+     */
+    public String hGet(String key, String field) {
+        try {
+            return redisTemplate.execute(new RedisCallback<String>() {
+                @Override
+                public String doInRedis(RedisConnection connection) throws DataAccessException {
+                    String result = "";
+                    byte[] values = connection.hGet(key.getBytes(), field.getBytes());
+                    if (values == null) {
+                        return result;
+                    } else {
+                        try {
+                            result = new String(values, DEFAULT_CHARSET);
+                        } catch (UnsupportedEncodingException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                    return result;
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的hGet方法出现异常！");
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    /**
+     * 存储在哈希表中指定字段的值加上增量
+     *
+     * @param key
+     * @param field 哈希表的字段名
+     * @param delta 增量
+     * @return
+     */
+    public Long updateHset(String key, String field, Long delta) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Long>() {
+                @Override
+                public Long doInRedis(RedisConnection connection) throws DataAccessException {
+                    Long hLong = 0L;
+                    try {
+                        hLong = connection.hIncrBy(key.getBytes(), field.getBytes(DEFAULT_CHARSET), delta);
+                    } catch (UnsupportedEncodingException e) {
+                        // TODO Auto-generated catch block
+                        e.printStackTrace();
+                    }
+                    return hLong;
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的updateHset方法出现异常！");
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+    /**
+     * 获取在哈希表中指定 KEY的所有字段和值
+     *
+     * @param key
+     * @return
+     */
+    public Map<String, String> hGetAll(String key) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Map<String, String>>() {
+                @Override
+                public Map<String, String> doInRedis(RedisConnection connection) throws DataAccessException {
+                    Map<byte[], byte[]> values = connection.hGetAll(key.getBytes());
+                    Map<String, String> map = new HashMap<String, String>();
+                    if (values != null && !values.isEmpty()) {
+                        Set<byte[]> keys = values.keySet();
+                        if (keys != null && !keys.isEmpty()) {
+                            for (byte[] key : keys) {
+                                try {
+                                    map.put(new String(key, DEFAULT_CHARSET), new String(values.get(key), DEFAULT_CHARSET));
+                                } catch (UnsupportedEncodingException e) {
+                                    e.printStackTrace();
+                                }
+                            }
+                        }
+                    }
+                    logger.info("Redis提取哈希表, key【{}】, value【{}】", key, JsonUtil.objectToJackson(map));
+                    return map;
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的hGetAll方法出现异常！");
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 将哈希表 key 中的字段 field 的值设为 value
+     *
+     * @param key   键
+     * @param field 哈希的字段名
+     * @param value 哈希的值
+     * @return
+     */
+    public Boolean hSet(String key, String field, String value, Long time) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Boolean>() {
+                @Override
+                public Boolean doInRedis(RedisConnection connection) throws DataAccessException {
+                    try {
+                        connection.hSet(key.getBytes(), field.getBytes(DEFAULT_CHARSET), value.getBytes(DEFAULT_CHARSET));
+                        if (time > 0) {
+                            connection.expire(key.getBytes(), time);
+                        }
+                        return true;
+                    } catch (UnsupportedEncodingException e) {
+                        e.printStackTrace();
+                    }
+                    return false;
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的hSet方法出现异常！");
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * 同时将多个 field-value (域-值)对设置到哈希表 key 中
+     *
+     * @param key
+     * @param map
+     * @return
+     */
+    public Boolean hMSet(String key, Map<String, String> map, long time) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Boolean>() {
+                public Boolean doInRedis(RedisConnection connection) throws DataAccessException {
+                    Boolean result = false;
+                    try {
+                        Map<byte[], byte[]> hashes = new HashMap<byte[], byte[]>();
+                        if (map != null && !map.isEmpty()) {
+                            Set<String> setKeys = map.keySet();
+                            if (setKeys != null && !setKeys.isEmpty()) {
+                                for (String skey : setKeys) {
+                                    hashes.put(skey.getBytes(DEFAULT_CHARSET), map.get(skey).getBytes(DEFAULT_CHARSET));
+                                }
+                            }
+                        }
+                        connection.hMSet(key.getBytes(), hashes);
+                        if (time > 0) {
+                            connection.expire(key.getBytes(), time);
+                        }
+                        result = true;
+                    } catch (UnsupportedEncodingException e) {
+                        e.printStackTrace();
+                    }
+                    logger.info("插入哈希表，key【{}】, value【{}】, 操作结果【{}】", key, JsonUtil.objectToJackson(map), result);
+                    return result;
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的hMSet方法出现异常！");
+            e.printStackTrace();
+        }
+        return false;
+    }
+
+    /**
+     * 删除一个哈希表字段
+     *
+     * @param key
+     * @param field 哈希表字段
+     * @return
+     */
+    public Long hDel(String key, String field) {
+        try {
+            return redisTemplate.execute(new RedisCallback<Long>() {
+                @Override
+                public Long doInRedis(RedisConnection connection) throws DataAccessException {
+                    return connection.hDel(key.getBytes(), field.getBytes());
+                }
+            });
+        } catch (Exception e) {
+            logger.info("操作Redis的hDel方法出现异常！");
+            e.printStackTrace();
+        }
+        return 0L;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java
index 3ec547fc5..2246f7991 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java
@@ -40,10 +40,11 @@ public interface ICmsArticleAdInfoService {
     /**
      * 修改文章广告
      *
+     * @param file 广告图片
      * @param cmsArticleAdInfo 文章广告
      * @return 结果
      */
-    public int updateCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo);
+    public int updateCmsArticleAdInfo(MultipartFile file, CmsArticleAdInfo cmsArticleAdInfo);
 
     /**
      * 批量删除文章广告
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
index b3f2f3b67..4e58f9c17 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.content.constants.PropertiesConstants;
 import com.ruoyi.content.domain.CmsArticleAdInfo;
 import com.ruoyi.content.mapper.CmsArticleAdInfoMapper;
+import com.ruoyi.content.redis.RedisManager;
 import com.ruoyi.content.service.ICmsArticleAdInfoService;
 import com.ruoyi.content.utils.OSSUtil;
 import org.slf4j.Logger;
@@ -29,6 +30,8 @@ public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService {
 
     @Autowired
     private CmsArticleAdInfoMapper cmsArticleAdInfoMapper;
+    @Autowired
+    private RedisManager redisManager;
 
     /**
      * 查询文章广告
@@ -99,13 +102,44 @@ public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService {
     /**
      * 修改文章广告
      *
+     * @param file             广告图片
      * @param cmsArticleAdInfo 文章广告
      * @return 结果
      */
     @Override
-    public int updateCmsArticleAdInfo(CmsArticleAdInfo cmsArticleAdInfo) {
-        cmsArticleAdInfo.setUpdateTime(DateUtils.getDate());
-        return cmsArticleAdInfoMapper.updateCmsArticleAdInfo(cmsArticleAdInfo);
+    public int updateCmsArticleAdInfo(MultipartFile file, CmsArticleAdInfo cmsArticleAdInfo) {
+        if (!file.isEmpty()) {
+            String fileName = file.getOriginalFilename();// 文件名
+            String ext = fileName.substring(fileName.lastIndexOf("."), fileName.length());// 文件后缀
+            String fileTime = DateUtils.getMillisecond();
+            fileName = PropertiesConstants.AD_IMG_PATH + fileTime + ext;// OSS保存路径
+            String flag = null;
+            try {
+                flag = OSSUtil.uploadFileByInputStream(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID, PropertiesConstants.OSSKEY,
+                        PropertiesConstants.BUCKETNAME, file.getInputStream(), PropertiesConstants.OSSPATH + fileName);
+            } catch (IOException e) {
+                LOGGER.error("上传阿里云失败！", e);
+            }
+            if (null == flag || flag.equals("false")) {
+                LOGGER.info("广告图片上传oss失败");
+                return 0;
+            } else {
+                cmsArticleAdInfo.setAdImageUrl(PropertiesConstants.OSS_URL + PropertiesConstants.OSSPATH + fileName);
+            }
+        }
+        String date = DateUtils.getDate();
+        String time = DateUtils.getTimeNow();
+        cmsArticleAdInfo.setAdLinkUrl(cmsArticleAdInfo.getAdLinkUrl() + "(");
+        cmsArticleAdInfo.setUpdateDate(date);
+        cmsArticleAdInfo.setUpdateTime(time);
+        cmsArticleAdInfo.setUpdateUser("company");
+        if (cmsArticleAdInfoMapper.updateCmsArticleAdInfo(cmsArticleAdInfo) > 0) {
+            redisManager.delete("articleAdInfo_id" + cmsArticleAdInfo.getAdId());
+        } else {
+            LOGGER.info("编辑广告失败");
+            return 0;
+        }
+        return 1;
     }
 
     /**
@@ -116,7 +150,16 @@ public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService {
      */
     @Override
     public int deleteCmsArticleAdInfoByIds(String ids) {
-        return cmsArticleAdInfoMapper.deleteCmsArticleAdInfoByIds(Convert.toStrArray(ids));
+        String[] arrId = ids.split(",");
+        for (String id : arrId) {
+            CmsArticleAdInfo delType = cmsArticleAdInfoMapper.selectByPrimaryKey(Integer.valueOf(id));
+            if (delType != null) {
+                redisManager.delete("articleAdInfo_id" + id);
+                redisManager.delete("article_ad_typeList_" + delType.getAdType());
+                cmsArticleAdInfoMapper.deleteCmsArticleAdInfoById(Long.valueOf(id));
+            }
+        }
+        return 1;
     }
 
     /**
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/JsonUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/JsonUtil.java
new file mode 100644
index 000000000..292e6051c
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/JsonUtil.java
@@ -0,0 +1,291 @@
+package com.ruoyi.content.utils;
+
+import com.fasterxml.jackson.annotation.JsonFilter;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.core.JsonParser.Feature;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.ser.FilterProvider;
+import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
+import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.exception.ParameterException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+public class JsonUtil {
+
+    private final static Logger logger = LoggerFactory.getLogger(JsonUtil.class);
+
+    private static ObjectMapper jacksonMapper = new ObjectMapper();
+
+    /**
+     * 把json字符串转换为JavaBean (1)普通对象转换：toJson(Student) (2)List转换：toJson(List)
+     * (3)Map转换:toJson(Map) 我们发现不管什么类型，都可以直接传入这个方法
+     * <p>
+     * /** 将Object对象转换成json串，原始方法
+     *
+     * @param object Java对象
+     * @return
+     */
+    public static String objectToJson(Object object) {
+        try {
+            if (jacksonMapper == null) {
+                jacksonMapper = new ObjectMapper();
+            }
+            return jacksonMapper.writeValueAsString(object);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 将Object对象转换成json串，把null换成""
+     *
+     * @param object Java对象
+     * @return
+     */
+    public static String objectToJackson(Object object) {
+        ObjectMappingCustomer jacksonMapper = new ObjectMappingCustomer();
+        try {
+            return jacksonMapper.writeValueAsString(object);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 将Object对象转换成json串，自动去掉null和""的字段
+     *
+     * @param object
+     * @return
+     */
+    public static String objectToJacksonNotNull(Object object) {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setSerializationInclusion(Include.NON_NULL);
+        try {
+            return jacksonMapper.writeValueAsString(object);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 把json字符串转换为JavaBean对象
+     *
+     * @param json   字符串
+     * @param object Java对象类型
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T jackson2Object(String json, Class<?> object) {
+        T t = null;
+        if (jacksonMapper == null) {
+            jacksonMapper = new ObjectMapper();
+        }
+        try {
+            jacksonMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+            t = (T) jacksonMapper.readValue(json, object);
+        } catch (JsonParseException e) {
+            logger.error("把json字符串转换为JavaBean对象异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("jackson转化对象失败");
+        } catch (JsonMappingException e) {
+            logger.error("把json字符串转换为JavaBean对象异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("jackson转化对象失败");
+        } catch (IOException e) {
+            logger.error("把json字符串转换为JavaBean对象异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("jackson转化对象失败");
+        }
+        return t;
+    }
+
+    /**
+     * 把Json转成Map
+     *
+     * @param json JSON字符串
+     * @return
+     */
+    @SuppressWarnings("rawtypes")
+    public static Map jackson2Map(String json) {
+        if (jacksonMapper == null) {
+            jacksonMapper = new ObjectMapper();
+        }
+        try {
+            jacksonMapper.configure(Feature.ALLOW_SINGLE_QUOTES, true);
+            jacksonMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+            return jacksonMapper.readValue(json, Map.class);
+        } catch (JsonParseException e) {
+            logger.error("把Json转成Map异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("把Json转成Map失败");
+        } catch (JsonMappingException e) {
+            logger.error("把Json转成Map异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("把Json转成Map失败");
+        } catch (IOException e) {
+            logger.error("把Json转成Map异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("把Json转成Map失败");
+        }
+    }
+
+    /**
+     * 转换集合对象
+     *
+     * @param json json数据
+     * @param obj  java对象类型
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T JsonToList(String json, Class<?> obj) {
+        if (jacksonMapper == null) {
+            jacksonMapper = new ObjectMapper();
+        }
+        List<T> lst = null;
+        try {
+            jacksonMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+            lst = (List<T>) jacksonMapper.readValue(json, getCollectionType(List.class, obj));
+        } catch (JsonParseException e) {
+            logger.error("转换集合对象异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("转换集合对象失败");
+        } catch (JsonMappingException e) {
+            logger.error("转换集合对象异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("转换集合对象失败");
+        } catch (IOException e) {
+            logger.error("转换集合对象异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("转换集合对象失败");
+        }
+        return (T) lst;
+    }
+
+    /**
+     * 转换集合对象
+     *
+     * @param json
+     * @param objectList 集合类型
+     * @param obj        java对象类型
+     * @return
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T JsonToCollectionType(String json, Class<?> objectList, Class<?> obj) {
+        if (jacksonMapper == null) {
+            jacksonMapper = new ObjectMapper();
+        }
+        List<T> lst = null;
+        try {
+            jacksonMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
+            lst = (List<T>) jacksonMapper.readValue(json, getCollectionType(objectList, obj));
+        } catch (JsonParseException e) {
+            logger.error("转换集合对象异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("转换集合对象失败");
+        } catch (JsonMappingException e) {
+            logger.error("转换集合对象异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("转换集合对象失败");
+        } catch (IOException e) {
+            logger.error("转换集合对象异常", e);
+            logger.info("传入JSON：" + json);
+            throw new ParameterException("转换集合对象失败");
+        }
+        return (T) lst;
+    }
+
+    /**
+     * 获取泛型的Collection Type
+     *
+     * @param collectionClass 泛型的Collection
+     * @param elementClasses  元素类
+     * @return JavaType Java类型
+     * @since 1.0
+     */
+    public static JavaType getCollectionType(Class<?> collectionClass, Class<?>... elementClasses) {
+        if (jacksonMapper == null) {
+            jacksonMapper = new ObjectMapper();
+        }
+        return jacksonMapper.getTypeFactory().constructParametricType(collectionClass, elementClasses);
+    }
+
+    /**
+     * 方法json节点
+     *
+     * @return
+     * @throws Exception
+     */
+    public static JsonNode createJsonNode() throws Exception {
+        if (jacksonMapper == null) {
+            jacksonMapper = new ObjectMapper();
+        }
+        return jacksonMapper.createObjectNode();
+    }
+
+    /**
+     * 方法json节点
+     *
+     * @param data
+     * @return
+     * @throws IOException
+     * @throws @throws     Exception
+     */
+    public static JsonNode getJsonNode(String data) throws IOException {
+        if (jacksonMapper == null) {
+            jacksonMapper = new ObjectMapper();
+        }
+        return jacksonMapper.readTree(data);
+    }
+
+    /**
+     * 对象转换位Json
+     *
+     * @param object
+     * @param properties
+     * @return
+     * @throws BusinessException
+     */
+    public static String objectToJackson(Object object, Set<String> properties) throws BusinessException {
+        ObjectMapper mapper = new ObjectMapper();
+        FilterProvider filters = new SimpleFilterProvider().addFilter("headFilter",
+                SimpleBeanPropertyFilter.serializeAllExcept(properties));
+        mapper.setFilterProvider(filters);
+        mapper.addMixIn(object.getClass(), HeadFilterMixIn.class);
+        try {
+            return mapper.writeValueAsString(object);
+        } catch (JsonProcessingException ex) {
+            throw new BusinessException("jackson转化异常");
+        }
+    }
+
+    public static String jsonNode2String(Map<String, String> map) throws IOException {
+        if (jacksonMapper == null) {
+            jacksonMapper = new ObjectMapper();
+        }
+        JsonNodeFactory factory = new JsonNodeFactory(false);
+        ObjectNode objectNode = factory.objectNode();
+        for (Entry<String, String> entry : map.entrySet()) {
+            objectNode.put(entry.getKey(), entry.getValue());
+        }
+        return jacksonMapper.writeValueAsString(objectNode);
+    }
+
+    @JsonFilter("headFilter")
+    private static interface HeadFilterMixIn {
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/ObjectMappingCustomer.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/ObjectMappingCustomer.java
new file mode 100644
index 000000000..dfa0d9777
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/ObjectMappingCustomer.java
@@ -0,0 +1,33 @@
+package com.ruoyi.content.utils;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+
+/**
+ * Jackson处理类，处理null字符串
+ *
+ * @author zhanghe
+ */
+public class ObjectMappingCustomer extends ObjectMapper {
+
+    private static final long serialVersionUID = -1066355039918898238L;
+
+    public ObjectMappingCustomer() {
+        super();
+        // 空值处理为空串
+        this.getSerializerProvider().setNullValueSerializer(new JsonSerializer<Object>() {
+            @Override
+            public void serialize(Object value, JsonGenerator jg, SerializerProvider sp)
+                    throws IOException, JsonProcessingException {
+                jg.writeString("");
+
+            }
+        });
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
index c56322d90..0a6b0034f 100644
--- a/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.content.mapper.CmsArticleAdInfoMapper">
-    
+
     <resultMap type="CmsArticleAdInfo" id="CmsArticleAdInfoResult">
-        <result property="adId"    column="AD_ID"    />
-        <result property="companyId"    column="COMPANY_ID"    />
-        <result property="adType"    column="AD_TYPE"    />
-        <result property="adTypeName"    column="AD_TYPE_NAME"    />
-        <result property="adLinkUrl"    column="AD_LINK_URL"    />
-        <result property="adTitle"    column="AD_TITLE"    />
-        <result property="adName"    column="AD_NAME"    />
-        <result property="adSummary"    column="AD_SUMMARY"    />
-        <result property="adColorType"    column="AD_COLOR_TYPE"    />
-        <result property="adImageUrl"    column="AD_IMAGE_URL"    />
-        <result property="adState"    column="AD_STATE"    />
-        <result property="createDate"    column="CREATE_DATE"    />
-        <result property="createTime"    column="CREATE_TIME"    />
-        <result property="createUser"    column="CREATE_USER"    />
-        <result property="updateUser"    column="UPDATE_USER"    />
-        <result property="updateDate"    column="UPDATE_DATE"    />
-        <result property="updateTime"    column="UPDATE_TIME"    />
+        <result property="adId" column="AD_ID"/>
+        <result property="companyId" column="COMPANY_ID"/>
+        <result property="adType" column="AD_TYPE"/>
+        <result property="adTypeName" column="AD_TYPE_NAME"/>
+        <result property="adLinkUrl" column="AD_LINK_URL"/>
+        <result property="adTitle" column="AD_TITLE"/>
+        <result property="adName" column="AD_NAME"/>
+        <result property="adSummary" column="AD_SUMMARY"/>
+        <result property="adColorType" column="AD_COLOR_TYPE"/>
+        <result property="adImageUrl" column="AD_IMAGE_URL"/>
+        <result property="adState" column="AD_STATE"/>
+        <result property="createDate" column="CREATE_DATE"/>
+        <result property="createTime" column="CREATE_TIME"/>
+        <result property="createUser" column="CREATE_USER"/>
+        <result property="updateUser" column="UPDATE_USER"/>
+        <result property="updateDate" column="UPDATE_DATE"/>
+        <result property="updateTime" column="UPDATE_TIME"/>
     </resultMap>
 
     <sql id="selectCmsArticleAdInfoVo">
@@ -30,32 +30,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCmsArticleAdInfoList" parameterType="CmsArticleAdInfo" resultMap="CmsArticleAdInfoResult">
         <include refid="selectCmsArticleAdInfoVo"/>
-        <where>  
-            <if test="companyId != null  and companyId != ''"> and COMPANY_ID = #{companyId}</if>
-            <if test="adType != null  and adType != ''"> and AD_TYPE = #{adType}</if>
-            <if test="adTypeName != null  and adTypeName != ''"> and AD_TYPE_NAME like concat('%', #{adTypeName}, '%')</if>
-            <if test="adLinkUrl != null  and adLinkUrl != ''"> and AD_LINK_URL = #{adLinkUrl}</if>
-            <if test="adTitle != null  and adTitle != ''"> and AD_TITLE like concat('%', #{adTitle}, '%')</if>
-            <if test="adName != null  and adName != ''"> and AD_NAME like concat('%', #{adName}, '%')</if>
-            <if test="adSummary != null  and adSummary != ''"> and AD_SUMMARY = #{adSummary}</if>
-            <if test="adColorType != null  and adColorType != ''"> and AD_COLOR_TYPE = #{adColorType}</if>
-            <if test="adImageUrl != null  and adImageUrl != ''"> and AD_IMAGE_URL = #{adImageUrl}</if>
-            <if test="adState != null  and adState != ''"> and AD_STATE = #{adState}</if>
-            <if test="createDate != null  and createDate != ''"> and CREATE_DATE = #{createDate}</if>
-            <if test="createTime != null  and createTime != ''"> and CREATE_TIME = #{createTime}</if>
-            <if test="createUser != null  and createUser != ''"> and CREATE_USER = #{createUser}</if>
-            <if test="updateUser != null  and updateUser != ''"> and UPDATE_USER = #{updateUser}</if>
-            <if test="updateDate != null  and updateDate != ''"> and UPDATE_DATE = #{updateDate}</if>
-            <if test="updateTime != null  and updateTime != ''"> and UPDATE_TIME = #{updateTime}</if>
+        <where>
+            <if test="companyId != null  and companyId != ''">and COMPANY_ID = #{companyId}</if>
+            <if test="adType != null  and adType != ''">and AD_TYPE = #{adType}</if>
+            <if test="adTypeName != null  and adTypeName != ''">and AD_TYPE_NAME like concat('%', #{adTypeName}, '%')
+            </if>
+            <if test="adLinkUrl != null  and adLinkUrl != ''">and AD_LINK_URL = #{adLinkUrl}</if>
+            <if test="adTitle != null  and adTitle != ''">and AD_TITLE like concat('%', #{adTitle}, '%')</if>
+            <if test="adName != null  and adName != ''">and AD_NAME like concat('%', #{adName}, '%')</if>
+            <if test="adSummary != null  and adSummary != ''">and AD_SUMMARY = #{adSummary}</if>
+            <if test="adColorType != null  and adColorType != ''">and AD_COLOR_TYPE = #{adColorType}</if>
+            <if test="adImageUrl != null  and adImageUrl != ''">and AD_IMAGE_URL = #{adImageUrl}</if>
+            <if test="adState != null  and adState != ''">and AD_STATE = #{adState}</if>
+            <if test="createDate != null  and createDate != ''">and CREATE_DATE = #{createDate}</if>
+            <if test="createTime != null  and createTime != ''">and CREATE_TIME = #{createTime}</if>
+            <if test="createUser != null  and createUser != ''">and CREATE_USER = #{createUser}</if>
+            <if test="updateUser != null  and updateUser != ''">and UPDATE_USER = #{updateUser}</if>
+            <if test="updateDate != null  and updateDate != ''">and UPDATE_DATE = #{updateDate}</if>
+            <if test="updateTime != null  and updateTime != ''">and UPDATE_TIME = #{updateTime}</if>
         </where>
         order by CREATE_DATE DESC,CREATE_TIME DESC, UPDATE_DATE DESC,UPDATE_TIME DESC
     </select>
-    
+
     <select id="selectCmsArticleAdInfoById" parameterType="Long" resultMap="CmsArticleAdInfoResult">
         <include refid="selectCmsArticleAdInfoVo"/>
         where AD_ID = #{adId}
     </select>
-        
+
     <insert id="insertCmsArticleAdInfo" parameterType="CmsArticleAdInfo" useGeneratedKeys="true" keyProperty="adId">
         insert into cms_article_ad_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -75,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateUser != null">UPDATE_USER,</if>
             <if test="updateDate != null">UPDATE_DATE,</if>
             <if test="updateTime != null">UPDATE_TIME,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyId != null">#{companyId},</if>
             <if test="adType != null">#{adType},</if>
@@ -93,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateUser != null">#{updateUser},</if>
             <if test="updateDate != null">#{updateDate},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateCmsArticleAdInfo" parameterType="CmsArticleAdInfo">
@@ -124,10 +125,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteCmsArticleAdInfoByIds" parameterType="String">
-        delete from cms_article_ad_info where AD_ID in 
+        delete from cms_article_ad_info where AD_ID in
         <foreach item="adId" collection="array" open="(" separator="," close=")">
             #{adId}
         </foreach>
     </delete>
 
+    <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.CmsArticleAdInfo">
+        <id column="AD_ID" property="adId" jdbcType="INTEGER"/>
+        <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR"/>
+        <result column="AD_TYPE" property="adType" jdbcType="VARCHAR"/>
+        <result column="AD_TYPE_NAME" property="adTypeName" jdbcType="VARCHAR"/>
+        <result column="AD_LINK_URL" property="adLinkUrl" jdbcType="VARCHAR"/>
+        <result column="AD_TITLE" property="adTitle" jdbcType="VARCHAR"/>
+        <result column="AD_NAME" property="adName" jdbcType="VARCHAR"/>
+        <result column="AD_SUMMARY" property="adSummary" jdbcType="VARCHAR"/>
+        <result column="AD_COLOR_TYPE" property="adColorType" jdbcType="VARCHAR"/>
+        <result column="AD_IMAGE_URL" property="adImageUrl" jdbcType="VARCHAR"/>
+        <result column="AD_STATE" property="adState" jdbcType="VARCHAR"/>
+        <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR"/>
+        <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR"/>
+        <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR"/>
+        <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR"/>
+        <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR"/>
+        <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        AD_ID, COMPANY_ID, AD_TYPE, AD_TYPE_NAME, AD_LINK_URL, AD_TITLE, AD_NAME, AD_SUMMARY,
+        AD_COLOR_TYPE, AD_IMAGE_URL, AD_STATE, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER,
+        UPDATE_DATE, UPDATE_TIME
+    </sql>
+
+    <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
+        select
+        <include refid="Base_Column_List"/>
+        from article_ad_info
+        where AD_ID = #{adId,jdbcType=INTEGER}
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/add.html b/ruoyi-content/src/main/resources/templates/content/adverts/add.html
index eb6cb0e26..823093020 100644
--- a/ruoyi-content/src/main/resources/templates/content/adverts/add.html
+++ b/ruoyi-content/src/main/resources/templates/content/adverts/add.html
@@ -98,18 +98,18 @@
         }
 
         var fileoptions = {
-            showUpload : false,
-            showRemove : true,
-            language : 'zh',
-            allowedPreviewTypes : [ 'image' ],
-            allowedFileExtensions : [ 'jpg', 'png', 'gif' ],
-            maxFileSize : 0,
-            autoReplace : true,// 是否自动替换图片
-            uploadAsync : false,// 异步上传
-            maxFileCount : 1,
-            maxFilesNum : 1,
-            dropZoneEnabled : false,
-            showPreview : true,
+            showUpload: false,
+            showRemove: true,
+            language: 'zh',
+            allowedPreviewTypes: ['image'],
+            allowedFileExtensions: ['jpg', 'png', 'gif'],
+            maxFileSize: 0,
+            autoReplace: true,// 是否自动替换图片
+            uploadAsync: false,// 异步上传
+            maxFileCount: 1,
+            maxFilesNum: 1,
+            dropZoneEnabled: false,
+            showPreview: true,
             msgUploadThreshold : '上传中',
             msgUploadEnd : '完成'
         }
diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html
index 1c702ea07..669943484 100644
--- a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html
+++ b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('文章广告列表')" />
+    <th:block th:include="include :: header('文章广告列表')"/>
 </head>
 <style>
     .article-table-img {
@@ -10,6 +10,7 @@
         display: block;
         border-style: none;
     }
+
     .article-color {
         width: 40px;
         height: 40px;
@@ -18,53 +19,55 @@
     }
 </style>
 <body class="gray-bg">
-     <div class="container-div">
-        <div class="row">
-            <div class="col-sm-12 search-collapse">
-                <form id="formId">
-                    <div class="select-list">
-                        <ul>
-                            <li>
-                                <label>广告标题：</label>
-                                <input type="text" name="adTitle"/>
-                            </li>
-                            <li>
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-                            </li>
-                        </ul>
-                    </div>
-                </form>
-            </div>
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>广告标题：</label>
+                            <input type="text" name="adTitle"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
-            <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
-            </div>
-            <div class="col-sm-12 select-table table-striped">
-                <table id="bootstrap-table"></table>
-            </div>
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
         </div>
     </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "content/adverts";
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var prefix = ctx + "content/adverts";
 
-        $(function() {
-            var options = {
-                url: prefix + "/list",
-                createUrl: prefix + "/add",
-                updateUrl: prefix + "/edit/{id}",
-                removeUrl: prefix + "/remove",
-                exportUrl: prefix + "/export",
-                modalName: "文章广告",
-                columns: [{
-                    checkbox: true
-                },
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "文章广告",
+            columns: [{
+                checkbox: true
+            },
                 {
                     field: 'adId',
                     title: '',
@@ -85,9 +88,9 @@
                 {
                     field: 'adLinkUrl',
                     title: '跳转地址',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-xs" href="javascript:void(0)" onclick="$.modal.msg(\''+row.adLinkUrl+'\');" ><i class="fa"></i>展示</a> ');
+                        actions.push('<a class="btn btn-xs" href="javascript:void(0)" onclick="$.modal.msg(\'' + row.adLinkUrl + '\');" ><i class="fa"></i>展示</a> ');
                         return actions.join('');
                     }
                 },
@@ -100,7 +103,7 @@
                 {
                     field: 'adColorType',
                     title: '背景颜色',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         if (row.adColorType === '1') {
                             actions.push('<div class="article-color" style="background-color: #67c5ab"></div>');
@@ -119,25 +122,25 @@
                     title: '广告图片',
                     width: '10',
                     widthUnit: 'px',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<img class="article-table-img" src="'+row.adImageUrl+'" ></img> ');
+                        actions.push('<img class="article-table-img" src="' + row.adImageUrl + '" ></img> ');
                         return actions.join('');
                     }
                 },
                 {
                     title: '操作',
                     align: 'center',
-                    formatter: function(value, row, index) {
+                    formatter: function (value, row, index) {
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.operate.edit(\'' + row.adId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs " href="javascript:void(0)" onclick="$.operate.remove(\'' + row.adId + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
                 }]
-            };
-            $.table.init(options);
-        });
-    </script>
+        };
+        $.table.init(options);
+    });
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/edit.html b/ruoyi-content/src/main/resources/templates/content/adverts/edit.html
index ce97d35b3..86cf17431 100644
--- a/ruoyi-content/src/main/resources/templates/content/adverts/edit.html
+++ b/ruoyi-content/src/main/resources/templates/content/adverts/edit.html
@@ -1,116 +1,172 @@
 <!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
-    <th:block th:include="include :: header('修改文章广告')" />
+    <th:block th:include="include :: header('修改文章广告')"/>
 </head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-adverts-edit" th:object="${cmsArticleAdInfo}">
-            <input name="adId" th:field="*{adId}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">公司id：</label>
-                <div class="col-sm-8">
-                    <input name="companyId" th:field="*{companyId}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">广告类型：</label>
-                <div class="col-sm-8">
-                    <select name="adType" class="form-control m-b">
-                        <option value="">所有</option>
-                    </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">广告类型名：</label>
-                <div class="col-sm-8">
-                    <input name="adTypeName" th:field="*{adTypeName}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">广告跳转地址：</label>
-                <div class="col-sm-8">
-                    <input name="adLinkUrl" th:field="*{adLinkUrl}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">广告标题：</label>
-                <div class="col-sm-8">
-                    <input name="adTitle" th:field="*{adTitle}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">广告名称：</label>
-                <div class="col-sm-8">
-                    <input name="adName" th:field="*{adName}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">广告简介：</label>
-                <div class="col-sm-8">
-                    <input name="adSummary" th:field="*{adSummary}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">广告背景颜色：</label>
-                <div class="col-sm-8">
-                    <select name="adColorType" class="form-control m-b">
-                        <option value="">所有</option>
-                    </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">广告图片地址：</label>
-                <div class="col-sm-8">
-                    <input name="adImageUrl" th:field="*{adImageUrl}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">广告状态  0：展示  1：不可用：</label>
-                <div class="col-sm-8">
-                    <input name="adState" th:field="*{adState}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">：</label>
-                <div class="col-sm-8">
-                    <input name="createDate" th:field="*{createDate}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">广告创建者：</label>
-                <div class="col-sm-8">
-                    <input name="createUser" th:field="*{createUser}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">：</label>
-                <div class="col-sm-8">
-                    <input name="updateUser" th:field="*{updateUser}" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">：</label>
-                <div class="col-sm-8">
-                    <input name="updateDate" th:field="*{updateDate}" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "content/adverts";
-        $("#form-adverts-edit").validate({
-            focusCleanup: true
-        });
+<style>
+    .lab {
+        height: 20px;
+        width: 20px;
+        display: inline-block;
+        border-radius: 20%;
+        margin-bottom: 0px;
+        margin-left: 5px;
+        margin-right: 5px;
+    }
 
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-adverts-edit').serialize());
-            }
+    .addColor {
+
+    }
+</style>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-adverts-edit" th:object="${cmsArticleAdInfo}">
+        <input name="adId" th:id="adId" th:field="*{adId}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">广告标题：</label>
+            <div class="col-sm-8">
+                <input name="adTitle" th:field="*{adTitle}" th:id="adTitle" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">广告名称：</label>
+            <div class="col-sm-8">
+                <input name="adName" th:field="*{adName}" th:id="adName" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">广告类型：</label>
+            <div class="col-sm-8">
+                <select name="adType" th:field="*{adType}" th:id="adType" class="form-control" onchange="chooseAdType()"
+                        required>
+                    <option value="1">名片</option>
+                    <option value="2">招募</option>
+                    <option value="3">增员</option>
+                    <option value="4">产品</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group" th:hidden="true">
+            <input name="adTypeName" th:field="*{adTypeName}" th:id="adTypeName" class="form-control" type="text">
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">跳转地址：</label>
+            <div class="col-sm-8">
+                <input name="adLinkUrl" th:field="*{adLinkUrl}" th:id="adLinkUrl" class="form-control" type="text"
+                       required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">简介：</label>
+            <div class="col-sm-8">
+                <input name="adSummary" th:field="*{adSummary}" th:id="adSummary" class="form-control" type="text"
+                       required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">广告背景颜色：</label>
+            <div class="col-sm-8">
+                <input type="radio" class="addColor" id="addColor_a" th:name="adColorType" value="1"
+                       th:checked="*{adColorType} eq '1'">
+                <label class="lab" style="background-color: #67c5ab"></label>
+                <input type="radio" class="addColor" id="addColor_b" th:name="adColorType" value="2"
+                       th:checked="*{adColorType} eq '2'">
+                <label class="lab" style="background-color: #b6d882"></label>
+                <input type="radio" class="addColor" id="addColor_c" th:name="adColorType" value="3"
+                       th:checked="*{adColorType} eq '3'">
+                <label class="lab" style="background-color: #f88f81"></label>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">广告图片地址：</label>
+            <div class="col-sm-1">
+                <img id="imgContent" th:src="*{adImageUrl}" style="width: 50px;height: 50px;">
+            </div>
+            <label class="col-sm-3 control-label">新图片：</label>
+            <div class="col-sm-1">
+                <img id="editImgContent" style="width: 50px;height: 50px;">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">上传新图：</label>
+            <div class="col-sm-7">
+                <input type="file" class="file projectfile" id="editImg" name="editImg">
+            </div>
+
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<link th:href="@{/css/fileinput.min.css}" rel="stylesheet"/>
+<script th:src="@{/js/fileinput.min.js}"></script>
+<script th:src="@{/js/fileinput_locale_zh.js}"></script>
+<script th:inline="javascript">
+    var prefix = ctx + "content/adverts";
+
+    function chooseAdType() {
+        $('#adTypeName').val($("#adType option:selected").text());
+    }
+
+    $("#form-adverts-edit").validate({
+        focusCleanup: true
+    });
+
+    var fileoptions = {
+        showUpload: false,
+        showRemove: true,
+        language: 'zh',
+        allowedPreviewTypes: ['image'],
+        allowedFileExtensions: ['jpg', 'png', 'gif'],
+        maxFileSize: 0,
+        autoReplace: true,// 是否自动替换图片
+        uploadAsync: false,// 异步上传
+        maxFileCount: 1,
+        maxFilesNum: 1,
+        dropZoneEnabled: false,
+        showPreview: true,
+        msgUploadThreshold: '上传中',
+        msgUploadEnd: '完成'
+    }
+
+    $("#editImg").fileinput(fileoptions).on("change", function (event) {
+        $(".file-preview").css("display", "none");
+    }).on("filebatchselected", function (event, files) {
+        $("#editImgContent").attr("src", $(".file-preview-image.kv-preview-data").attr('src'));
+    }).on("filecleared", function (event) {
+        $("#editImgContent").removeAttr("src");
+    });
+
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            var data = new FormData();
+            data.append('adId', $("#adId").val());
+            data.append('adTitle', $("#adTitle").val());
+            data.append('adName', $("#adName").val());
+            data.append('adType', $("#adType").val());
+            data.append('adTypeName', $("#adTypeName").val());
+            data.append('adLinkUrl', $("#adLinkUrl").val());
+            data.append('adSummary', $("#adSummary").val());
+            data.append('adColorType',$("input[name='adColorType']:checked").val());
+            data.append('addImg', $("#editImg")[0].files[0]);
+            $.ajax({
+                url : prefix + "/edit",
+                data : data,
+                dataType : "json",
+                type : "post",
+                processData: false,//不需要对数据进行处理
+                contentType:false,
+                cache : false,
+                success : function(result) {
+                    $.operate.successCallback(result);
+                },
+                error : function(textStatus, e) {
+
+                }
+            });
         }
-    </script>
+    }
+
+</script>
 </body>
 </html>
\ No newline at end of file

From 9ed04fce2a082cbde816c02faf84c760f1f92c6a Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Thu, 25 Mar 2021 09:52:49 +0800
Subject: [PATCH 02/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=B9=BF=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java | 2 +-
 .../main/resources/mapper/content/CmsArticleAdInfoMapper.xml    | 2 +-
 .../src/main/resources/templates/content/adverts/add.html       | 2 ++
 .../src/main/resources/templates/content/adverts/edit.html      | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
index 4e58f9c17..4bed992d3 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
@@ -108,7 +108,7 @@ public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService {
      */
     @Override
     public int updateCmsArticleAdInfo(MultipartFile file, CmsArticleAdInfo cmsArticleAdInfo) {
-        if (!file.isEmpty()) {
+        if (file != null && !file.isEmpty()) {
             String fileName = file.getOriginalFilename();// 文件名
             String ext = fileName.substring(fileName.lastIndexOf("."), fileName.length());// 文件后缀
             String fileTime = DateUtils.getMillisecond();
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
index 0a6b0034f..14b21737f 100644
--- a/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
@@ -160,7 +160,7 @@
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
         <include refid="Base_Column_List"/>
-        from article_ad_info
+        from cms_article_ad_info
         where AD_ID = #{adId,jdbcType=INTEGER}
     </select>
 
diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/add.html b/ruoyi-content/src/main/resources/templates/content/adverts/add.html
index 823093020..7ff7067df 100644
--- a/ruoyi-content/src/main/resources/templates/content/adverts/add.html
+++ b/ruoyi-content/src/main/resources/templates/content/adverts/add.html
@@ -125,6 +125,8 @@
 
         function submitHandler() {
             if ($.validate.form()) {
+                // 打开遮罩层
+                $.modal.loading("请稍后...");
                 var data = new FormData();
                 data.append('adTitle', $("#adTitle").val());
                 data.append('adName', $("#adName").val());
diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/edit.html b/ruoyi-content/src/main/resources/templates/content/adverts/edit.html
index 86cf17431..a8c276b2e 100644
--- a/ruoyi-content/src/main/resources/templates/content/adverts/edit.html
+++ b/ruoyi-content/src/main/resources/templates/content/adverts/edit.html
@@ -139,6 +139,8 @@
 
     function submitHandler() {
         if ($.validate.form()) {
+            // 打开遮罩层
+            $.modal.loading("请稍后...");
             var data = new FormData();
             data.append('adId', $("#adId").val());
             data.append('adTitle', $("#adTitle").val());

From 4027bafbacc23baffa32b1de1012d15b04cc0fde Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Thu, 25 Mar 2021 11:02:40 +0800
Subject: [PATCH 03/30] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=B9=BF=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CmsPicAdInfoController.java    | 108 +++++++++
 .../ruoyi/content/domain/CmsPicAdInfo.java    | 216 ++++++++++++++++++
 .../content/mapper/CmsPicAdInfoMapper.java    |  63 +++++
 .../content/service/ICmsPicAdInfoService.java |  62 +++++
 .../service/impl/CmsPicAdInfoServiceImpl.java | 130 +++++++++++
 .../mapper/content/CmsPicAdInfoMapper.xml     | 113 +++++++++
 .../templates/content/picAdverts/add.html     |  56 +++++
 .../templates/content/picAdverts/edit.html    |  57 +++++
 .../content/picAdverts/picAdverts.html        |  93 ++++++++
 9 files changed, 898 insertions(+)
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/controller/CmsPicAdInfoController.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsPicAdInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsPicAdInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsPicAdInfoService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsPicAdInfoServiceImpl.java
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/CmsPicAdInfoMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/templates/content/picAdverts/add.html
 create mode 100644 ruoyi-content/src/main/resources/templates/content/picAdverts/edit.html
 create mode 100644 ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/CmsPicAdInfoController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/CmsPicAdInfoController.java
new file mode 100644
index 000000000..4cde6b827
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/CmsPicAdInfoController.java
@@ -0,0 +1,108 @@
+package com.ruoyi.content.controller;
+
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.content.domain.CmsPicAdInfo;
+import com.ruoyi.content.service.ICmsPicAdInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 图片广告Controller
+ *
+ * @author liushenlu
+ * @date 2021-03-25
+ */
+@Controller
+@RequestMapping("/content/picAdverts")
+public class CmsPicAdInfoController extends BaseController {
+
+    private String prefix = "content/picAdverts";
+
+    @Autowired
+    private ICmsPicAdInfoService cmsPicAdInfoService;
+
+    @GetMapping()
+    public String picAdverts() {
+        return prefix + "/picAdverts";
+    }
+
+    /**
+     * 查询图片广告列表
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(CmsPicAdInfo cmsPicAdInfo) {
+        startPage();
+        List<CmsPicAdInfo> list = cmsPicAdInfoService.selectCmsPicAdInfoList(cmsPicAdInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出图片广告列表
+     */
+    @Log(title = "图片广告", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(CmsPicAdInfo cmsPicAdInfo) {
+        List<CmsPicAdInfo> list = cmsPicAdInfoService.selectCmsPicAdInfoList(cmsPicAdInfo);
+        ExcelUtil<CmsPicAdInfo> util = new ExcelUtil<CmsPicAdInfo>(CmsPicAdInfo.class);
+        return util.exportExcel(list, "picAdverts");
+    }
+
+    /**
+     * 新增图片广告
+     */
+    @GetMapping("/add")
+    public String add() {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存图片广告
+     */
+    @Log(title = "图片广告", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(CmsPicAdInfo cmsPicAdInfo) {
+        return toAjax(cmsPicAdInfoService.insertCmsPicAdInfo(cmsPicAdInfo));
+    }
+
+    /**
+     * 修改图片广告
+     */
+    @GetMapping("/edit/{picAdId}")
+    public String edit(@PathVariable("picAdId") Long picAdId, ModelMap mmap) {
+        CmsPicAdInfo cmsPicAdInfo = cmsPicAdInfoService.selectCmsPicAdInfoById(picAdId);
+        mmap.put("cmsPicAdInfo", cmsPicAdInfo);
+        return prefix + "/edit";
+    }
+
+    /**
+     * 修改保存图片广告
+     */
+    @Log(title = "图片广告", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(CmsPicAdInfo cmsPicAdInfo) {
+        return toAjax(cmsPicAdInfoService.updateCmsPicAdInfo(cmsPicAdInfo));
+    }
+
+    /**
+     * 删除图片广告
+     */
+    @Log(title = "图片广告", businessType = BusinessType.DELETE)
+    @PostMapping("/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids) {
+        return toAjax(cmsPicAdInfoService.deleteCmsPicAdInfoByIds(ids));
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsPicAdInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsPicAdInfo.java
new file mode 100644
index 000000000..e5c926121
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsPicAdInfo.java
@@ -0,0 +1,216 @@
+package com.ruoyi.content.domain;
+
+import com.ruoyi.common.annotation.Excel;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 图片广告对象 cms_pic_ad_info
+ *
+ * @author liushenlu
+ * @date 2021-03-25
+ */
+public class CmsPicAdInfo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 广告编号
+     */
+    private Long picAdId;
+
+    /**
+     * 广告类型
+     */
+    @Excel(name = "广告类型")
+    private String picAdType;
+
+    /**
+     * 产品标题
+     */
+    @Excel(name = "产品标题")
+    private String picAdTitle;
+
+    /**
+     * 广告特有名称
+     */
+    @Excel(name = "广告特有名称")
+    private String picAdName;
+
+    /**
+     * 广告链接
+     */
+    @Excel(name = "广告链接")
+    private String picAdUrl;
+
+    /**
+     * 广告状态，0：可展示，1：不可展示
+     */
+    @Excel(name = "广告状态，0：可展示，1：不可展示")
+    private String picAdState;
+
+    /**
+     * 公司id
+     */
+    @Excel(name = "公司id")
+    private String companyId;
+
+    /**
+     *
+     */
+    @Excel(name = "")
+    private String createDate;
+
+    /**
+     *
+     */
+    @Excel(name = "")
+    private String createTime;
+
+    /**
+     *
+     */
+    @Excel(name = "")
+    private String createUser;
+
+    /**
+     *
+     */
+    @Excel(name = "")
+    private String updateUser;
+
+    /**
+     *
+     */
+    @Excel(name = "")
+    private String updateDate;
+
+    /**
+     *
+     */
+    @Excel(name = "")
+    private String updateTime;
+
+    public void setPicAdId(Long picAdId) {
+        this.picAdId = picAdId;
+    }
+
+    public Long getPicAdId() {
+        return picAdId;
+    }
+
+    public void setPicAdType(String picAdType) {
+        this.picAdType = picAdType;
+    }
+
+    public String getPicAdType() {
+        return picAdType;
+    }
+
+    public void setPicAdTitle(String picAdTitle) {
+        this.picAdTitle = picAdTitle;
+    }
+
+    public String getPicAdTitle() {
+        return picAdTitle;
+    }
+
+    public void setPicAdName(String picAdName) {
+        this.picAdName = picAdName;
+    }
+
+    public String getPicAdName() {
+        return picAdName;
+    }
+
+    public void setPicAdUrl(String picAdUrl) {
+        this.picAdUrl = picAdUrl;
+    }
+
+    public String getPicAdUrl() {
+        return picAdUrl;
+    }
+
+    public void setPicAdState(String picAdState) {
+        this.picAdState = picAdState;
+    }
+
+    public String getPicAdState() {
+        return picAdState;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("picAdId", getPicAdId())
+                .append("picAdType", getPicAdType())
+                .append("picAdTitle", getPicAdTitle())
+                .append("picAdName", getPicAdName())
+                .append("picAdUrl", getPicAdUrl())
+                .append("picAdState", getPicAdState())
+                .append("companyId", getCompanyId())
+                .append("createDate", getCreateDate())
+                .append("createTime", getCreateTime())
+                .append("createUser", getCreateUser())
+                .append("updateUser", getUpdateUser())
+                .append("updateDate", getUpdateDate())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsPicAdInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsPicAdInfoMapper.java
new file mode 100644
index 000000000..ed4547520
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsPicAdInfoMapper.java
@@ -0,0 +1,63 @@
+package com.ruoyi.content.mapper;
+
+import java.util.List;
+
+import com.ruoyi.content.domain.CmsPicAdInfo;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 图片广告Mapper接口
+ *
+ * @author liushenlu
+ * @date 2021-03-25
+ */
+@Repository
+public interface CmsPicAdInfoMapper {
+    /**
+     * 查询图片广告
+     *
+     * @param picAdId 图片广告ID
+     * @return 图片广告
+     */
+    public CmsPicAdInfo selectCmsPicAdInfoById(Long picAdId);
+
+    /**
+     * 查询图片广告列表
+     *
+     * @param cmsPicAdInfo 图片广告
+     * @return 图片广告集合
+     */
+    public List<CmsPicAdInfo> selectCmsPicAdInfoList(CmsPicAdInfo cmsPicAdInfo);
+
+    /**
+     * 新增图片广告
+     *
+     * @param cmsPicAdInfo 图片广告
+     * @return 结果
+     */
+    public int insertCmsPicAdInfo(CmsPicAdInfo cmsPicAdInfo);
+
+    /**
+     * 修改图片广告
+     *
+     * @param cmsPicAdInfo 图片广告
+     * @return 结果
+     */
+    public int updateCmsPicAdInfo(CmsPicAdInfo cmsPicAdInfo);
+
+    /**
+     * 删除图片广告
+     *
+     * @param picAdId 图片广告ID
+     * @return 结果
+     */
+    public int deleteCmsPicAdInfoById(Long picAdId);
+
+    /**
+     * 批量删除图片广告
+     *
+     * @param picAdIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCmsPicAdInfoByIds(String[] picAdIds);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsPicAdInfoService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsPicAdInfoService.java
new file mode 100644
index 000000000..b5011813a
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsPicAdInfoService.java
@@ -0,0 +1,62 @@
+package com.ruoyi.content.service;
+
+import java.util.List;
+
+import com.ruoyi.content.domain.CmsPicAdInfo;
+
+/**
+ * 图片广告Service接口
+ *
+ * @author liushenlu
+ * @date 2021-03-25
+ */
+public interface ICmsPicAdInfoService {
+
+    /**
+     * 查询图片广告
+     *
+     * @param picAdId 图片广告ID
+     * @return 图片广告
+     */
+    public CmsPicAdInfo selectCmsPicAdInfoById(Long picAdId);
+
+    /**
+     * 查询图片广告列表
+     *
+     * @param cmsPicAdInfo 图片广告
+     * @return 图片广告集合
+     */
+    public List<CmsPicAdInfo> selectCmsPicAdInfoList(CmsPicAdInfo cmsPicAdInfo);
+
+    /**
+     * 新增图片广告
+     *
+     * @param cmsPicAdInfo 图片广告
+     * @return 结果
+     */
+    public int insertCmsPicAdInfo(CmsPicAdInfo cmsPicAdInfo);
+
+    /**
+     * 修改图片广告
+     *
+     * @param cmsPicAdInfo 图片广告
+     * @return 结果
+     */
+    public int updateCmsPicAdInfo(CmsPicAdInfo cmsPicAdInfo);
+
+    /**
+     * 批量删除图片广告
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteCmsPicAdInfoByIds(String ids);
+
+    /**
+     * 删除图片广告信息
+     *
+     * @param picAdId 图片广告ID
+     * @return 结果
+     */
+    public int deleteCmsPicAdInfoById(Long picAdId);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsPicAdInfoServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsPicAdInfoServiceImpl.java
new file mode 100644
index 000000000..8b22be310
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsPicAdInfoServiceImpl.java
@@ -0,0 +1,130 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.content.domain.CmsArticleAdInfo;
+import com.ruoyi.content.domain.CmsPicAdInfo;
+import com.ruoyi.content.mapper.CmsPicAdInfoMapper;
+import com.ruoyi.content.redis.RedisManager;
+import com.ruoyi.content.service.ICmsPicAdInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 图片广告Service业务层处理
+ *
+ * @author liushenlu
+ * @date 2021-03-25
+ */
+@Service
+public class CmsPicAdInfoServiceImpl implements ICmsPicAdInfoService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(CmsPicAdInfoServiceImpl.class);
+
+    @Autowired
+    private CmsPicAdInfoMapper cmsPicAdInfoMapper;
+    @Autowired
+    private RedisManager redisManager;
+
+    /**
+     * 查询图片广告
+     *
+     * @param picAdId 图片广告ID
+     * @return 图片广告
+     */
+    @Override
+    public CmsPicAdInfo selectCmsPicAdInfoById(Long picAdId) {
+        return cmsPicAdInfoMapper.selectCmsPicAdInfoById(picAdId);
+    }
+
+    /**
+     * 查询图片广告列表
+     *
+     * @param cmsPicAdInfo 图片广告
+     * @return 图片广告
+     */
+    @Override
+    public List<CmsPicAdInfo> selectCmsPicAdInfoList(CmsPicAdInfo cmsPicAdInfo) {
+        cmsPicAdInfo.setCompanyId("1");
+        return cmsPicAdInfoMapper.selectCmsPicAdInfoList(cmsPicAdInfo);
+    }
+
+    /**
+     * 新增图片广告
+     *
+     * @param cmsPicAdInfo 图片广告
+     * @return 结果
+     */
+    @Override
+    public int insertCmsPicAdInfo(CmsPicAdInfo cmsPicAdInfo) {
+        String date = DateUtils.getDate();
+        String time = DateUtils.getTimeNow();
+        cmsPicAdInfo.setCompanyId("1");
+        cmsPicAdInfo.setPicAdUrl(cmsPicAdInfo.getPicAdUrl() + "(");
+        cmsPicAdInfo.setCreateDate(date);
+        cmsPicAdInfo.setCreateTime(time);
+        cmsPicAdInfo.setCreateUser("company");
+        cmsPicAdInfo.setUpdateUser("company");
+        cmsPicAdInfo.setUpdateDate(date);
+        cmsPicAdInfo.setUpdateTime(time);
+        cmsPicAdInfo.setPicAdState("0");
+        return cmsPicAdInfoMapper.insertCmsPicAdInfo(cmsPicAdInfo);
+    }
+
+    /**
+     * 修改图片广告
+     *
+     * @param cmsPicAdInfo 图片广告
+     * @return 结果
+     */
+    @Override
+    public int updateCmsPicAdInfo(CmsPicAdInfo cmsPicAdInfo) {
+        if (StringUtils.isNotBlank(cmsPicAdInfo.getPicAdUrl()) && cmsPicAdInfo.getPicAdUrl().indexOf("(") == -1) {
+            cmsPicAdInfo.setPicAdUrl(cmsPicAdInfo.getPicAdUrl() + "(");
+        }
+        cmsPicAdInfo.setUpdateDate(DateUtils.getDate());
+        cmsPicAdInfo.setUpdateTime(DateUtils.getTimeNow());
+        if (cmsPicAdInfoMapper.updateCmsPicAdInfo(cmsPicAdInfo) > 0) {
+            redisManager.delete("picAdInfo_1");
+        } else {
+            LOGGER.info("编辑广告失败");
+            return 0;
+        }
+        return 1;
+    }
+
+    /**
+     * 删除图片广告对象
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCmsPicAdInfoByIds(String ids) {
+        String[] arrId = ids.split(",");
+        for (String id : arrId) {
+            CmsPicAdInfo delType = cmsPicAdInfoMapper.selectCmsPicAdInfoById(Long.valueOf(id));
+            if (delType != null) {
+                redisManager.delete("picAdInfo_1");
+                cmsPicAdInfoMapper.deleteCmsPicAdInfoById(Long.valueOf(id));
+            }
+        }
+        return 1;
+    }
+
+    /**
+     * 删除图片广告信息
+     *
+     * @param picAdId 图片广告ID
+     * @return 结果
+     */
+    @Override
+    public int deleteCmsPicAdInfoById(Long picAdId) {
+        return cmsPicAdInfoMapper.deleteCmsPicAdInfoById(picAdId);
+    }
+}
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsPicAdInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsPicAdInfoMapper.xml
new file mode 100644
index 000000000..b70854fad
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsPicAdInfoMapper.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.content.mapper.CmsPicAdInfoMapper">
+    
+    <resultMap type="CmsPicAdInfo" id="CmsPicAdInfoResult">
+        <result property="picAdId"    column="PIC_AD_ID"    />
+        <result property="picAdType"    column="PIC_AD_TYPE"    />
+        <result property="picAdTitle"    column="PIC_AD_TITLE"    />
+        <result property="picAdName"    column="PIC_AD_NAME"    />
+        <result property="picAdUrl"    column="PIC_AD_URL"    />
+        <result property="picAdState"    column="PIC_AD_STATE"    />
+        <result property="companyId"    column="COMPANY_ID"    />
+        <result property="createDate"    column="CREATE_DATE"    />
+        <result property="createTime"    column="CREATE_TIME"    />
+        <result property="createUser"    column="CREATE_USER"    />
+        <result property="updateUser"    column="UPDATE_USER"    />
+        <result property="updateDate"    column="UPDATE_DATE"    />
+        <result property="updateTime"    column="UPDATE_TIME"    />
+    </resultMap>
+
+    <sql id="selectCmsPicAdInfoVo">
+        select PIC_AD_ID, PIC_AD_TYPE, PIC_AD_TITLE, PIC_AD_NAME, PIC_AD_URL, PIC_AD_STATE, COMPANY_ID, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME from cms_pic_ad_info
+    </sql>
+
+    <select id="selectCmsPicAdInfoList" parameterType="CmsPicAdInfo" resultMap="CmsPicAdInfoResult">
+        <include refid="selectCmsPicAdInfoVo"/>
+        <where>
+            PIC_AD_STATE = '0'
+            <if test="picAdType != null  and picAdType != ''"> and PIC_AD_TYPE = #{picAdType}</if>
+            <if test="picAdTitle != null  and picAdTitle != ''"> and PIC_AD_TITLE like concat('%', #{picAdTitle}, '%')</if>
+            <if test="picAdName != null  and picAdName != ''"> and PIC_AD_NAME like concat('%', #{picAdName}, '%')</if>
+            <if test="picAdUrl != null  and picAdUrl != ''"> and PIC_AD_URL = #{picAdUrl}</if>
+            <if test="companyId != null  and companyId != ''"> and COMPANY_ID = #{companyId}</if>
+            <if test="createDate != null  and createDate != ''"> and CREATE_DATE = #{createDate}</if>
+            <if test="createTime != null  and createTime != ''"> and CREATE_TIME = #{createTime}</if>
+            and CREATE_USER = 'company'
+            <if test="updateUser != null  and updateUser != ''"> and UPDATE_USER = #{updateUser}</if>
+            <if test="updateDate != null  and updateDate != ''"> and UPDATE_DATE = #{updateDate}</if>
+            <if test="updateTime != null  and updateTime != ''"> and UPDATE_TIME = #{updateTime}</if>
+        </where>
+        order by CREATE_DATE DESC,CREATE_TIME DESC, UPDATE_DATE DESC,UPDATE_TIME DESC
+    </select>
+    
+    <select id="selectCmsPicAdInfoById" parameterType="Long" resultMap="CmsPicAdInfoResult">
+        <include refid="selectCmsPicAdInfoVo"/>
+        where PIC_AD_ID = #{picAdId}
+    </select>
+        
+    <insert id="insertCmsPicAdInfo" parameterType="CmsPicAdInfo" useGeneratedKeys="true" keyProperty="picAdId">
+        insert into cms_pic_ad_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="picAdType != null">PIC_AD_TYPE,</if>
+            <if test="picAdTitle != null">PIC_AD_TITLE,</if>
+            <if test="picAdName != null">PIC_AD_NAME,</if>
+            <if test="picAdUrl != null">PIC_AD_URL,</if>
+            <if test="picAdState != null">PIC_AD_STATE,</if>
+            <if test="companyId != null">COMPANY_ID,</if>
+            <if test="createDate != null">CREATE_DATE,</if>
+            <if test="createTime != null">CREATE_TIME,</if>
+            <if test="createUser != null">CREATE_USER,</if>
+            <if test="updateUser != null">UPDATE_USER,</if>
+            <if test="updateDate != null">UPDATE_DATE,</if>
+            <if test="updateTime != null">UPDATE_TIME,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="picAdType != null">#{picAdType},</if>
+            <if test="picAdTitle != null">#{picAdTitle},</if>
+            <if test="picAdName != null">#{picAdName},</if>
+            <if test="picAdUrl != null">#{picAdUrl},</if>
+            <if test="picAdState != null">#{picAdState},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="createDate != null">#{createDate},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createUser != null">#{createUser},</if>
+            <if test="updateUser != null">#{updateUser},</if>
+            <if test="updateDate != null">#{updateDate},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCmsPicAdInfo" parameterType="CmsPicAdInfo">
+        update cms_pic_ad_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="picAdType != null">PIC_AD_TYPE = #{picAdType},</if>
+            <if test="picAdTitle != null">PIC_AD_TITLE = #{picAdTitle},</if>
+            <if test="picAdName != null">PIC_AD_NAME = #{picAdName},</if>
+            <if test="picAdUrl != null">PIC_AD_URL = #{picAdUrl},</if>
+            <if test="picAdState != null">PIC_AD_STATE = #{picAdState},</if>
+            <if test="companyId != null">COMPANY_ID = #{companyId},</if>
+            <if test="createDate != null">CREATE_DATE = #{createDate},</if>
+            <if test="createTime != null">CREATE_TIME = #{createTime},</if>
+            <if test="createUser != null">CREATE_USER = #{createUser},</if>
+            <if test="updateUser != null">UPDATE_USER = #{updateUser},</if>
+            <if test="updateDate != null">UPDATE_DATE = #{updateDate},</if>
+            <if test="updateTime != null">UPDATE_TIME = #{updateTime},</if>
+        </trim>
+        where PIC_AD_ID = #{picAdId}
+    </update>
+
+    <delete id="deleteCmsPicAdInfoById" parameterType="Long">
+        delete from cms_pic_ad_info where PIC_AD_ID = #{picAdId}
+    </delete>
+
+    <delete id="deleteCmsPicAdInfoByIds" parameterType="String">
+        delete from cms_pic_ad_info where PIC_AD_ID in 
+        <foreach item="picAdId" collection="array" open="(" separator="," close=")">
+            #{picAdId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/picAdverts/add.html b/ruoyi-content/src/main/resources/templates/content/picAdverts/add.html
new file mode 100644
index 000000000..ffa6deff4
--- /dev/null
+++ b/ruoyi-content/src/main/resources/templates/content/picAdverts/add.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增图片广告')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-picAdverts-add">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">广告标题：</label>
+                <div class="col-sm-8">
+                    <input name="picAdTitle" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">广告特有名称：</label>
+                <div class="col-sm-8">
+                    <input name="picAdName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">广告类型：</label>
+                <div class="col-sm-8">
+                    <select name="picAdType" class="form-control" required>
+                        <option selected value="1">名片</option>
+                        <option value="2">招募</option>
+                        <option value="3">增员</option>
+                        <option value="4">产品</option>
+                    </select>
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">广告链接：</label>
+                <div class="col-sm-8">
+                    <input name="picAdUrl" class="form-control" type="text" required>
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "content/picAdverts"
+        $("#form-picAdverts-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                // 打开遮罩层
+                $.modal.loading("请稍后...");
+                $.operate.save(prefix + "/add", $('#form-picAdverts-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/picAdverts/edit.html b/ruoyi-content/src/main/resources/templates/content/picAdverts/edit.html
new file mode 100644
index 000000000..1f34dc7c0
--- /dev/null
+++ b/ruoyi-content/src/main/resources/templates/content/picAdverts/edit.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('修改图片广告')"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-picAdverts-edit" th:object="${cmsPicAdInfo}">
+        <input name="picAdId" th:field="*{picAdId}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">广告标题：</label>
+            <div class="col-sm-8">
+                <input name="picAdTitle" th:field="*{picAdTitle}" class="form-control" type="text" required>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">广告特有名称：</label>
+            <div class="col-sm-8">
+                <input name="picAdName" th:field="*{picAdName}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">广告类型：</label>
+            <div class="col-sm-8">
+                <select name="picAdType" th:field="*{picAdType}" class="form-control" required>
+                    <option value="1">名片</option>
+                    <option value="2">招募</option>
+                    <option value="3">增员</option>
+                    <option value="4">产品</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">广告链接：</label>
+            <div class="col-sm-8">
+                <input name="picAdUrl" th:field="*{picAdUrl}" class="form-control" type="text" required>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var prefix = ctx + "content/picAdverts";
+    $("#form-picAdverts-edit").validate({
+        focusCleanup: true
+    });
+
+    function submitHandler() {
+        if ($.validate.form()) {
+            // 打开遮罩层
+            $.modal.loading("请稍后...");
+            $.operate.save(prefix + "/edit", $('#form-picAdverts-edit').serialize());
+        }
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html
new file mode 100644
index 000000000..b9ab23cd9
--- /dev/null
+++ b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html
@@ -0,0 +1,93 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('图片广告列表')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>产品名称：</label>
+                            <input type="text" name="picAdTitle"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" onclick="$.operate.add()">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var prefix = ctx + "content/picAdverts";
+
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "图片广告",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'picAdId',
+                    title: '广告编号',
+                    visible: false
+                },
+                {
+                    field: 'picAdTitle',
+                    title: '广告标题'
+                },
+                {
+                    field: 'picAdName',
+                    title: '广告特有名称'
+                },
+                {
+                    field: 'picAdUrl',
+                    title: '广告链接',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-xs" href="javascript:void(0)" onclick="$.modal.msg(\'' + row.picAdUrl + '\');" ><i class="fa"></i>展示</a> ');
+                        return actions.join('');
+                    }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.picAdId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.picAdId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+</script>
+</body>
+</html>
\ No newline at end of file

From c304091ecdcf4ffd062728d2edb16a4eb6f8a6ff Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Thu, 25 Mar 2021 14:05:34 +0800
Subject: [PATCH 04/30] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CmsPicAdInfoController.java    |   10 +
 .../content/controller/GalleryController.java |   51 +
 .../com/ruoyi/content/domain/BaseCode.java    |  517 ++++++
 .../ruoyi/content/domain/BaseCodeExample.java | 1393 +++++++++++++++++
 .../ruoyi/content/domain/GalleryChannel.java  |  273 ++++
 .../content/domain/GalleryChannelExample.java |  912 +++++++++++
 .../com/ruoyi/content/domain/GalleryDTO.java  |   80 +
 .../ruoyi/content/domain/GalleryPicInfo.java  |  333 ++++
 .../content/domain/GalleryPicInfoExample.java | 1062 +++++++++++++
 .../ruoyi/content/mapper/BaseCodeMapper.java  |   99 ++
 .../content/mapper/GalleryChannelMapper.java  |   99 ++
 .../content/mapper/GalleryPicInfoMapper.java  |   99 ++
 .../content/mapper/GalleryQueryMapper.java    |   20 +
 .../com/ruoyi/content/message/Message.java    |   48 +
 .../ruoyi/content/service/GalleryService.java |   64 +
 .../service/impl/GalleryServiceImpl.java      |  403 +++++
 .../com/ruoyi/content/utils/ImgCompress.java  |  103 ++
 .../mapper/content/BaseCodeMapper.xml         |  463 ++++++
 .../mapper/content/GalleryChannelMapper.xml   |  352 +++++
 .../mapper/content/GalleryPicInfoMapper.xml   |  383 +++++
 .../mapper/content/GalleryQueryMapper.xml     |  118 ++
 .../static/css/bootstrapValidator.min.css     |   13 +
 .../static/js/bootstrapValidator.min.js       |   13 +
 .../templates/content/gallery/gallery.html    |  211 +++
 24 files changed, 7119 insertions(+)
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCode.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCodeExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryChannel.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryChannelExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryDTO.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfoExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryChannelMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryPicInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryQueryMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/message/Message.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/GalleryService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/GalleryServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/ImgCompress.java
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/BaseCodeMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/GalleryChannelMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/GalleryPicInfoMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/static/css/bootstrapValidator.min.css
 create mode 100644 ruoyi-content/src/main/resources/static/js/bootstrapValidator.min.js
 create mode 100644 ruoyi-content/src/main/resources/templates/content/gallery/gallery.html

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/CmsPicAdInfoController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/CmsPicAdInfoController.java
index 4cde6b827..a2d066f79 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/CmsPicAdInfoController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/CmsPicAdInfoController.java
@@ -35,6 +35,16 @@ public class CmsPicAdInfoController extends BaseController {
         return prefix + "/picAdverts";
     }
 
+    /**
+     * 查询图片广告列表
+     */
+    @PostMapping("/cardInfo")
+    @ResponseBody
+    public List<CmsPicAdInfo> queryCardInfo(CmsPicAdInfo cmsPicAdInfo) {
+        List<CmsPicAdInfo> list = cmsPicAdInfoService.selectCmsPicAdInfoList(cmsPicAdInfo);
+        return list;
+    }
+
     /**
      * 查询图片广告列表
      */
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java
new file mode 100644
index 000000000..f88b7a761
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java
@@ -0,0 +1,51 @@
+package com.ruoyi.content.controller;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.GalleryService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @program: ruoyi->GalleryController
+ * @description:
+ * @author: LiuShenlu
+ * @create: 2021-03-25 11:20
+ **/
+@Controller
+@RequestMapping("/content/gallery")
+public class GalleryController extends BaseController {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(GalleryController.class);
+
+    private String prefix = "content/gallery";
+
+    @Autowired
+    private GalleryService galleryService;
+
+    @GetMapping()
+    public String adverts() {
+        return prefix + "/gallery";
+    }
+
+    /**
+     * 上传图库图片
+     *
+     * @param files
+     * @return
+     */
+    @PostMapping(value = "/addGalleryImg")
+    @ResponseBody
+    public Message addGalleryImg(@RequestParam("imgUrl") MultipartFile[] files, @RequestParam("picAdId") String picAdId) {
+        LOGGER.info("上传图库图片控制层方法开始");
+        MultipartFile file = files[0];
+        Message msg = galleryService.addGalleryImg(file, picAdId);
+        LOGGER.info("上传图库图片控制层方法结束");
+        return msg;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCode.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCode.java
new file mode 100644
index 000000000..efa78c601
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCode.java
@@ -0,0 +1,517 @@
+package com.ruoyi.content.domain;
+
+import java.util.Date;
+
+public class BaseCode {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CODE_CODE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String codeCode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CODE_TYPE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String codeType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.ORDER_NO
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String orderNo;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CODE_CNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String codeCname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CODE_ENAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String codeEname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CODE_TNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String codeTname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.STATE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String state;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.CREATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private Date createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.UPDATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private Date updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String updateRemark;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.BUSINESS_AREA
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String businessArea;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.COMPANY_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column base_code.BRANCH_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    private String branchId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.ID
+     *
+     * @return the value of base_code.ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.ID
+     *
+     * @param id the value for base_code.ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CODE_CODE
+     *
+     * @return the value of base_code.CODE_CODE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCodeCode() {
+        return codeCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CODE_CODE
+     *
+     * @param codeCode the value for base_code.CODE_CODE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCodeCode(String codeCode) {
+        this.codeCode = codeCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CODE_TYPE
+     *
+     * @return the value of base_code.CODE_TYPE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCodeType() {
+        return codeType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CODE_TYPE
+     *
+     * @param codeType the value for base_code.CODE_TYPE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCodeType(String codeType) {
+        this.codeType = codeType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.ORDER_NO
+     *
+     * @return the value of base_code.ORDER_NO
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.ORDER_NO
+     *
+     * @param orderNo the value for base_code.ORDER_NO
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CODE_CNAME
+     *
+     * @return the value of base_code.CODE_CNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCodeCname() {
+        return codeCname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CODE_CNAME
+     *
+     * @param codeCname the value for base_code.CODE_CNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCodeCname(String codeCname) {
+        this.codeCname = codeCname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CODE_ENAME
+     *
+     * @return the value of base_code.CODE_ENAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCodeEname() {
+        return codeEname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CODE_ENAME
+     *
+     * @param codeEname the value for base_code.CODE_ENAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCodeEname(String codeEname) {
+        this.codeEname = codeEname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CODE_TNAME
+     *
+     * @return the value of base_code.CODE_TNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCodeTname() {
+        return codeTname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CODE_TNAME
+     *
+     * @param codeTname the value for base_code.CODE_TNAME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCodeTname(String codeTname) {
+        this.codeTname = codeTname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.STATE
+     *
+     * @return the value of base_code.STATE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.STATE
+     *
+     * @param state the value for base_code.STATE
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CREATE_USER
+     *
+     * @return the value of base_code.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CREATE_USER
+     *
+     * @param createUser the value for base_code.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.CREATE_TIME
+     *
+     * @return the value of base_code.CREATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.CREATE_TIME
+     *
+     * @param createTime the value for base_code.CREATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.UPDATE_USER
+     *
+     * @return the value of base_code.UPDATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.UPDATE_USER
+     *
+     * @param updateUser the value for base_code.UPDATE_USER
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.UPDATE_TIME
+     *
+     * @return the value of base_code.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.UPDATE_TIME
+     *
+     * @param updateTime the value for base_code.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.UPDATE_REMARK
+     *
+     * @return the value of base_code.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getUpdateRemark() {
+        return updateRemark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.UPDATE_REMARK
+     *
+     * @param updateRemark the value for base_code.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setUpdateRemark(String updateRemark) {
+        this.updateRemark = updateRemark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.BUSINESS_AREA
+     *
+     * @return the value of base_code.BUSINESS_AREA
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getBusinessArea() {
+        return businessArea;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.BUSINESS_AREA
+     *
+     * @param businessArea the value for base_code.BUSINESS_AREA
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setBusinessArea(String businessArea) {
+        this.businessArea = businessArea;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.COMPANY_ID
+     *
+     * @return the value of base_code.COMPANY_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.COMPANY_ID
+     *
+     * @param companyId the value for base_code.COMPANY_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column base_code.BRANCH_ID
+     *
+     * @return the value of base_code.BRANCH_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getBranchId() {
+        return branchId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column base_code.BRANCH_ID
+     *
+     * @param branchId the value for base_code.BRANCH_ID
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setBranchId(String branchId) {
+        this.branchId = branchId;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCodeExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCodeExample.java
new file mode 100644
index 000000000..0d7ab4edf
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCodeExample.java
@@ -0,0 +1,1393 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class BaseCodeExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public BaseCodeExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeIsNull() {
+            addCriterion("CODE_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeIsNotNull() {
+            addCriterion("CODE_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeEqualTo(String value) {
+            addCriterion("CODE_CODE =", value, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeNotEqualTo(String value) {
+            addCriterion("CODE_CODE <>", value, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeGreaterThan(String value) {
+            addCriterion("CODE_CODE >", value, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("CODE_CODE >=", value, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeLessThan(String value) {
+            addCriterion("CODE_CODE <", value, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeLessThanOrEqualTo(String value) {
+            addCriterion("CODE_CODE <=", value, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeLike(String value) {
+            addCriterion("CODE_CODE like", value, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeNotLike(String value) {
+            addCriterion("CODE_CODE not like", value, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeIn(List<String> values) {
+            addCriterion("CODE_CODE in", values, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeNotIn(List<String> values) {
+            addCriterion("CODE_CODE not in", values, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeBetween(String value1, String value2) {
+            addCriterion("CODE_CODE between", value1, value2, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCodeNotBetween(String value1, String value2) {
+            addCriterion("CODE_CODE not between", value1, value2, "codeCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeIsNull() {
+            addCriterion("CODE_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeIsNotNull() {
+            addCriterion("CODE_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeEqualTo(String value) {
+            addCriterion("CODE_TYPE =", value, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeNotEqualTo(String value) {
+            addCriterion("CODE_TYPE <>", value, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeGreaterThan(String value) {
+            addCriterion("CODE_TYPE >", value, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("CODE_TYPE >=", value, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeLessThan(String value) {
+            addCriterion("CODE_TYPE <", value, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeLessThanOrEqualTo(String value) {
+            addCriterion("CODE_TYPE <=", value, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeLike(String value) {
+            addCriterion("CODE_TYPE like", value, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeNotLike(String value) {
+            addCriterion("CODE_TYPE not like", value, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeIn(List<String> values) {
+            addCriterion("CODE_TYPE in", values, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeNotIn(List<String> values) {
+            addCriterion("CODE_TYPE not in", values, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeBetween(String value1, String value2) {
+            addCriterion("CODE_TYPE between", value1, value2, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTypeNotBetween(String value1, String value2) {
+            addCriterion("CODE_TYPE not between", value1, value2, "codeType");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIsNull() {
+            addCriterion("ORDER_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIsNotNull() {
+            addCriterion("ORDER_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoEqualTo(String value) {
+            addCriterion("ORDER_NO =", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotEqualTo(String value) {
+            addCriterion("ORDER_NO <>", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoGreaterThan(String value) {
+            addCriterion("ORDER_NO >", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoGreaterThanOrEqualTo(String value) {
+            addCriterion("ORDER_NO >=", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLessThan(String value) {
+            addCriterion("ORDER_NO <", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLessThanOrEqualTo(String value) {
+            addCriterion("ORDER_NO <=", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLike(String value) {
+            addCriterion("ORDER_NO like", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotLike(String value) {
+            addCriterion("ORDER_NO not like", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIn(List<String> values) {
+            addCriterion("ORDER_NO in", values, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotIn(List<String> values) {
+            addCriterion("ORDER_NO not in", values, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoBetween(String value1, String value2) {
+            addCriterion("ORDER_NO between", value1, value2, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotBetween(String value1, String value2) {
+            addCriterion("ORDER_NO not between", value1, value2, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameIsNull() {
+            addCriterion("CODE_CNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameIsNotNull() {
+            addCriterion("CODE_CNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameEqualTo(String value) {
+            addCriterion("CODE_CNAME =", value, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameNotEqualTo(String value) {
+            addCriterion("CODE_CNAME <>", value, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameGreaterThan(String value) {
+            addCriterion("CODE_CNAME >", value, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameGreaterThanOrEqualTo(String value) {
+            addCriterion("CODE_CNAME >=", value, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameLessThan(String value) {
+            addCriterion("CODE_CNAME <", value, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameLessThanOrEqualTo(String value) {
+            addCriterion("CODE_CNAME <=", value, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameLike(String value) {
+            addCriterion("CODE_CNAME like", value, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameNotLike(String value) {
+            addCriterion("CODE_CNAME not like", value, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameIn(List<String> values) {
+            addCriterion("CODE_CNAME in", values, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameNotIn(List<String> values) {
+            addCriterion("CODE_CNAME not in", values, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameBetween(String value1, String value2) {
+            addCriterion("CODE_CNAME between", value1, value2, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeCnameNotBetween(String value1, String value2) {
+            addCriterion("CODE_CNAME not between", value1, value2, "codeCname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameIsNull() {
+            addCriterion("CODE_ENAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameIsNotNull() {
+            addCriterion("CODE_ENAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameEqualTo(String value) {
+            addCriterion("CODE_ENAME =", value, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameNotEqualTo(String value) {
+            addCriterion("CODE_ENAME <>", value, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameGreaterThan(String value) {
+            addCriterion("CODE_ENAME >", value, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameGreaterThanOrEqualTo(String value) {
+            addCriterion("CODE_ENAME >=", value, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameLessThan(String value) {
+            addCriterion("CODE_ENAME <", value, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameLessThanOrEqualTo(String value) {
+            addCriterion("CODE_ENAME <=", value, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameLike(String value) {
+            addCriterion("CODE_ENAME like", value, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameNotLike(String value) {
+            addCriterion("CODE_ENAME not like", value, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameIn(List<String> values) {
+            addCriterion("CODE_ENAME in", values, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameNotIn(List<String> values) {
+            addCriterion("CODE_ENAME not in", values, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameBetween(String value1, String value2) {
+            addCriterion("CODE_ENAME between", value1, value2, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeEnameNotBetween(String value1, String value2) {
+            addCriterion("CODE_ENAME not between", value1, value2, "codeEname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameIsNull() {
+            addCriterion("CODE_TNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameIsNotNull() {
+            addCriterion("CODE_TNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameEqualTo(String value) {
+            addCriterion("CODE_TNAME =", value, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameNotEqualTo(String value) {
+            addCriterion("CODE_TNAME <>", value, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameGreaterThan(String value) {
+            addCriterion("CODE_TNAME >", value, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameGreaterThanOrEqualTo(String value) {
+            addCriterion("CODE_TNAME >=", value, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameLessThan(String value) {
+            addCriterion("CODE_TNAME <", value, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameLessThanOrEqualTo(String value) {
+            addCriterion("CODE_TNAME <=", value, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameLike(String value) {
+            addCriterion("CODE_TNAME like", value, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameNotLike(String value) {
+            addCriterion("CODE_TNAME not like", value, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameIn(List<String> values) {
+            addCriterion("CODE_TNAME in", values, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameNotIn(List<String> values) {
+            addCriterion("CODE_TNAME not in", values, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameBetween(String value1, String value2) {
+            addCriterion("CODE_TNAME between", value1, value2, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCodeTnameNotBetween(String value1, String value2) {
+            addCriterion("CODE_TNAME not between", value1, value2, "codeTname");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(String value) {
+            addCriterion("STATE =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(String value) {
+            addCriterion("STATE <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(String value) {
+            addCriterion("STATE >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(String value) {
+            addCriterion("STATE >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(String value) {
+            addCriterion("STATE <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(String value) {
+            addCriterion("STATE <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLike(String value) {
+            addCriterion("STATE like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotLike(String value) {
+            addCriterion("STATE not like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<String> values) {
+            addCriterion("STATE in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<String> values) {
+            addCriterion("STATE not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(String value1, String value2) {
+            addCriterion("STATE between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(String value1, String value2) {
+            addCriterion("STATE not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkIsNull() {
+            addCriterion("UPDATE_REMARK is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkIsNotNull() {
+            addCriterion("UPDATE_REMARK is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkEqualTo(String value) {
+            addCriterion("UPDATE_REMARK =", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotEqualTo(String value) {
+            addCriterion("UPDATE_REMARK <>", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkGreaterThan(String value) {
+            addCriterion("UPDATE_REMARK >", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_REMARK >=", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkLessThan(String value) {
+            addCriterion("UPDATE_REMARK <", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_REMARK <=", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkLike(String value) {
+            addCriterion("UPDATE_REMARK like", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotLike(String value) {
+            addCriterion("UPDATE_REMARK not like", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkIn(List<String> values) {
+            addCriterion("UPDATE_REMARK in", values, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotIn(List<String> values) {
+            addCriterion("UPDATE_REMARK not in", values, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkBetween(String value1, String value2) {
+            addCriterion("UPDATE_REMARK between", value1, value2, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_REMARK not between", value1, value2, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaIsNull() {
+            addCriterion("BUSINESS_AREA is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaIsNotNull() {
+            addCriterion("BUSINESS_AREA is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaEqualTo(String value) {
+            addCriterion("BUSINESS_AREA =", value, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaNotEqualTo(String value) {
+            addCriterion("BUSINESS_AREA <>", value, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaGreaterThan(String value) {
+            addCriterion("BUSINESS_AREA >", value, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaGreaterThanOrEqualTo(String value) {
+            addCriterion("BUSINESS_AREA >=", value, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaLessThan(String value) {
+            addCriterion("BUSINESS_AREA <", value, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaLessThanOrEqualTo(String value) {
+            addCriterion("BUSINESS_AREA <=", value, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaLike(String value) {
+            addCriterion("BUSINESS_AREA like", value, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaNotLike(String value) {
+            addCriterion("BUSINESS_AREA not like", value, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaIn(List<String> values) {
+            addCriterion("BUSINESS_AREA in", values, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaNotIn(List<String> values) {
+            addCriterion("BUSINESS_AREA not in", values, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaBetween(String value1, String value2) {
+            addCriterion("BUSINESS_AREA between", value1, value2, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andBusinessAreaNotBetween(String value1, String value2) {
+            addCriterion("BUSINESS_AREA not between", value1, value2, "businessArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNull() {
+            addCriterion("BRANCH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNotNull() {
+            addCriterion("BRANCH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdEqualTo(String value) {
+            addCriterion("BRANCH_ID =", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotEqualTo(String value) {
+            addCriterion("BRANCH_ID <>", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThan(String value) {
+            addCriterion("BRANCH_ID >", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID >=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThan(String value) {
+            addCriterion("BRANCH_ID <", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID <=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLike(String value) {
+            addCriterion("BRANCH_ID like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotLike(String value) {
+            addCriterion("BRANCH_ID not like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIn(List<String> values) {
+            addCriterion("BRANCH_ID in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotIn(List<String> values) {
+            addCriterion("BRANCH_ID not in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID not between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table base_code
+     *
+     * @mbggenerated do_not_delete_during_merge Tue Jul 24 14:33:59 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryChannel.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryChannel.java
new file mode 100644
index 000000000..1c85b2669
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryChannel.java
@@ -0,0 +1,273 @@
+package com.ruoyi.content.domain;
+
+public class GalleryChannel {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.ID
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.PIC_ID
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private Integer picId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.SPECIAL
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String special;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.CHANNEL_ID
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String channelId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.STATE
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String state;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.CREATE_DATE
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.CREATE_TIME
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.COMPANY_ID
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_channel.BRANCH_ID
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    private String branchId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.ID
+     *
+     * @return the value of gallery_channel.ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.ID
+     *
+     * @param id the value for gallery_channel.ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.PIC_ID
+     *
+     * @return the value of gallery_channel.PIC_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public Integer getPicId() {
+        return picId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.PIC_ID
+     *
+     * @param picId the value for gallery_channel.PIC_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setPicId(Integer picId) {
+        this.picId = picId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.SPECIAL
+     *
+     * @return the value of gallery_channel.SPECIAL
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getSpecial() {
+        return special;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.SPECIAL
+     *
+     * @param special the value for gallery_channel.SPECIAL
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setSpecial(String special) {
+        this.special = special;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.CHANNEL_ID
+     *
+     * @return the value of gallery_channel.CHANNEL_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getChannelId() {
+        return channelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.CHANNEL_ID
+     *
+     * @param channelId the value for gallery_channel.CHANNEL_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setChannelId(String channelId) {
+        this.channelId = channelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.STATE
+     *
+     * @return the value of gallery_channel.STATE
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.STATE
+     *
+     * @param state the value for gallery_channel.STATE
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.CREATE_DATE
+     *
+     * @return the value of gallery_channel.CREATE_DATE
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.CREATE_DATE
+     *
+     * @param createDate the value for gallery_channel.CREATE_DATE
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.CREATE_TIME
+     *
+     * @return the value of gallery_channel.CREATE_TIME
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.CREATE_TIME
+     *
+     * @param createTime the value for gallery_channel.CREATE_TIME
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.COMPANY_ID
+     *
+     * @return the value of gallery_channel.COMPANY_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.COMPANY_ID
+     *
+     * @param companyId the value for gallery_channel.COMPANY_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_channel.BRANCH_ID
+     *
+     * @return the value of gallery_channel.BRANCH_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getBranchId() {
+        return branchId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_channel.BRANCH_ID
+     *
+     * @param branchId the value for gallery_channel.BRANCH_ID
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setBranchId(String branchId) {
+        this.branchId = branchId;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryChannelExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryChannelExample.java
new file mode 100644
index 000000000..59803b872
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryChannelExample.java
@@ -0,0 +1,912 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GalleryChannelExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public GalleryChannelExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdIsNull() {
+            addCriterion("PIC_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdIsNotNull() {
+            addCriterion("PIC_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdEqualTo(Integer value) {
+            addCriterion("PIC_ID =", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdNotEqualTo(Integer value) {
+            addCriterion("PIC_ID <>", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdGreaterThan(Integer value) {
+            addCriterion("PIC_ID >", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("PIC_ID >=", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdLessThan(Integer value) {
+            addCriterion("PIC_ID <", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdLessThanOrEqualTo(Integer value) {
+            addCriterion("PIC_ID <=", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdIn(List<Integer> values) {
+            addCriterion("PIC_ID in", values, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdNotIn(List<Integer> values) {
+            addCriterion("PIC_ID not in", values, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdBetween(Integer value1, Integer value2) {
+            addCriterion("PIC_ID between", value1, value2, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("PIC_ID not between", value1, value2, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIsNull() {
+            addCriterion("SPECIAL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIsNotNull() {
+            addCriterion("SPECIAL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialEqualTo(String value) {
+            addCriterion("SPECIAL =", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotEqualTo(String value) {
+            addCriterion("SPECIAL <>", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialGreaterThan(String value) {
+            addCriterion("SPECIAL >", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialGreaterThanOrEqualTo(String value) {
+            addCriterion("SPECIAL >=", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLessThan(String value) {
+            addCriterion("SPECIAL <", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLessThanOrEqualTo(String value) {
+            addCriterion("SPECIAL <=", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLike(String value) {
+            addCriterion("SPECIAL like", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotLike(String value) {
+            addCriterion("SPECIAL not like", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIn(List<String> values) {
+            addCriterion("SPECIAL in", values, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotIn(List<String> values) {
+            addCriterion("SPECIAL not in", values, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialBetween(String value1, String value2) {
+            addCriterion("SPECIAL between", value1, value2, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotBetween(String value1, String value2) {
+            addCriterion("SPECIAL not between", value1, value2, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIsNull() {
+            addCriterion("CHANNEL_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIsNotNull() {
+            addCriterion("CHANNEL_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdEqualTo(String value) {
+            addCriterion("CHANNEL_ID =", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotEqualTo(String value) {
+            addCriterion("CHANNEL_ID <>", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThan(String value) {
+            addCriterion("CHANNEL_ID >", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThanOrEqualTo(String value) {
+            addCriterion("CHANNEL_ID >=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThan(String value) {
+            addCriterion("CHANNEL_ID <", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThanOrEqualTo(String value) {
+            addCriterion("CHANNEL_ID <=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLike(String value) {
+            addCriterion("CHANNEL_ID like", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotLike(String value) {
+            addCriterion("CHANNEL_ID not like", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIn(List<String> values) {
+            addCriterion("CHANNEL_ID in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotIn(List<String> values) {
+            addCriterion("CHANNEL_ID not in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdBetween(String value1, String value2) {
+            addCriterion("CHANNEL_ID between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotBetween(String value1, String value2) {
+            addCriterion("CHANNEL_ID not between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(String value) {
+            addCriterion("STATE =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(String value) {
+            addCriterion("STATE <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(String value) {
+            addCriterion("STATE >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(String value) {
+            addCriterion("STATE >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(String value) {
+            addCriterion("STATE <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(String value) {
+            addCriterion("STATE <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLike(String value) {
+            addCriterion("STATE like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotLike(String value) {
+            addCriterion("STATE not like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<String> values) {
+            addCriterion("STATE in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<String> values) {
+            addCriterion("STATE not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(String value1, String value2) {
+            addCriterion("STATE between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(String value1, String value2) {
+            addCriterion("STATE not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNull() {
+            addCriterion("BRANCH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNotNull() {
+            addCriterion("BRANCH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdEqualTo(String value) {
+            addCriterion("BRANCH_ID =", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotEqualTo(String value) {
+            addCriterion("BRANCH_ID <>", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThan(String value) {
+            addCriterion("BRANCH_ID >", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID >=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThan(String value) {
+            addCriterion("BRANCH_ID <", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID <=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLike(String value) {
+            addCriterion("BRANCH_ID like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotLike(String value) {
+            addCriterion("BRANCH_ID not like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIn(List<String> values) {
+            addCriterion("BRANCH_ID in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotIn(List<String> values) {
+            addCriterion("BRANCH_ID not in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID not between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gallery_channel
+     *
+     * @mbggenerated do_not_delete_during_merge Wed Sep 19 10:35:12 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryDTO.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryDTO.java
new file mode 100644
index 000000000..0a3b3cf6b
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryDTO.java
@@ -0,0 +1,80 @@
+package com.ruoyi.content.domain;
+
+import java.util.List;
+
+public class GalleryDTO {
+
+    private Integer picId;
+    private String imgUrl;
+    private String picAdId;
+    private String companyId;
+    private String picState;
+    private List<String> codeName;
+    private String createDate;
+    private String createTime;
+
+    public Integer getPicId() {
+        return picId;
+    }
+
+    public void setPicId(Integer picId) {
+        this.picId = picId;
+    }
+
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    public String getPicAdId() {
+        return picAdId;
+    }
+
+    public void setPicAdId(String picAdId) {
+        this.picAdId = picAdId;
+    }
+
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    public String getPicState() {
+        return picState;
+    }
+
+    public void setPicState(String picState) {
+        this.picState = picState;
+    }
+
+    public List<String> getCodeName() {
+        return codeName;
+    }
+
+    public void setCodeName(List<String> codeName) {
+        this.codeName = codeName;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfo.java
new file mode 100644
index 000000000..3b6f2614e
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfo.java
@@ -0,0 +1,333 @@
+package com.ruoyi.content.domain;
+
+public class GalleryPicInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.PIC_ID
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private Integer picId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.IMG_URL
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String imgUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.PIC_AD_ID
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String picAdId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.PIC_STATE
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String picState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.COMPANY_ID
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.CREATE_DATE
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.CREATE_TIME
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.CREATE_USER
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.UPDATE_DATE
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.UPDATE_TIME
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column gallery_pic_info.BRANCH_ID
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    private String branchId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.PIC_ID
+     *
+     * @return the value of gallery_pic_info.PIC_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public Integer getPicId() {
+        return picId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.PIC_ID
+     *
+     * @param picId the value for gallery_pic_info.PIC_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setPicId(Integer picId) {
+        this.picId = picId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.IMG_URL
+     *
+     * @return the value of gallery_pic_info.IMG_URL
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getImgUrl() {
+        return imgUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.IMG_URL
+     *
+     * @param imgUrl the value for gallery_pic_info.IMG_URL
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setImgUrl(String imgUrl) {
+        this.imgUrl = imgUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.PIC_AD_ID
+     *
+     * @return the value of gallery_pic_info.PIC_AD_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getPicAdId() {
+        return picAdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.PIC_AD_ID
+     *
+     * @param picAdId the value for gallery_pic_info.PIC_AD_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setPicAdId(String picAdId) {
+        this.picAdId = picAdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.PIC_STATE
+     *
+     * @return the value of gallery_pic_info.PIC_STATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getPicState() {
+        return picState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.PIC_STATE
+     *
+     * @param picState the value for gallery_pic_info.PIC_STATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setPicState(String picState) {
+        this.picState = picState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.COMPANY_ID
+     *
+     * @return the value of gallery_pic_info.COMPANY_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.COMPANY_ID
+     *
+     * @param companyId the value for gallery_pic_info.COMPANY_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.CREATE_DATE
+     *
+     * @return the value of gallery_pic_info.CREATE_DATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.CREATE_DATE
+     *
+     * @param createDate the value for gallery_pic_info.CREATE_DATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.CREATE_TIME
+     *
+     * @return the value of gallery_pic_info.CREATE_TIME
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.CREATE_TIME
+     *
+     * @param createTime the value for gallery_pic_info.CREATE_TIME
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.CREATE_USER
+     *
+     * @return the value of gallery_pic_info.CREATE_USER
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.CREATE_USER
+     *
+     * @param createUser the value for gallery_pic_info.CREATE_USER
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.UPDATE_DATE
+     *
+     * @return the value of gallery_pic_info.UPDATE_DATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.UPDATE_DATE
+     *
+     * @param updateDate the value for gallery_pic_info.UPDATE_DATE
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.UPDATE_TIME
+     *
+     * @return the value of gallery_pic_info.UPDATE_TIME
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.UPDATE_TIME
+     *
+     * @param updateTime the value for gallery_pic_info.UPDATE_TIME
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column gallery_pic_info.BRANCH_ID
+     *
+     * @return the value of gallery_pic_info.BRANCH_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getBranchId() {
+        return branchId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column gallery_pic_info.BRANCH_ID
+     *
+     * @param branchId the value for gallery_pic_info.BRANCH_ID
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setBranchId(String branchId) {
+        this.branchId = branchId;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfoExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfoExample.java
new file mode 100644
index 000000000..9c30c16a3
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfoExample.java
@@ -0,0 +1,1062 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GalleryPicInfoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public GalleryPicInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andPicIdIsNull() {
+            addCriterion("PIC_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdIsNotNull() {
+            addCriterion("PIC_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdEqualTo(Integer value) {
+            addCriterion("PIC_ID =", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdNotEqualTo(Integer value) {
+            addCriterion("PIC_ID <>", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdGreaterThan(Integer value) {
+            addCriterion("PIC_ID >", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("PIC_ID >=", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdLessThan(Integer value) {
+            addCriterion("PIC_ID <", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdLessThanOrEqualTo(Integer value) {
+            addCriterion("PIC_ID <=", value, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdIn(List<Integer> values) {
+            addCriterion("PIC_ID in", values, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdNotIn(List<Integer> values) {
+            addCriterion("PIC_ID not in", values, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdBetween(Integer value1, Integer value2) {
+            addCriterion("PIC_ID between", value1, value2, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("PIC_ID not between", value1, value2, "picId");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlIsNull() {
+            addCriterion("IMG_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlIsNotNull() {
+            addCriterion("IMG_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlEqualTo(String value) {
+            addCriterion("IMG_URL =", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotEqualTo(String value) {
+            addCriterion("IMG_URL <>", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlGreaterThan(String value) {
+            addCriterion("IMG_URL >", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("IMG_URL >=", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLessThan(String value) {
+            addCriterion("IMG_URL <", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLessThanOrEqualTo(String value) {
+            addCriterion("IMG_URL <=", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlLike(String value) {
+            addCriterion("IMG_URL like", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotLike(String value) {
+            addCriterion("IMG_URL not like", value, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlIn(List<String> values) {
+            addCriterion("IMG_URL in", values, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotIn(List<String> values) {
+            addCriterion("IMG_URL not in", values, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlBetween(String value1, String value2) {
+            addCriterion("IMG_URL between", value1, value2, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andImgUrlNotBetween(String value1, String value2) {
+            addCriterion("IMG_URL not between", value1, value2, "imgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdIsNull() {
+            addCriterion("PIC_AD_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdIsNotNull() {
+            addCriterion("PIC_AD_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdEqualTo(String value) {
+            addCriterion("PIC_AD_ID =", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdNotEqualTo(String value) {
+            addCriterion("PIC_AD_ID <>", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdGreaterThan(String value) {
+            addCriterion("PIC_AD_ID >", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_ID >=", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdLessThan(String value) {
+            addCriterion("PIC_AD_ID <", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdLessThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_ID <=", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdLike(String value) {
+            addCriterion("PIC_AD_ID like", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdNotLike(String value) {
+            addCriterion("PIC_AD_ID not like", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdIn(List<String> values) {
+            addCriterion("PIC_AD_ID in", values, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdNotIn(List<String> values) {
+            addCriterion("PIC_AD_ID not in", values, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdBetween(String value1, String value2) {
+            addCriterion("PIC_AD_ID between", value1, value2, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdNotBetween(String value1, String value2) {
+            addCriterion("PIC_AD_ID not between", value1, value2, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateIsNull() {
+            addCriterion("PIC_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateIsNotNull() {
+            addCriterion("PIC_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateEqualTo(String value) {
+            addCriterion("PIC_STATE =", value, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateNotEqualTo(String value) {
+            addCriterion("PIC_STATE <>", value, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateGreaterThan(String value) {
+            addCriterion("PIC_STATE >", value, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateGreaterThanOrEqualTo(String value) {
+            addCriterion("PIC_STATE >=", value, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateLessThan(String value) {
+            addCriterion("PIC_STATE <", value, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateLessThanOrEqualTo(String value) {
+            addCriterion("PIC_STATE <=", value, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateLike(String value) {
+            addCriterion("PIC_STATE like", value, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateNotLike(String value) {
+            addCriterion("PIC_STATE not like", value, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateIn(List<String> values) {
+            addCriterion("PIC_STATE in", values, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateNotIn(List<String> values) {
+            addCriterion("PIC_STATE not in", values, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateBetween(String value1, String value2) {
+            addCriterion("PIC_STATE between", value1, value2, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicStateNotBetween(String value1, String value2) {
+            addCriterion("PIC_STATE not between", value1, value2, "picState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNull() {
+            addCriterion("BRANCH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNotNull() {
+            addCriterion("BRANCH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdEqualTo(String value) {
+            addCriterion("BRANCH_ID =", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotEqualTo(String value) {
+            addCriterion("BRANCH_ID <>", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThan(String value) {
+            addCriterion("BRANCH_ID >", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID >=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThan(String value) {
+            addCriterion("BRANCH_ID <", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID <=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLike(String value) {
+            addCriterion("BRANCH_ID like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotLike(String value) {
+            addCriterion("BRANCH_ID not like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIn(List<String> values) {
+            addCriterion("BRANCH_ID in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotIn(List<String> values) {
+            addCriterion("BRANCH_ID not in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID not between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated do_not_delete_during_merge Thu Sep 20 09:57:29 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeMapper.java
new file mode 100644
index 000000000..af1f773c3
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.BaseCode;
+import com.ruoyi.content.domain.BaseCodeExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface BaseCodeMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    int countByExample(BaseCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    int deleteByExample(BaseCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:33:59 CST 2018
+     */
+    int insert(BaseCode record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    int insertSelective(BaseCode record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    List<BaseCode> selectByExample(BaseCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    BaseCode selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") BaseCode record, @Param("example") BaseCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    int updateByExample(@Param("record") BaseCode record, @Param("example") BaseCodeExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    int updateByPrimaryKeySelective(BaseCode record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table base_code
+     *
+     * @mbggenerated Tue Jul 24 14:34:00 CST 2018
+     */
+    int updateByPrimaryKey(BaseCode record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryChannelMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryChannelMapper.java
new file mode 100644
index 000000000..d89300745
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryChannelMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.GalleryChannel;
+import com.ruoyi.content.domain.GalleryChannelExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface GalleryChannelMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int countByExample(GalleryChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int deleteByExample(GalleryChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int insert(GalleryChannel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int insertSelective(GalleryChannel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    List<GalleryChannel> selectByExample(GalleryChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    GalleryChannel selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") GalleryChannel record, @Param("example") GalleryChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int updateByExample(@Param("record") GalleryChannel record, @Param("example") GalleryChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int updateByPrimaryKeySelective(GalleryChannel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_channel
+     *
+     * @mbggenerated Wed Sep 19 10:35:12 CST 2018
+     */
+    int updateByPrimaryKey(GalleryChannel record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryPicInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryPicInfoMapper.java
new file mode 100644
index 000000000..57f19025a
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryPicInfoMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.GalleryPicInfo;
+import com.ruoyi.content.domain.GalleryPicInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface GalleryPicInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int countByExample(GalleryPicInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int deleteByExample(GalleryPicInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int deleteByPrimaryKey(Integer picId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int insert(GalleryPicInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int insertSelective(GalleryPicInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    List<GalleryPicInfo> selectByExample(GalleryPicInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    GalleryPicInfo selectByPrimaryKey(Integer picId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") GalleryPicInfo record, @Param("example") GalleryPicInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int updateByExample(@Param("record") GalleryPicInfo record, @Param("example") GalleryPicInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int updateByPrimaryKeySelective(GalleryPicInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table gallery_pic_info
+     *
+     * @mbggenerated Thu Sep 20 09:57:29 CST 2018
+     */
+    int updateByPrimaryKey(GalleryPicInfo record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryQueryMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryQueryMapper.java
new file mode 100644
index 000000000..3cfb4b4a8
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryQueryMapper.java
@@ -0,0 +1,20 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.GalleryPicInfo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface GalleryQueryMapper {
+
+    public List<GalleryPicInfo> selectAllWithLimit(@Param(value = "companyId") String companyId, @Param(value = "branchId") String branchId,
+                                                   @Param(value = "picState") List<String> picState, @Param(value = "picId") List<Integer> picId,
+                                                   @Param(value = "startRow") int startRow, @Param(value = "rows") int rows);
+
+    public List<String> selectChannelId(@Param(value = "picId") Integer picId);
+
+    public List<GalleryPicInfo> selectAllPicInfo(@Param(value = "companyId") String companyId, @Param(value = "branchId") String branchId,
+                                                 @Param(value = "picState") List<String> picState, @Param(value = "picId") List<Integer> picId);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/message/Message.java b/ruoyi-content/src/main/java/com/ruoyi/content/message/Message.java
new file mode 100644
index 000000000..0f092d768
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/message/Message.java
@@ -0,0 +1,48 @@
+package com.ruoyi.content.message;
+
+public class Message {
+
+    private boolean result;//结果
+    private String info;//消息
+    private Object object;
+
+    public Message() {
+
+    }
+
+    public Message(boolean reslut, String info) {
+        setInfo(info);
+        setResult(reslut);
+    }
+
+    public Message(boolean reslut, String info, Object object) {
+        setInfo(info);
+        setResult(reslut);
+        setObject(object);
+    }
+
+    public boolean getResult() {
+        return result;
+    }
+
+    public void setResult(boolean result) {
+        this.result = result;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public Object getObject() {
+        return object;
+    }
+
+    public void setObject(Object object) {
+        this.object = object;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/GalleryService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/GalleryService.java
new file mode 100644
index 000000000..a694f79ba
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/GalleryService.java
@@ -0,0 +1,64 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.GalleryDTO;
+import com.ruoyi.content.message.Message;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+public interface GalleryService {
+
+
+    /**
+     * 图片上传
+     *
+     * @param file
+     * @param picAdId
+     * @return
+     */
+    public Message addGalleryImg(MultipartFile file, String picAdId);
+
+    /**
+     * 图库列表
+     *
+     * @param channelId
+     * @param picState
+     * @return
+     */
+    public List<GalleryDTO> galleryImgList(int startRow, int rows, String channelId, String picState, String special);
+
+    /**
+     * 图片个数
+     *
+     * @param channelId
+     * @param picState
+     * @return
+     */
+    public int countGalleryPicInfoByState(String channelId, String picState);
+
+    /**
+     * 图片图库录入
+     *
+     * @param channelId
+     * @param picId
+     * @return
+     */
+    public Message addGallery(String channelId, String picId);
+
+    /**
+     * 图库栏目下图片删除
+     *
+     * @param ids
+     * @param channelId
+     * @return
+     */
+    public Message delGallery(String ids, String channelId);
+
+    /**
+     * 图片删除
+     *
+     * @param ids
+     * @return
+     */
+    public Message delGalleryPic(String ids);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/GalleryServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/GalleryServiceImpl.java
new file mode 100644
index 000000000..2e46cac76
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/GalleryServiceImpl.java
@@ -0,0 +1,403 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.content.constants.PropertiesConstants;
+import com.ruoyi.content.domain.*;
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.exception.ParameterException;
+import com.ruoyi.content.mapper.BaseCodeMapper;
+import com.ruoyi.content.mapper.GalleryChannelMapper;
+import com.ruoyi.content.mapper.GalleryPicInfoMapper;
+import com.ruoyi.content.mapper.GalleryQueryMapper;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.redis.RedisManager;
+import com.ruoyi.content.service.GalleryService;
+import com.ruoyi.content.utils.ImgCompress;
+import com.ruoyi.content.utils.JsonUtil;
+import com.ruoyi.content.utils.OSSUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import javax.imageio.stream.ImageOutputStream;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class GalleryServiceImpl implements GalleryService {
+
+    private final static Logger LOGGER = LoggerFactory.getLogger(GalleryServiceImpl.class);
+
+    @Autowired
+    private GalleryPicInfoMapper galleryInfoMapper;
+    @Autowired
+    private GalleryQueryMapper galleryQueryMapper;
+    @Autowired
+    private GalleryChannelMapper galleryChannelMapper;
+    @Autowired
+    private RedisManager redisManager;
+    @Autowired
+    private BaseCodeMapper baseCodeMapper;
+
+    /**
+     * 将图库图片保存到OSS
+     */
+    @Override
+    public Message addGalleryImg(MultipartFile file, String picAdId) {
+        LOGGER.info("上传图片业务层开始");
+        Message msg = new Message(true, "上传图片成功");
+        // 公司id
+        String companyId = "1";
+        String branchId = "86";
+        try {
+            // 文件名
+            String fileName = file.getOriginalFilename();
+            // 文件后缀
+            String ext = fileName.substring(fileName.lastIndexOf("."));
+            String fileTime = DateUtils.getMillisecond();
+            // OSS保存路径
+            fileName = PropertiesConstants.GALLERY_IMG_PATH + fileTime + ext;
+            String flag = OSSUtil.uploadFileByInputStream(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID, PropertiesConstants.OSSKEY,
+                    PropertiesConstants.BUCKETNAME, file.getInputStream(), PropertiesConstants.OSSPATH + fileName);
+            byte[] bytes = null;
+            InputStream inStream = file.getInputStream();
+            BufferedImage read = ImageIO.read(inStream);
+            int width = read.getWidth();
+            int height = read.getHeight();
+            LOGGER.info("图片高度为height【{}】", height);
+            if (height > 2000) {
+                LOGGER.info("图片为长图进行剪切");
+                BufferedImage sub = read.getSubimage(0, 0, width, 2000);
+                ByteArrayOutputStream bStream = new ByteArrayOutputStream();
+                ImageOutputStream imgOut = ImageIO.createImageOutputStream(bStream);
+                String formatName = fileName.substring(fileName.lastIndexOf(".") + 1);
+                LOGGER.info("图片格式为formatName【{}】", formatName);
+                boolean writeFlag = ImageIO.write(sub, formatName, imgOut);
+                if (writeFlag) {
+                    inStream = new ByteArrayInputStream(bStream.toByteArray());
+                } else {
+                    LOGGER.info("图片剪切失败");
+                }
+                ImgCompress compress = new ImgCompress(inStream);
+                bytes = compress.resize(320, 800);
+            } else {
+                ImgCompress compress = new ImgCompress(file.getInputStream());
+                bytes = compress.resize(320, 516);
+            }
+
+            InputStream ins = new ByteArrayInputStream(bytes);
+            String minImgUrl = PropertiesConstants.GALLERY_MINIMG_PATH + fileTime + ext;// OSS保存路径
+            String flag2 = OSSUtil.uploadFileByInputStream(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID, PropertiesConstants.OSSKEY,
+                    PropertiesConstants.BUCKETNAME, ins, PropertiesConstants.OSSPATH + minImgUrl);
+            if (null == flag || flag.equals("false") || flag2 == null || flag2.equals("false")) {
+                LOGGER.info("新增图库信息,图片上传OSS发生异常");
+                msg.setInfo("新增图库信息,图片上传异常");
+                msg.setResult(false);
+            } else {
+                GalleryPicInfo galleryInfo = new GalleryPicInfo();
+                String createDate = DateUtils.getDate();
+                String createTime = DateUtils.getTimeNow();
+                galleryInfo.setPicId(null);
+                galleryInfo.setImgUrl(PropertiesConstants.OSS_URL + PropertiesConstants.OSSPATH + minImgUrl);
+                if (StringUtils.isNotBlank(picAdId)) {
+                    galleryInfo.setPicAdId(picAdId);
+                }
+                galleryInfo.setPicState("0");
+                galleryInfo.setCompanyId(companyId);
+                galleryInfo.setCreateDate(createDate);
+                galleryInfo.setCreateTime(createTime);
+                galleryInfo.setBranchId(branchId);
+                LOGGER.info("数据库新增图库图片");
+                galleryInfoMapper.insertSelective(galleryInfo);
+            }
+        } catch (IOException e) {
+            LOGGER.info("上传图片失败【{}】", e.getMessage());
+            msg.setInfo("上传图片上传异常");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        LOGGER.info("上传图片业务层结束");
+        return msg;
+    }
+
+    @Override
+    public List<GalleryDTO> galleryImgList(int startRow, int rows, String channelId, String picState, String special) {
+        LOGGER.info("拿到的参数startRow【{}】，rows【{}】，所属栏目【{}】，图片状态【{}】", startRow, rows, channelId, picState);
+        String companyId = "1";// 公司id
+        String branchId = "86";
+        List<String> list = new ArrayList<String>();
+        List<Integer> picIds = new ArrayList<>();
+        if (StringUtils.isBlank(picState)) {
+            list.add("0");
+            list.add("1");
+        } else {
+            list.add(picState);
+        }
+
+        if (StringUtils.isBlank(channelId)) {
+            channelId = "";
+        } else {
+            LOGGER.info("所属分公司机构【{}】", branchId);
+            GalleryChannelExample example = new GalleryChannelExample();
+            example.isDistinct();
+//			example.createCriteria().andChannelIdEqualTo(channelId).andStateEqualTo("0").andBranchIdLike("%"+branchId+"%");
+            example.createCriteria().andSpecialEqualTo(special).andChannelIdEqualTo(channelId).andStateEqualTo("0").andBranchIdLike("%" + branchId + "%");
+            List<GalleryChannel> galleryChannels = galleryChannelMapper.selectByExample(example);
+            if (galleryChannels == null || galleryChannels.size() < 1) {
+                LOGGER.info("未查询到栏目【{}】数据", channelId);
+                throw new BusinessException("图库该栏目暂没有海报！");
+            }
+            for (GalleryChannel galleryChannel : galleryChannels) {
+                picIds.add(galleryChannel.getPicId());
+            }
+        }
+
+        List<GalleryPicInfo> galleryList = galleryQueryMapper.selectAllWithLimit(companyId, branchId, list, picIds, startRow, rows);
+        if (galleryList == null || galleryList.size() < 1) {
+            LOGGER.info("未查询到数据");
+            throw new BusinessException("图库暂没有海报！");
+        }
+
+        //所属二级栏目
+        List<GalleryDTO> galleryDTOs = new ArrayList<>();
+        for (GalleryPicInfo galleryPicInfo : galleryList) {
+            GalleryDTO galleryDTO = new GalleryDTO();
+            galleryDTO.setPicId(galleryPicInfo.getPicId());
+            galleryDTO.setImgUrl(galleryPicInfo.getImgUrl());
+            galleryDTO.setPicAdId(galleryPicInfo.getPicAdId());
+            galleryDTO.setPicState(galleryPicInfo.getPicState());
+            galleryDTO.setCompanyId(galleryPicInfo.getCompanyId());
+            galleryDTO.setCreateDate(galleryPicInfo.getCreateDate());
+            galleryDTO.setCreateTime(galleryPicInfo.getCreateTime());
+            LOGGER.info("图库数据【{}】", JsonUtil.objectToJackson(galleryDTO));
+            List<String> codeName = new ArrayList<>();
+//			List<String> channelIds = galleryQueryMapper.selectChannelId(galleryPicInfo.getPicId());
+//			for (String string : channelIds) {
+//				LOGGER.info("栏目id【{}】", string);
+//				BaseCodeExample example = new BaseCodeExample();
+//				BaseCodeExample.Criteria criteria = example.createCriteria();
+//				criteria.andCodeCodeEqualTo(string).andStateEqualTo("0").andCodeTypeEqualTo("GALLERY");
+
+            GalleryChannelExample channelexample = new GalleryChannelExample();
+            channelexample.createCriteria().andPicIdEqualTo(galleryPicInfo.getPicId()).andStateEqualTo("0");
+            List<GalleryChannel> galleryChannels = this.galleryChannelMapper.selectByExample(channelexample);
+            for (GalleryChannel galleryChannel : galleryChannels) {
+                LOGGER.info("栏目id【{}】", JsonUtil.objectToJackson(galleryChannel));
+                BaseCodeExample example = new BaseCodeExample();
+                BaseCodeExample.Criteria criteria = example.createCriteria();
+                criteria.andCodeCodeEqualTo(galleryChannel.getChannelId()).andStateEqualTo("0")
+                        .andCodeTypeEqualTo(galleryChannel.getSpecial());
+                List<BaseCode> baseCodes = this.baseCodeMapper.selectByExample(example);
+                LOGGER.info("栏目数据【{}】", JsonUtil.objectToJackson(baseCodes));
+                if ((baseCodes != null) && (baseCodes.size() > 0)) {
+                    codeName.add(((BaseCode) baseCodes.get(0)).getCodeCname());
+                }
+            }
+            galleryDTO.setCodeName(codeName);
+            galleryDTOs.add(galleryDTO);
+        }
+
+        return galleryDTOs;
+    }
+
+    @Override
+    public Message addGallery(String channelId, String picId) {
+        LOGGER.info("增加图库栏目关系的业务层方法开始！");
+        Message msg = new Message();
+        String companyId = "1";
+        String branchId = "86";
+
+        BaseCode baseCode = this.baseCodeMapper.selectByPrimaryKey(Integer.valueOf(channelId));
+        GalleryChannelExample example = new GalleryChannelExample();
+        example.createCriteria().andSpecialEqualTo(baseCode.getCodeType()).andChannelIdEqualTo(baseCode.getCodeCode())
+                .andPicIdEqualTo(Integer.valueOf(picId)).andStateEqualTo("0").andCompanyIdEqualTo(companyId);
+        List selectByExample = this.galleryChannelMapper.selectByExample(example);
+        if ((selectByExample != null) && (selectByExample.size() > 0)) {
+            LOGGER.info("添加图库关系失败,此海报已在栏目【{}】下展示", baseCode.getCodeCname());
+            msg.setInfo("此海报在该栏目下已存在！");
+            msg.setResult(false);
+            return msg;
+        }
+
+        GalleryChannel galleryChannel = new GalleryChannel();
+        String createDate = DateUtils.getDate();
+        String createTime = DateUtils.getTimeNow();
+        galleryChannel.setId(null);
+        galleryChannel.setPicId(Integer.valueOf(picId));
+//		galleryChannel.setChannelId(channelId);
+        galleryChannel.setChannelId(baseCode.getCodeCode());
+        galleryChannel.setCompanyId(companyId);
+        galleryChannel.setBranchId(branchId);
+        galleryChannel.setCreateDate(createDate);
+        galleryChannel.setCreateTime(createTime);
+//		galleryChannel.setSpecial("GALLERY");
+        galleryChannel.setSpecial(baseCode.getCodeType());
+        galleryChannel.setState("0");
+        if (galleryChannelMapper.insert(galleryChannel) > 0) {
+            msg.setInfo("添加成功！");
+            msg.setResult(true);
+            LOGGER.info("添加成功！");
+//			redisManager.delete("gallery_channel_"+galleryChannel.getChannelId());
+            this.redisManager.delete("gallery_channel_" + galleryChannel.getSpecial() + "_" + galleryChannel.getChannelId());
+            LOGGER.info("删除redis图库原有栏目关系成功！");
+        } else {
+            LOGGER.info("添加图库关系失败");
+//			msg.setInfo("添加关系失败！");
+            msg.setInfo("分配失败！");
+            msg.setResult(false);
+        }
+        LOGGER.info("增加文章栏目关系的业务层方法结束！");
+        return msg;
+    }
+
+    @Override
+    public Message delGallery(String channelId, String id) {
+        LOGGER.info("删除图库栏目关系的业务层方法开始！");
+        LOGGER.info("删除图库栏目关系的业务层方法中图片的id【{}】", id);
+        Message msg = new Message();
+        if (StringUtils.isBlank(id)) {
+            LOGGER.info("删除图库信息失败，缺少参数");
+            throw new ParameterException("未查询到图库信息");
+        }
+        msg.setInfo("删除失败！");
+        msg.setResult(false);
+        try {
+            String[] arrId = id.split(",");
+            for (String picId : arrId) {
+                if (StringUtils.isNotBlank(picId)) {
+                    GalleryChannelExample example = new GalleryChannelExample();
+                    example.createCriteria().andChannelIdEqualTo(channelId).andPicIdEqualTo(Integer.valueOf(picId)).andStateEqualTo("0");
+                    List<GalleryChannel> galleryChannels = galleryChannelMapper.selectByExample(example);
+                    GalleryChannel galleryChannel = galleryChannels.get(0);
+                    if (galleryChannel != null) {
+                        galleryChannel.setState("1");
+                        if (galleryChannelMapper.updateByPrimaryKey(galleryChannel) > 0) {
+                            msg.setInfo("删除成功！");
+                            msg.setResult(true);
+                            LOGGER.info("删除图库栏目关系成功！");
+//							redisManager.delete("gallery_channel_"+galleryChannel.getChannelId());
+                            this.redisManager.delete("gallery_channel_" + galleryChannel.getSpecial() + "_" + galleryChannel.getChannelId());
+                            LOGGER.info("删除redis图库栏目关系成功！");
+                        }
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            LOGGER.info("删除图库栏目关系失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除图库栏目关系失败，请稍候再试！");
+            msg.setResult(true);
+        }
+        LOGGER.info("删除图库栏目关系的业务层方法结束！");
+        return msg;
+    }
+
+    @Override
+    public int countGalleryPicInfoByState(String channelId, String picState) {
+        LOGGER.info("统计图片数量的业务层方法开始！");
+        String companyId = "1";// 管理员公司id
+        String branchId = "86";
+        LOGGER.info("统计图片数量的业务层方法中拿到的 所属栏目【{}】、文章状态【{}】", channelId, picState);
+        List<String> list = new ArrayList<String>();
+        List<Integer> picIds = new ArrayList<>();
+        if (StringUtils.isBlank(picState)) {
+            list.add("0");
+            list.add("1");
+        } else {
+            list.add(picState);
+        }
+        if (StringUtils.isBlank(channelId)) {
+            channelId = "";
+        } else {
+            GalleryChannelExample example = new GalleryChannelExample();
+            example.isDistinct();
+            example.createCriteria().andChannelIdEqualTo(channelId).andStateEqualTo("0").andBranchIdLike("%" + branchId + "%");
+            List<GalleryChannel> galleryChannels = galleryChannelMapper.selectByExample(example);
+            if (galleryChannels == null || galleryChannels.size() < 1) {
+                LOGGER.info("未查询到栏目【{}】数据", channelId);
+                throw new BusinessException("图库该栏目暂没有海报！");
+            }
+            for (GalleryChannel galleryChannel : galleryChannels) {
+                picIds.add(galleryChannel.getPicId());
+            }
+        }
+
+        List<GalleryPicInfo> galleryList = null;
+        try {
+            galleryList = galleryQueryMapper.selectAllPicInfo(companyId, branchId, list, picIds);
+            if (galleryList == null || galleryList.size() < 1) {
+                LOGGER.info("根据公司查询图片，未查询到数据companyId【{}】,branchId【{}】", companyId, branchId);
+                return 0;
+            }
+        } catch (Exception e) {
+            LOGGER.info("统计图片数量的业务层方法产生异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        LOGGER.info("统计图片数量的业务层方法结束！");
+        return galleryList.size();
+    }
+
+    @Override
+    public Message delGalleryPic(String ids) {
+        LOGGER.info("删除图片信息的业务层方法开始！");
+        LOGGER.info("删除图片信息的业务层方法中拿到的图片的id【{}】", ids);
+        Message msg = new Message();
+        if (StringUtils.isBlank(ids)) {
+            LOGGER.info("删除图片信息失败，缺少参数");
+            throw new ParameterException("未查询到图片信息");
+        }
+        msg.setInfo("删除失败！");
+        msg.setResult(false);
+        try {
+            String[] arrId = ids.split(",");
+            for (String picId : arrId) {
+                if (StringUtils.isNotBlank(picId)) {
+                    GalleryPicInfo galleryPicInfo = galleryInfoMapper.selectByPrimaryKey(Integer.valueOf(picId));
+                    GalleryChannelExample example = new GalleryChannelExample();
+                    example.createCriteria().andPicIdEqualTo(Integer.valueOf(picId)).andStateEqualTo("0");
+                    List<GalleryChannel> galleryChannels = galleryChannelMapper.selectByExample(example);
+                    for (GalleryChannel galleryChannel : galleryChannels) {
+                        galleryChannel.setState("1");
+                        if (galleryChannelMapper.updateByPrimaryKey(galleryChannel) > 0) {
+                            msg.setInfo("删除成功！");
+                            msg.setResult(true);
+                            LOGGER.info("删除此图片图库栏目关系成功！");
+                            //redisManager.deleteZSet("gallery_channel_"+galleryChannel.getChannelId(),picId);
+//							redisManager.delete("gallery_channel_"+galleryChannel.getChannelId());
+                            this.redisManager.delete("gallery_channel_" + galleryChannel.getSpecial() + "_" + galleryChannel.getChannelId());
+                            LOGGER.info("删除redis图库栏目关系成功！");
+                        }
+                    }
+                    if (galleryPicInfo != null) {
+                        galleryPicInfo.setPicState("1");
+                        if (galleryInfoMapper.updateByPrimaryKey(galleryPicInfo) > 0) {
+                            msg.setInfo("删除成功！");
+                            msg.setResult(true);
+                            LOGGER.info("删除图片信息成功！");
+                            redisManager.delete("gallery_pic_Id" + galleryPicInfo.getPicId());
+                        }
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            LOGGER.info("删除图片信息失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除失败，请稍候再试！");
+            msg.setResult(true);
+        }
+        LOGGER.info("删除图片信息的业务层方法结束！");
+        return msg;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/ImgCompress.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/ImgCompress.java
new file mode 100644
index 000000000..549f207f3
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/ImgCompress.java
@@ -0,0 +1,103 @@
+package com.ruoyi.content.utils;
+
+import com.sun.image.codec.jpeg.JPEGCodec;
+import com.sun.image.codec.jpeg.JPEGImageEncoder;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Date;
+
+/**
+ * 图片压缩处理
+ *
+ * @author liudajin
+ */
+public class ImgCompress {
+    private Image img;
+    private int width;
+    private int height;
+
+    @SuppressWarnings("deprecation")
+    public static void main(String[] args) throws Exception {
+        System.out.println("开始：" + new Date().toLocaleString());
+        ImgCompress imgCom = new ImgCompress("C:\\temp\\pic123.jpg");
+        imgCom.resizeFix(400, 400);
+        System.out.println("结束：" + new Date().toLocaleString());
+    }
+
+    /**
+     * 构造函数
+     */
+    public ImgCompress(String fileName) throws IOException {
+        File file = new File(fileName);// 读入文件  
+        img = ImageIO.read(file);      // 构造Image对象  
+        width = img.getWidth(null);    // 得到源图宽  
+        height = img.getHeight(null);  // 得到源图长  
+    }
+
+    /**
+     * 构造函数
+     */
+    public ImgCompress(InputStream ins) throws IOException {
+        img = ImageIO.read(ins);      // 构造Image对象
+        width = img.getWidth(null);    // 得到源图宽
+        height = img.getHeight(null);  // 得到源图长
+    }
+
+    /**
+     * 按照宽度还是高度进行压缩
+     *
+     * @param w int 最大宽度
+     * @param h int 最大高度
+     */
+    public byte[] resizeFix(int w, int h) throws IOException {
+        if (width / height > w / h) {
+            return resizeByWidth(w);
+        } else {
+            return resizeByHeight(h);
+        }
+    }
+
+    /**
+     * 以宽度为基准，等比例放缩图片
+     *
+     * @param w int 新宽度
+     */
+    public byte[] resizeByWidth(int w) throws IOException {
+        int h = (int) (height * w / width);
+        return resize(w, h);
+    }
+
+    /**
+     * 以高度为基准，等比例缩放图片
+     *
+     * @param h int 新高度
+     */
+    public byte[] resizeByHeight(int h) throws IOException {
+        int w = (int) (width * h / height);
+        return resize(w, h);
+    }
+
+    /**
+     * 强制压缩/放大图片到固定的大小
+     *
+     * @param w int 新宽度
+     * @param h int 新高度
+     */
+    public byte[] resize(int w, int h) throws IOException {
+        // SCALE_SMOOTH 的缩略算法 生成缩略图片的平滑度的 优先级比速度高 生成的图片质量比较好 但速度慢  
+        BufferedImage image = new BufferedImage(w, h, BufferedImage.TYPE_INT_RGB);
+        image.getGraphics().drawImage(img, 0, 0, w, h, null); // 绘制缩小后的图  
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        // 可以正常实现bmp、png、gif转jpg  
+        JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
+        encoder.encode(image); // JPEG编码  
+        byte[] bytes = out.toByteArray();
+        return bytes;
+    }
+}  
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/BaseCodeMapper.xml b/ruoyi-content/src/main/resources/mapper/content/BaseCodeMapper.xml
new file mode 100644
index 000000000..05148653a
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/BaseCodeMapper.xml
@@ -0,0 +1,463 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.BaseCodeMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.BaseCode" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    <id column="ID" property="id" jdbcType="INTEGER" />
+    <result column="CODE_CODE" property="codeCode" jdbcType="VARCHAR" />
+    <result column="CODE_TYPE" property="codeType" jdbcType="VARCHAR" />
+    <result column="ORDER_NO" property="orderNo" jdbcType="VARCHAR" />
+    <result column="CODE_CNAME" property="codeCname" jdbcType="VARCHAR" />
+    <result column="CODE_ENAME" property="codeEname" jdbcType="VARCHAR" />
+    <result column="CODE_TNAME" property="codeTname" jdbcType="VARCHAR" />
+    <result column="STATE" property="state" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_REMARK" property="updateRemark" jdbcType="VARCHAR" />
+    <result column="BUSINESS_AREA" property="businessArea" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    ID, CODE_CODE, CODE_TYPE, ORDER_NO, CODE_CNAME, CODE_ENAME, CODE_TNAME, STATE, CREATE_USER, 
+    CREATE_TIME, UPDATE_USER, UPDATE_TIME, UPDATE_REMARK, BUSINESS_AREA, COMPANY_ID, 
+    BRANCH_ID
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.BaseCodeExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from cms_base_code
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from cms_base_code
+    where ID = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    delete from cms_base_code
+    where ID = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.BaseCodeExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    delete from cms_base_code
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.BaseCode" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+  <!--   <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_base_code (ID, CODE_CODE, CODE_TYPE,
+      ORDER_NO, CODE_CNAME, CODE_ENAME, 
+      CODE_TNAME, STATE, CREATE_USER, 
+      CREATE_TIME, UPDATE_USER, UPDATE_TIME, 
+      UPDATE_REMARK, BUSINESS_AREA, COMPANY_ID, 
+      BRANCH_ID)
+    values (#{id,jdbcType=INTEGER}, #{codeCode,jdbcType=VARCHAR}, #{codeType,jdbcType=VARCHAR}, 
+      #{orderNo,jdbcType=VARCHAR}, #{codeCname,jdbcType=VARCHAR}, #{codeEname,jdbcType=VARCHAR}, 
+      #{codeTname,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, 
+      #{updateRemark,jdbcType=VARCHAR}, #{businessArea,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, 
+      #{branchId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.BaseCode" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+<!--     <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_base_code
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      ID,
+      <if test="codeCode != null" >
+        CODE_CODE,
+      </if>
+      <if test="codeType != null" >
+        CODE_TYPE,
+      </if>
+      <if test="orderNo != null" >
+        ORDER_NO,
+      </if>
+      <if test="codeCname != null" >
+        CODE_CNAME,
+      </if>
+      <if test="codeEname != null" >
+        CODE_ENAME,
+      </if>
+      <if test="codeTname != null" >
+        CODE_TNAME,
+      </if>
+      <if test="state != null" >
+        STATE,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="updateRemark != null" >
+        UPDATE_REMARK,
+      </if>
+      <if test="businessArea != null" >
+        BUSINESS_AREA,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{id,jdbcType=INTEGER},
+      <if test="codeCode != null" >
+        #{codeCode,jdbcType=VARCHAR},
+      </if>
+      <if test="codeType != null" >
+        #{codeType,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNo != null" >
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="codeCname != null" >
+        #{codeCname,jdbcType=VARCHAR},
+      </if>
+      <if test="codeEname != null" >
+        #{codeEname,jdbcType=VARCHAR},
+      </if>
+      <if test="codeTname != null" >
+        #{codeTname,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateRemark != null" >
+        #{updateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="businessArea != null" >
+        #{businessArea,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        #{branchId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.BaseCodeExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    select count(*) from cms_base_code
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    update cms_base_code
+    <set >
+      <if test="record.id != null" >
+        ID = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.codeCode != null" >
+        CODE_CODE = #{record.codeCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.codeType != null" >
+        CODE_TYPE = #{record.codeType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orderNo != null" >
+        ORDER_NO = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.codeCname != null" >
+        CODE_CNAME = #{record.codeCname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.codeEname != null" >
+        CODE_ENAME = #{record.codeEname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.codeTname != null" >
+        CODE_TNAME = #{record.codeTname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null" >
+        STATE = #{record.state,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updateRemark != null" >
+        UPDATE_REMARK = #{record.updateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.businessArea != null" >
+        BUSINESS_AREA = #{record.businessArea,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.branchId != null" >
+        BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    update cms_base_code
+    set ID = #{record.id,jdbcType=INTEGER},
+      CODE_CODE = #{record.codeCode,jdbcType=VARCHAR},
+      CODE_TYPE = #{record.codeType,jdbcType=VARCHAR},
+      ORDER_NO = #{record.orderNo,jdbcType=VARCHAR},
+      CODE_CNAME = #{record.codeCname,jdbcType=VARCHAR},
+      CODE_ENAME = #{record.codeEname,jdbcType=VARCHAR},
+      CODE_TNAME = #{record.codeTname,jdbcType=VARCHAR},
+      STATE = #{record.state,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=TIMESTAMP},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=TIMESTAMP},
+      UPDATE_REMARK = #{record.updateRemark,jdbcType=VARCHAR},
+      BUSINESS_AREA = #{record.businessArea,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{record.branchId,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.BaseCode" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    update cms_base_code
+    <set >
+      <if test="codeCode != null" >
+        CODE_CODE = #{codeCode,jdbcType=VARCHAR},
+      </if>
+      <if test="codeType != null" >
+        CODE_TYPE = #{codeType,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNo != null" >
+        ORDER_NO = #{orderNo,jdbcType=VARCHAR},
+      </if>
+      <if test="codeCname != null" >
+        CODE_CNAME = #{codeCname,jdbcType=VARCHAR},
+      </if>
+      <if test="codeEname != null" >
+        CODE_ENAME = #{codeEname,jdbcType=VARCHAR},
+      </if>
+      <if test="codeTname != null" >
+        CODE_TNAME = #{codeTname,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        STATE = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateRemark != null" >
+        UPDATE_REMARK = #{updateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="businessArea != null" >
+        BUSINESS_AREA = #{businessArea,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.BaseCode" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:34:00 CST 2018.
+    -->
+    update cms_base_code
+    set CODE_CODE = #{codeCode,jdbcType=VARCHAR},
+      CODE_TYPE = #{codeType,jdbcType=VARCHAR},
+      ORDER_NO = #{orderNo,jdbcType=VARCHAR},
+      CODE_CNAME = #{codeCname,jdbcType=VARCHAR},
+      CODE_ENAME = #{codeEname,jdbcType=VARCHAR},
+      CODE_TNAME = #{codeTname,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=TIMESTAMP},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      UPDATE_REMARK = #{updateRemark,jdbcType=VARCHAR},
+      BUSINESS_AREA = #{businessArea,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{branchId,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/GalleryChannelMapper.xml b/ruoyi-content/src/main/resources/mapper/content/GalleryChannelMapper.xml
new file mode 100644
index 000000000..b78ba4eaa
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/GalleryChannelMapper.xml
@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.GalleryChannelMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.GalleryChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    <id column="ID" property="id" jdbcType="INTEGER" />
+    <result column="PIC_ID" property="picId" jdbcType="INTEGER" />
+    <result column="SPECIAL" property="special" jdbcType="VARCHAR" />
+    <result column="CHANNEL_ID" property="channelId" jdbcType="VARCHAR" />
+    <result column="STATE" property="state" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    ID, PIC_ID, SPECIAL, CHANNEL_ID, STATE, CREATE_DATE, CREATE_TIME, COMPANY_ID, BRANCH_ID
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.GalleryChannelExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from cms_gallery_channel
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from cms_gallery_channel
+    where ID = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    delete from cms_gallery_channel
+    where ID = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.GalleryChannelExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    delete from cms_gallery_channel
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.GalleryChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_gallery_channel (ID, PIC_ID, SPECIAL,
+      CHANNEL_ID, STATE, CREATE_DATE, 
+      CREATE_TIME, COMPANY_ID, BRANCH_ID
+      )
+    values (#{id,jdbcType=INTEGER}, #{picId,jdbcType=INTEGER}, #{special,jdbcType=VARCHAR}, 
+      #{channelId,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, #{branchId,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.GalleryChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_gallery_channel
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      ID,
+      <if test="picId != null" >
+        PIC_ID,
+      </if>
+      <if test="special != null" >
+        SPECIAL,
+      </if>
+      <if test="channelId != null" >
+        CHANNEL_ID,
+      </if>
+      <if test="state != null" >
+        STATE,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{id,jdbcType=INTEGER},
+      <if test="picId != null" >
+        #{picId,jdbcType=INTEGER},
+      </if>
+      <if test="special != null" >
+        #{special,jdbcType=VARCHAR},
+      </if>
+      <if test="channelId != null" >
+        #{channelId,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        #{branchId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.GalleryChannelExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    select count(*) from cms_gallery_channel
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    update cms_gallery_channel
+    <set >
+      <if test="record.id != null" >
+        ID = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.picId != null" >
+        PIC_ID = #{record.picId,jdbcType=INTEGER},
+      </if>
+      <if test="record.special != null" >
+        SPECIAL = #{record.special,jdbcType=VARCHAR},
+      </if>
+      <if test="record.channelId != null" >
+        CHANNEL_ID = #{record.channelId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null" >
+        STATE = #{record.state,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.branchId != null" >
+        BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    update cms_gallery_channel
+    set ID = #{record.id,jdbcType=INTEGER},
+      PIC_ID = #{record.picId,jdbcType=INTEGER},
+      SPECIAL = #{record.special,jdbcType=VARCHAR},
+      CHANNEL_ID = #{record.channelId,jdbcType=VARCHAR},
+      STATE = #{record.state,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{record.branchId,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.GalleryChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    update cms_gallery_channel
+    <set >
+      <if test="picId != null" >
+        PIC_ID = #{picId,jdbcType=INTEGER},
+      </if>
+      <if test="special != null" >
+        SPECIAL = #{special,jdbcType=VARCHAR},
+      </if>
+      <if test="channelId != null" >
+        CHANNEL_ID = #{channelId,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        STATE = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.GalleryChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Sep 19 10:35:12 CST 2018.
+    -->
+    update cms_gallery_channel
+    set PIC_ID = #{picId,jdbcType=INTEGER},
+      SPECIAL = #{special,jdbcType=VARCHAR},
+      CHANNEL_ID = #{channelId,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{branchId,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/GalleryPicInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/GalleryPicInfoMapper.xml
new file mode 100644
index 000000000..0eee738b8
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/GalleryPicInfoMapper.xml
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.GalleryPicInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    <id column="PIC_ID" property="picId" jdbcType="INTEGER" />
+    <result column="IMG_URL" property="imgUrl" jdbcType="VARCHAR" />
+    <result column="PIC_AD_ID" property="picAdId" jdbcType="VARCHAR" />
+    <result column="PIC_STATE" property="picState" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    PIC_ID, IMG_URL, PIC_AD_ID, PIC_STATE, COMPANY_ID, CREATE_DATE, CREATE_TIME, CREATE_USER, 
+    UPDATE_DATE, UPDATE_TIME, BRANCH_ID
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.GalleryPicInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from cms_gallery_pic_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from cms_gallery_pic_info
+    where PIC_ID = #{picId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    delete from cms_gallery_pic_info
+    where PIC_ID = #{picId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.GalleryPicInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    delete from cms_gallery_pic_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="picId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_gallery_pic_info (PIC_ID, IMG_URL, PIC_AD_ID,
+      PIC_STATE, COMPANY_ID, CREATE_DATE, 
+      CREATE_TIME, CREATE_USER, UPDATE_DATE, 
+      UPDATE_TIME, BRANCH_ID)
+    values (#{picId,jdbcType=INTEGER}, #{imgUrl,jdbcType=VARCHAR}, #{picAdId,jdbcType=VARCHAR}, 
+      #{picState,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=VARCHAR}, #{branchId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="picId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_gallery_pic_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      PIC_ID,
+      <if test="imgUrl != null" >
+        IMG_URL,
+      </if>
+      <if test="picAdId != null" >
+        PIC_AD_ID,
+      </if>
+      <if test="picState != null" >
+        PIC_STATE,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{picId,jdbcType=INTEGER},
+      <if test="imgUrl != null" >
+        #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdId != null" >
+        #{picAdId,jdbcType=VARCHAR},
+      </if>
+      <if test="picState != null" >
+        #{picState,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        #{branchId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.GalleryPicInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    select count(*) from cms_gallery_pic_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    update cms_gallery_pic_info
+    <set >
+      <if test="record.picId != null" >
+        PIC_ID = #{record.picId,jdbcType=INTEGER},
+      </if>
+      <if test="record.imgUrl != null" >
+        IMG_URL = #{record.imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.picAdId != null" >
+        PIC_AD_ID = #{record.picAdId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.picState != null" >
+        PIC_STATE = #{record.picState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.branchId != null" >
+        BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    update cms_gallery_pic_info
+    set PIC_ID = #{record.picId,jdbcType=INTEGER},
+      IMG_URL = #{record.imgUrl,jdbcType=VARCHAR},
+      PIC_AD_ID = #{record.picAdId,jdbcType=VARCHAR},
+      PIC_STATE = #{record.picState,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      BRANCH_ID = #{record.branchId,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    update cms_gallery_pic_info
+    <set >
+      <if test="imgUrl != null" >
+        IMG_URL = #{imgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdId != null" >
+        PIC_AD_ID = #{picAdId,jdbcType=VARCHAR},
+      </if>
+      <if test="picState != null" >
+        PIC_STATE = #{picState,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where PIC_ID = #{picId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Sep 20 09:57:29 CST 2018.
+    -->
+    update cms_gallery_pic_info
+    set IMG_URL = #{imgUrl,jdbcType=VARCHAR},
+      PIC_AD_ID = #{picAdId,jdbcType=VARCHAR},
+      PIC_STATE = #{picState,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      BRANCH_ID = #{branchId,jdbcType=VARCHAR}
+    where PIC_ID = #{picId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml
new file mode 100644
index 000000000..df2982c21
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.GalleryQueryMapper">
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.GalleryPicInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Jun 11 10:57:31 CST 2018.
+    -->
+    <id column="PIC_ID" property="picId" jdbcType="INTEGER" />
+    <result column="IMG_URL" property="imgUrl" jdbcType="VARCHAR" />
+    <result column="PIC_AD_ID" property="picAdId" jdbcType="VARCHAR" />
+    <result column="PIC_STATE" property="picState" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  
+   <sql id="adTitleSQL">
+   	 SELECT ad.PIC_AD_NAME
+   	 FROM cms_pic_ad_info ad
+   	 WHERE ad.PIC_AD_ID = pi.PIC_AD_ID	 
+   </sql>
+	<select id="selectAllWithLimit"
+		resultMap="BaseResultMap">
+		SELECT
+		pi.PIC_ID,
+		pi.IMG_URL,
+       (
+		<include refid="adTitleSQL" />
+		) as PIC_AD_ID,
+		pi.PIC_STATE,
+		pi.COMPANY_ID,
+		pi.CREATE_DATE,
+		pi.CREATE_TIME,
+		pi.CREATE_USER,
+		pi.UPDATE_DATE,
+		pi.UPDATE_TIME
+		FROM cms_gallery_pic_info pi
+		WHERE
+		1=1
+		<if test="companyId != null and companyId !=''">
+			and pi.COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+		</if>
+		<if test="branchId != null and branchId !=''">
+		    and pi.BRANCH_ID like CONCAT(CONCAT('%',#{branchId,jdbcType=VARCHAR},'%'))
+		</if>
+		<if test="picState != null">
+			and pi.PIC_STATE in
+			<foreach collection="picState" item="picState" index="index"
+				open="(" close=")" separator=",">
+				#{picState}
+			</foreach>
+
+		</if>
+		<if test="picId != null and picId.size() > 0">
+			and pi.PIC_ID in
+			<foreach collection="picId" item="picId" index="index"
+				open="(" close=")" separator=",">
+				#{picId}
+			</foreach>
+		</if>
+		order by pi.CREATE_DATE DESC,pi.CREATE_TIME DESC, pi.UPDATE_DATE
+		DESC,pi.UPDATE_TIME DESC
+		limit
+		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>	
+	
+	<select id="selectChannelId" resultType="java.lang.String" parameterType="java.lang.Integer" >
+		SELECT distinct CHANNEL_ID
+		FROM cms_gallery_channel
+		WHERE PIC_ID = #{picId,jdbcType=INTEGER} and STATE = '0'
+	</select>
+	
+	<select id="selectAllPicInfo"
+		resultMap="BaseResultMap">
+		SELECT
+		pi.PIC_ID,
+		pi.IMG_URL,
+       (
+		<include refid="adTitleSQL" />
+		) as PIC_AD_ID,
+		pi.PIC_STATE,
+		pi.COMPANY_ID,
+		pi.CREATE_DATE,
+		pi.CREATE_TIME,
+		pi.CREATE_USER,
+		pi.UPDATE_DATE,
+		pi.UPDATE_TIME
+		FROM cms_gallery_pic_info pi
+		WHERE
+		1=1
+		<if test="companyId != null and companyId !=''">
+			and pi.COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+		</if>
+		<if test="branchId != null and branchId !=''">
+		    and pi.BRANCH_ID like CONCAT(CONCAT('%',#{branchId,jdbcType=VARCHAR},'%'))
+		</if>
+		<if test="picState != null">
+			and pi.PIC_STATE in
+			<foreach collection="picState" item="picState" index="index"
+				open="(" close=")" separator=",">
+				#{picState}
+			</foreach>
+
+		</if>
+		<if test="picId != null and picId.size() > 0">
+			and pi.PIC_ID in
+			<foreach collection="picId" item="picId" index="index"
+				open="(" close=")" separator=",">
+				#{picId}
+			</foreach>
+		</if>
+	</select>	
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/static/css/bootstrapValidator.min.css b/ruoyi-content/src/main/resources/static/css/bootstrapValidator.min.css
new file mode 100644
index 000000000..030cbdf75
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/css/bootstrapValidator.min.css
@@ -0,0 +1,13 @@
+/**
+ * BootstrapValidator (http://bootstrapvalidator.com)
+ *
+ * The best jQuery plugin to validate form fields. Designed to use with Bootstrap 3
+ *
+ * @version     v0.4.5
+ * @author      https://twitter.com/nghuuphuoc
+ * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
+ * @license     MIT
+ */
+
+
+.bv-form .help-block{margin-bottom:0}.nav-tabs li.bv-tab-success>a{color:#3c763d}.nav-tabs li.bv-tab-error>a{color:#a94442}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/static/js/bootstrapValidator.min.js b/ruoyi-content/src/main/resources/static/js/bootstrapValidator.min.js
new file mode 100644
index 000000000..c10d0d567
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/js/bootstrapValidator.min.js
@@ -0,0 +1,13 @@
+/**
+ * BootstrapValidator (http://bootstrapvalidator.com)
+ *
+ * The best jQuery plugin to validate form fields. Designed to use with Bootstrap 3
+ *
+ * @version     v0.4.5
+ * @author      https://twitter.com/nghuuphuoc
+ * @copyright   (c) 2013 - 2014 Nguyen Huu Phuoc
+ * @license     MIT
+ */
+
+!function(a){var b=function(c,d){this.$form=a(c),this.options=a.extend({},b.DEFAULT_OPTIONS,d),this.$invalidField=null,this.$submitButton=null,this.STATUS_NOT_VALIDATED="NOT_VALIDATED",this.STATUS_VALIDATING="VALIDATING",this.STATUS_INVALID="INVALID",this.STATUS_VALID="VALID";var e=function(){for(var a=3,b=document.createElement("div"),c=b.all||[];b.innerHTML="<!--[if gt IE "+ ++a+"]><br><![endif]-->",c[0];);return a>4?a:!a}(),f=document.createElement("div");this._changeEvent=9!==e&&"oninput"in f?"input":"keyup",this._submitIfValid=null,this._init()};b.DEFAULT_OPTIONS={elementClass:"bv-form",message:"This value is not valid",threshold:null,excluded:[":disabled",":hidden",":not(:visible)"],feedbackIcons:{valid:null,invalid:null,validating:null},submitButtons:'[type="submit"]',submitHandler:null,live:"enabled",fields:null},b.prototype={constructor:b,_init:function(){var b,c,d,e,f,g,h,i=this,j={excluded:this.$form.attr("data-bv-excluded"),trigger:this.$form.attr("data-bv-trigger"),message:this.$form.attr("data-bv-message"),submitButtons:this.$form.attr("data-bv-submitbuttons"),threshold:this.$form.attr("data-bv-threshold"),live:this.$form.attr("data-bv-live"),fields:{},feedbackIcons:{valid:this.$form.attr("data-bv-feedbackicons-valid"),invalid:this.$form.attr("data-bv-feedbackicons-invalid"),validating:this.$form.attr("data-bv-feedbackicons-validating")}};this.$form.attr("novalidate","novalidate").addClass(this.options.elementClass).on("submit.bv",function(a){a.preventDefault(),i.validate()}).on("click",this.options.submitButtons,function(){i.$submitButton=a(this),i._submitIfValid=!0}).find("[name], [data-bv-field]").each(function(){var k=a(this);if(!i._isExcluded(k)){var l=k.attr("name")||k.attr("data-bv-field"),m={};for(c in a.fn.bootstrapValidator.validators)if(b=a.fn.bootstrapValidator.validators[c],d=k.attr("data-bv-"+c.toLowerCase())+"",h="function"==typeof b.enableByHtml5?b.enableByHtml5(a(this)):null,h&&"false"!=d||h!==!0&&(""==d||"true"==d)){b.html5Attributes=b.html5Attributes||{message:"message"},m[c]=a.extend({},1==h?{}:h,m[c]);for(g in b.html5Attributes)e=b.html5Attributes[g],f=k.attr("data-bv-"+c.toLowerCase()+"-"+g),f&&("true"==f?f=!0:"false"==f&&(f=!1),m[c][e]=f)}var n={trigger:k.attr("data-bv-trigger"),message:k.attr("data-bv-message"),container:k.attr("data-bv-container"),selector:k.attr("data-bv-selector"),threshold:k.attr("data-bv-threshold"),validators:m};a.isEmptyObject(n.validators)||a.isEmptyObject(n)||(k.attr("data-bv-field",l),j.fields[l]=a.extend({},n,j.fields[l]))}}).end().find(this.options.submitButtons).each(function(){a("<input/>").attr("type","hidden").attr("name",a(this).attr("name")).val(a(this).val()).appendTo(i.$form)}),this.options=a.extend(!0,this.options,j);for(var k in this.options.fields)this._initField(k);this.setLiveMode(this.options.live)},_initField:function(b){if(null!=this.options.fields[b]&&null!=this.options.fields[b].validators){var c=this.getFieldElements(b);if(null==c)return void delete this.options.fields[b];for(var d in this.options.fields[b].validators)a.fn.bootstrapValidator.validators[d]||delete this.options.fields[b].validators[d];for(var e=this,f=c.attr("type"),g="radio"==f||"checkbox"==f||"file"==f||"SELECT"==c[0].tagName?"change":e._changeEvent,h=c.length,i=1==h||"radio"==f||"checkbox"==f,j=0;h>j;j++){var k=a(c[j]),l=k.parents(".form-group"),m=this.options.fields[b].container?l.find(this.options.fields[b].container):this._getMessageContainer(k);k.attr("data-bv-field")||k.attr("data-bv-field",b),k.on(g+".update.bv",function(){e._submitIfValid=!1,i?e.updateStatus(b,e.STATUS_NOT_VALIDATED,null):e.updateElementStatus(a(this),e.STATUS_NOT_VALIDATED,null)}),k.data("bv.messages",m);for(d in this.options.fields[b].validators)k.data("bv.result."+d,this.STATUS_NOT_VALIDATED),i&&j!=h-1||a("<small/>").css("display","none").attr("data-bv-validator",d).attr("data-bv-validator-for",b).html(this.options.fields[b].validators[d].message||this.options.fields[b].message||this.options.message).addClass("help-block").appendTo(m);if(this.options.feedbackIcons&&this.options.feedbackIcons.validating&&this.options.feedbackIcons.invalid&&this.options.feedbackIcons.valid&&(!i||j==h-1)){l.addClass("has-feedback");var n=a("<i/>").css("display","none").addClass("form-control-feedback").attr("data-bv-icon-for",b).insertAfter(k);0==l.find("label").length&&n.css("top",0)}}null==this.options.fields[b].enabled&&(this.options.fields[b].enabled=!0)}},_getMessageContainer:function(a){var b=a.parent();if(b.hasClass("form-group"))return b;var c=b.attr("class");if(!c)return this._getMessageContainer(b);c=c.split(" ");for(var d=c.length,e=0;d>e;e++)if(/^col-(xs|sm|md|lg)-\d+$/.test(c[e])||/^col-(xs|sm|md|lg)-offset-\d+$/.test(c[e]))return b;return this._getMessageContainer(b)},_submit:function(){if(this.isValid())this.options.submitHandler&&"function"==typeof this.options.submitHandler?this.options.submitHandler.call(this,this,this.$form,this.$submitButton):this.disableSubmitButtons(!0).defaultSubmit();else if("submitted"==this.options.live&&this.setLiveMode("enabled"),this.$invalidField){var b,c=this.$invalidField.parents(".tab-pane");c&&(b=c.attr("id"))&&a('a[href="#'+b+'"][data-toggle="tab"]').trigger("click.bs.tab.data-api"),this.$invalidField.focus()}},_isExcluded:function(b){if(this.options.excluded){"string"==typeof this.options.excluded&&(this.options.excluded=a.map(this.options.excluded.split(","),function(b){return a.trim(b)}));for(var c=this.options.excluded.length,d=0;c>d;d++)if("string"==typeof this.options.excluded[d]&&b.is(this.options.excluded[d])||"function"==typeof this.options.excluded[d]&&1==this.options.excluded[d].call(this,b,this))return!0}return!1},_exceedThreshold:function(a){var b=a.attr("data-bv-field"),c=this.options.fields[b].threshold||this.options.threshold;if(!c)return!0;var d=a.attr("type"),e=-1!=["button","checkbox","file","hidden","image","radio","reset","submit"].indexOf(d);return e||a.val().length>=c},getFieldElements:function(b){var c=this.options.fields[b].selector?a(this.options.fields[b].selector):this.$form.find('[name="'+b+'"]');return 0==c.length?null:c},setLiveMode:function(b){if(this.options.live=b,"submitted"==b)return this;var c=this;for(var d in this.options.fields)!function(e){var f=c.getFieldElements(e);if(f)for(var g=f.attr("type"),h=f.length,i=1==h||"radio"==g||"checkbox"==g,j=c.options.fields[d].trigger||c.options.trigger||("radio"==g||"checkbox"==g||"file"==g||"SELECT"==f[0].tagName?"change":c._changeEvent),k=a.map(j.split(" "),function(a){return a+".live.bv"}).join(" "),l=0;h>l;l++)"enabled"==b?a(f[l]).on(k,function(){c._exceedThreshold(a(this))&&(i?c.validateField(e):c.validateFieldElement(a(this),!1))}):a(f[l]).off(k)}(d);return this},disableSubmitButtons:function(a){return a?"disabled"!=this.options.live&&this.$form.find(this.options.submitButtons).attr("disabled","disabled"):this.$form.find(this.options.submitButtons).removeAttr("disabled"),this},validate:function(){if(!this.options.fields)return this;this.disableSubmitButtons(!0);for(var a in this.options.fields)this.validateField(a);return this.$submitButton&&this._submit(),this},validateField:function(b){for(var c=this.getFieldElements(b),d=c.attr("type"),e="radio"==d||"checkbox"==d?1:c.length,f=0;e>f;f++)this.validateFieldElement(a(c[f]),1==e);return this},validateFieldElement:function(b,c){var d,e,f=this,g=b.attr("data-bv-field"),h=this.options.fields[g].validators;if(!this.options.fields[g].enabled||this._isExcluded(b))return this;for(d in h){b.data("bv.dfs."+d)&&b.data("bv.dfs."+d).reject();var i=b.data("bv.result."+d);i!=this.STATUS_VALID&&i!=this.STATUS_INVALID&&(b.data("bv.result."+d,this.STATUS_VALIDATING),e=a.fn.bootstrapValidator.validators[d].validate(this,b,h[d]),"object"==typeof e?(c?this.updateStatus(g,this.STATUS_VALIDATING,d):this.updateElementStatus(b,this.STATUS_VALIDATING,d),b.data("bv.dfs."+d,e),e.done(function(a,b,d){a.removeData("bv.dfs."+b),c?f.updateStatus(a.attr("data-bv-field"),d?f.STATUS_VALID:f.STATUS_INVALID,b):f.updateElementStatus(a,d?f.STATUS_VALID:f.STATUS_INVALID,b),d&&1==f._submitIfValid&&f._submit()})):"boolean"==typeof e&&(c?this.updateStatus(g,e?this.STATUS_VALID:this.STATUS_INVALID,d):this.updateElementStatus(b,e?this.STATUS_VALID:this.STATUS_INVALID,d)))}return this},updateStatus:function(b,c,d){for(var e=this.getFieldElements(b),f=e.attr("type"),g="radio"==f||"checkbox"==f?1:e.length,h=0;g>h;h++)this.updateElementStatus(a(e[h]),c,d);return this},updateElementStatus:function(b,c,d){var e=this,f=b.attr("data-bv-field"),g=b.parents(".form-group"),h=b.data("bv.messages"),i=h.find(".help-block[data-bv-validator]"),j=g.find('.form-control-feedback[data-bv-icon-for="'+f+'"]');if(d)b.data("bv.result."+d,c);else for(var k in this.options.fields[f].validators)b.data("bv.result."+k,c);var l,m,n=b.parents(".tab-pane");switch(n&&(l=n.attr("id"))&&(m=a('a[href="#'+l+'"][data-toggle="tab"]').parent()),c){case this.STATUS_VALIDATING:this.disableSubmitButtons(!0),g.removeClass("has-success").removeClass("has-error"),d?i.filter('.help-block[data-bv-validator="'+d+'"]').hide():i.hide(),j&&j.removeClass(this.options.feedbackIcons.valid).removeClass(this.options.feedbackIcons.invalid).addClass(this.options.feedbackIcons.validating).show(),m&&m.removeClass("bv-tab-success").removeClass("bv-tab-error");break;case this.STATUS_INVALID:this.disableSubmitButtons(!0),g.removeClass("has-success").addClass("has-error"),d?i.filter('[data-bv-validator="'+d+'"]').show():i.show(),j&&j.removeClass(this.options.feedbackIcons.valid).removeClass(this.options.feedbackIcons.validating).addClass(this.options.feedbackIcons.invalid).show(),m&&m.removeClass("bv-tab-success").addClass("bv-tab-error");break;case this.STATUS_VALID:d?i.filter('[data-bv-validator="'+d+'"]').hide():i.hide();var o=0==i.filter(function(){var c=a(this).css("display"),d=a(this).attr("data-bv-validator");return"block"==c||b.data("bv.result."+d)!=e.STATUS_VALID}).length;this.disableSubmitButtons(!o),j&&j.removeClass(this.options.feedbackIcons.invalid).removeClass(this.options.feedbackIcons.validating).removeClass(this.options.feedbackIcons.valid).addClass(o?this.options.feedbackIcons.valid:this.options.feedbackIcons.invalid).show();var p=function(c){return 0==c.find(".help-block[data-bv-validator]").filter(function(){var c=a(this).css("display"),d=a(this).attr("data-bv-validator");return"block"==c||b.data("bv.result."+d)&&b.data("bv.result."+d)!=e.STATUS_VALID}).length};g.removeClass("has-error has-success").addClass(p(g)?"has-success":"has-error"),m&&m.removeClass("bv-tab-success").removeClass("bv-tab-error").addClass(p(n)?"bv-tab-success":"bv-tab-error");break;case this.STATUS_NOT_VALIDATED:default:this.disableSubmitButtons(!1),g.removeClass("has-success").removeClass("has-error"),d?i.filter('.help-block[data-bv-validator="'+d+'"]').hide():i.hide(),j&&j.removeClass(this.options.feedbackIcons.valid).removeClass(this.options.feedbackIcons.invalid).removeClass(this.options.feedbackIcons.validating).hide(),m&&m.removeClass("bv-tab-success").removeClass("bv-tab-error")}return this},isValid:function(){var b,c,d,e,f,g,h,i;for(c in this.options.fields)if(null!=this.options.fields[c]&&this.options.fields[c].enabled)for(b=this.getFieldElements(c),e=b.attr("type"),h="radio"==e||"checkbox"==e?1:b.length,i=0;h>i;i++)if(d=a(b[i]),!this._isExcluded(d))for(g in this.options.fields[c].validators){if(f=d.data("bv.result."+g),f==this.STATUS_NOT_VALIDATED||f==this.STATUS_VALIDATING)return!1;if(f==this.STATUS_INVALID)return this.$invalidField=d,!1}return!0},defaultSubmit:function(){this.$form.off("submit.bv").submit()},resetForm:function(b){var c,d,e,f,g;for(c in this.options.fields){d=this.getFieldElements(c),e=d.length;for(var h=0;e>h;h++)for(g in this.options.fields[c].validators)a(d[h]).removeData("bv.dfs."+g);this.updateStatus(c,this.STATUS_NOT_VALIDATED,null),b&&(f=d.attr("type"),"radio"==f||"checkbox"==f?d.removeAttr("checked").removeAttr("selected"):d.val(""))}return this.$invalidField=null,this.$submitButton=null,this.disableSubmitButtons(!1),this},enableFieldValidators:function(a,b){return this.options.fields[a].enabled=b,this.updateStatus(a,this.STATUS_NOT_VALIDATED,null),this}},a.fn.bootstrapValidator=function(c){var d=arguments;return this.each(function(){var e=a(this),f=e.data("bootstrapValidator"),g="object"==typeof c&&c;f||(f=new b(this,g),e.data("bootstrapValidator",f)),"string"==typeof c&&f[c].apply(f,Array.prototype.slice.call(d,1))})},a.fn.bootstrapValidator.validators={},a.fn.bootstrapValidator.Constructor=b,a.fn.bootstrapValidator.helpers={date:function(a,b,c,d){if(1e3>a||a>9999||0==b||b>12)return!1;var e=[31,28,31,30,31,30,31,31,30,31,30,31];if((a%400==0||a%100!=0&&a%4==0)&&(e[1]=29),0>c||c>e[b-1])return!1;if(d===!0){var f=new Date,g=f.getFullYear(),h=f.getMonth(),i=f.getDate();return g>a||a==g&&h>b-1||a==g&&b-1==h&&i>c}return!0},luhn:function(a){for(var b=a.length,c=0,d=[[0,1,2,3,4,5,6,7,8,9],[0,2,4,6,8,1,3,5,7,9]],e=0;b--;)e+=d[c][parseInt(a.charAt(b),10)],c^=1;return e%10===0&&e>0},mod_11_10:function(a){for(var b=5,c=a.length,d=0;c>d;d++)b=(2*(b||10)%11+parseInt(a.charAt(d),10))%10;return 1==b},mod_37_36:function(a,b){b=b||"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";for(var c=b.length,d=a.length,e=Math.floor(c/2),f=0;d>f;f++)e=(2*(e||c)%(c+1)+b.indexOf(a.charAt(f)))%c;return 1==e}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.base64={validate:function(a,b){var c=b.val();return""==c?!0:/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=|[A-Za-z0-9+/]{4})$/.test(c)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.between={html5Attributes:{message:"message",min:"min",max:"max",inclusive:"inclusive"},enableByHtml5:function(a){return"range"==a.attr("type")?{min:a.attr("min"),max:a.attr("max")}:!1},validate:function(a,b,c){var d=b.val();return""==d?!0:(d=parseFloat(d),c.inclusive===!0?d>c.min&&d<c.max:d>=c.min&&d<=c.max)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.callback={validate:function(b,c,d){var e=c.val();if(d.callback&&"function"==typeof d.callback){var f=new a.Deferred;return f.resolve(c,"callback",d.callback.call(this,e,b)),f}return!0}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.choice={html5Attributes:{message:"message",min:"min",max:"max"},validate:function(a,b,c){var d=b.is("select")?a.getFieldElements(b.attr("data-bv-field")).find("option").filter(":selected").length:a.getFieldElements(b.attr("data-bv-field")).filter(":checked").length;return c.min&&d<c.min||c.max&&d>c.max?!1:!0}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.creditCard={validate:function(b,c){var d=c.val();if(""==d)return!0;if(/[^0-9-\s]+/.test(d))return!1;if(d=d.replace(/\D/g,""),!a.fn.bootstrapValidator.helpers.luhn(d))return!1;var e,f,g={AMERICAN_EXPRESS:{length:[15],prefix:["34","37"]},DINERS_CLUB:{length:[14],prefix:["300","301","302","303","304","305","36"]},DINERS_CLUB_US:{length:[16],prefix:["54","55"]},DISCOVER:{length:[16],prefix:["6011","622126","622127","622128","622129","62213","62214","62215","62216","62217","62218","62219","6222","6223","6224","6225","6226","6227","6228","62290","62291","622920","622921","622922","622923","622924","622925","644","645","646","647","648","649","65"]},JCB:{length:[16],prefix:["3528","3529","353","354","355","356","357","358"]},LASER:{length:[16,17,18,19],prefix:["6304","6706","6771","6709"]},MAESTRO:{length:[12,13,14,15,16,17,18,19],prefix:["5018","5020","5038","6304","6759","6761","6762","6763","6764","6765","6766"]},MASTERCARD:{length:[16],prefix:["51","52","53","54","55"]},SOLO:{length:[16,18,19],prefix:["6334","6767"]},UNIONPAY:{length:[16,17,18,19],prefix:["622126","622127","622128","622129","62213","62214","62215","62216","62217","62218","62219","6222","6223","6224","6225","6226","6227","6228","62290","62291","622920","622921","622922","622923","622924","622925"]},VISA:{length:[16],prefix:["4"]}};for(e in g)for(f in g[e].prefix)if(d.substr(0,g[e].prefix[f].length)==g[e].prefix[f]&&-1!=g[e].length.indexOf(d.length))return!0;return!1}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.cusip={validate:function(b,c){var d=c.val();if(""==d)return!0;if(d=d.toUpperCase(),!/^[0-9A-Z]{9}$/.test(d))return!1;for(var e=a.map(d.split(""),function(a){var b=a.charCodeAt(0);return b>="A".charCodeAt(0)&&b<="Z".charCodeAt(0)?b-"A".charCodeAt(0)+10:a}),f=e.length,g=0,h=0;f-1>h;h++){var i=parseInt(e[h]);h%2!=0&&(i*=2),i>9&&(i-=9),g+=i}return g=(10-g%10)%10,g==e[f-1]}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.cvv={html5Attributes:{message:"message",ccfield:"creditCardField"},validate:function(a,b,c){var d=b.val();if(""==d)return!0;if(!/^[0-9]{3,4}$/.test(d))return!1;if(!c.creditCardField)return!0;var e=a.getFieldElements(c.creditCardField).val();if(""==e)return!0;e=e.replace(/\D/g,"");var f,g,h={AMERICAN_EXPRESS:{length:[15],prefix:["34","37"]},DINERS_CLUB:{length:[14],prefix:["300","301","302","303","304","305","36"]},DINERS_CLUB_US:{length:[16],prefix:["54","55"]},DISCOVER:{length:[16],prefix:["6011","622126","622127","622128","622129","62213","62214","62215","62216","62217","62218","62219","6222","6223","6224","6225","6226","6227","6228","62290","62291","622920","622921","622922","622923","622924","622925","644","645","646","647","648","649","65"]},JCB:{length:[16],prefix:["3528","3529","353","354","355","356","357","358"]},LASER:{length:[16,17,18,19],prefix:["6304","6706","6771","6709"]},MAESTRO:{length:[12,13,14,15,16,17,18,19],prefix:["5018","5020","5038","6304","6759","6761","6762","6763","6764","6765","6766"]},MASTERCARD:{length:[16],prefix:["51","52","53","54","55"]},SOLO:{length:[16,18,19],prefix:["6334","6767"]},UNIONPAY:{length:[16,17,18,19],prefix:["622126","622127","622128","622129","62213","62214","62215","62216","62217","62218","62219","6222","6223","6224","6225","6226","6227","6228","62290","62291","622920","622921","622922","622923","622924","622925"]},VISA:{length:[16],prefix:["4"]}},i=null;for(f in h)for(g in h[f].prefix)if(e.substr(0,h[f].prefix[g].length)==h[f].prefix[g]&&-1!=h[f].length.indexOf(e.length)){i=f;break}return null==i?!1:"AMERICAN_EXPRESS"==i?4==d.length:3==d.length}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.date={html5Attributes:{message:"message",format:"format"},validate:function(b,c,d){var e=c.val();if(""==e)return!0;d.format=d.format||"MM/DD/YYYY";var f=d.format.split(" "),g=f[0],h=f.length>1?f[1]:null,i=f.length>2?f[2]:null,j=e.split(" "),k=j[0],l=j.length>1?j[1]:null;if(f.length!=j.length)return!1;var m=-1!=k.indexOf("/")?"/":-1!=k.indexOf("-")?"-":null;if(null==m)return!1;k=k.split(m),g=g.split(m);var n=k[g.indexOf("YYYY")],o=k[g.indexOf("MM")],p=k[g.indexOf("DD")],q=null,r=null,s=null;if(h){if(h=h.split(":"),l=l.split(":"),h.length!=l.length)return!1;if(r=l.length>0?l[0]:null,q=l.length>1?l[1]:null,s=l.length>2?l[2]:null,s&&(s=parseInt(s,10),0>s||s>60))return!1;if(r&&(r=parseInt(r,10),0>r||r>=24||i&&r>12))return!1;if(q&&(q=parseInt(q,10),0>q||q>59))return!1}return p=parseInt(p,10),o=parseInt(o,10),n=parseInt(n,10),a.fn.bootstrapValidator.helpers.date(n,o,p)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.different={html5Attributes:{message:"message",field:"field"},validate:function(a,b,c){var d=b.val();if(""==d)return!0;var e=a.getFieldElements(c.field);return null==e?!0:d!=e.val()?(a.updateStatus(c.field,a.STATUS_VALID,"different"),!0):!1}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.digits={validate:function(a,b){var c=b.val();return""==c?!0:/^\d+$/.test(c)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.ean={validate:function(a,b){var c=b.val();if(""==c)return!0;if(!/^(\d{8}|\d{12}|\d{13})$/.test(c))return!1;for(var d=c.length,e=0,f=8==d?[3,1]:[1,3],g=0;d-1>g;g++)e+=parseInt(c.charAt(g))*f[g%2];return e=10-e%10,e==c.charAt(d-1)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.emailAddress={enableByHtml5:function(a){return"email"==a.attr("type")},validate:function(a,b){var c=b.val();if(""==c)return!0;var d=/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;return d.test(c)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.file={html5Attributes:{extension:"extension",maxsize:"maxSize",message:"message",type:"type"},validate:function(a,b,c){var d=b.val();if(""==d)return!0;var e,f=c.extension?c.extension.split(","):null,g=c.type?c.type.split(","):null,h=window.File&&window.FileList&&window.FileReader;if(h)for(var i=b.get(0).files,j=i.length,k=0;j>k;k++){if(c.maxSize&&i[k].size>parseInt(c.maxSize))return!1;if(e=i[k].name.substr(i[k].name.lastIndexOf(".")+1),f&&-1==f.indexOf(e))return!1;if(g&&-1==g.indexOf(i[k].type))return!1}else if(e=d.substr(d.lastIndexOf(".")+1),f&&-1==f.indexOf(e))return!1;return!0}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.greaterThan={html5Attributes:{message:"message",value:"value",inclusive:"inclusive"},enableByHtml5:function(a){var b=a.attr("min");return b?{value:b}:!1},validate:function(a,b,c){var d=b.val();return""==d?!0:(d=parseFloat(d),c.inclusive===!0?d>c.value:d>=c.value)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.grid={validate:function(b,c){var d=c.val();return""==d?!0:(d=d.toUpperCase(),/^[GRID:]*([0-9A-Z]{2})[-\s]*([0-9A-Z]{5})[-\s]*([0-9A-Z]{10})[-\s]*([0-9A-Z]{1})$/g.test(d)?(d=d.replace(/\s/g,"").replace(/-/g,""),"GRID:"==d.substr(0,5)&&(d=d.substr(5)),a.fn.bootstrapValidator.helpers.mod_37_36(d)):!1)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.hex={validate:function(a,b){var c=b.val();return""==c?!0:/^[0-9a-fA-F]+$/.test(c)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.hexColor={enableByHtml5:function(a){return"color"==a.attr("type")},validate:function(a,b){var c=b.val();return""==c?!0:/(^#[0-9A-F]{6}$)|(^#[0-9A-F]{3}$)/i.test(c)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.iban={html5Attributes:{message:"message",country:"country"},validate:function(b,c,d){var e=c.val();if(""==e)return!0;var f={AD:"AD[0-9]{2}[0-9]{4}[0-9]{4}[A-Z0-9]{12}",AE:"AE[0-9]{2}[0-9]{3}[0-9]{16}",AL:"AL[0-9]{2}[0-9]{8}[A-Z0-9]{16}",AO:"AO[0-9]{2}[0-9]{21}",AT:"AT[0-9]{2}[0-9]{5}[0-9]{11}",AZ:"AZ[0-9]{2}[A-Z]{4}[A-Z0-9]{20}",BA:"BA[0-9]{2}[0-9]{3}[0-9]{3}[0-9]{8}[0-9]{2}",BE:"BE[0-9]{2}[0-9]{3}[0-9]{7}[0-9]{2}",BF:"BF[0-9]{2}[0-9]{23}",BG:"BG[0-9]{2}[A-Z]{4}[0-9]{4}[0-9]{2}[A-Z0-9]{8}",BH:"BH[0-9]{2}[A-Z]{4}[A-Z0-9]{14}",BI:"BI[0-9]{2}[0-9]{12}",BJ:"BJ[0-9]{2}[A-Z]{1}[0-9]{23}",BR:"BR[0-9]{2}[0-9]{8}[0-9]{5}[0-9]{10}[A-Z][A-Z0-9]",CH:"CH[0-9]{2}[0-9]{5}[A-Z0-9]{12}",CI:"CI[0-9]{2}[A-Z]{1}[0-9]{23}",CM:"CM[0-9]{2}[0-9]{23}",CR:"CR[0-9]{2}[0-9]{3}[0-9]{14}",CV:"CV[0-9]{2}[0-9]{21}",CY:"CY[0-9]{2}[0-9]{3}[0-9]{5}[A-Z0-9]{16}",CZ:"CZ[0-9]{2}[0-9]{20}",DE:"DE[0-9]{2}[0-9]{8}[0-9]{10}",DK:"DK[0-9]{2}[0-9]{14}",DO:"DO[0-9]{2}[A-Z0-9]{4}[0-9]{20}",DZ:"DZ[0-9]{2}[0-9]{20}",EE:"EE[0-9]{2}[0-9]{2}[0-9]{2}[0-9]{11}[0-9]{1}",ES:"ES[0-9]{2}[0-9]{4}[0-9]{4}[0-9]{1}[0-9]{1}[0-9]{10}",FI:"FI[0-9]{2}[0-9]{6}[0-9]{7}[0-9]{1}",FO:"FO[0-9]{2}[0-9]{4}[0-9]{9}[0-9]{1}",FR:"FR[0-9]{2}[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}",GB:"GB[0-9]{2}[A-Z]{4}[0-9]{6}[0-9]{8}",GE:"GE[0-9]{2}[A-Z]{2}[0-9]{16}",GI:"GI[0-9]{2}[A-Z]{4}[A-Z0-9]{15}",GL:"GL[0-9]{2}[0-9]{4}[0-9]{9}[0-9]{1}",GR:"GR[0-9]{2}[0-9]{3}[0-9]{4}[A-Z0-9]{16}",GT:"GT[0-9]{2}[A-Z0-9]{4}[A-Z0-9]{20}",HR:"HR[0-9]{2}[0-9]{7}[0-9]{10}",HU:"HU[0-9]{2}[0-9]{3}[0-9]{4}[0-9]{1}[0-9]{15}[0-9]{1}",IE:"IE[0-9]{2}[A-Z]{4}[0-9]{6}[0-9]{8}",IL:"IL[0-9]{2}[0-9]{3}[0-9]{3}[0-9]{13}",IR:"IR[0-9]{2}[0-9]{22}",IS:"IS[0-9]{2}[0-9]{4}[0-9]{2}[0-9]{6}[0-9]{10}",IT:"IT[0-9]{2}[A-Z]{1}[0-9]{5}[0-9]{5}[A-Z0-9]{12}",JO:"JO[0-9]{2}[A-Z]{4}[0-9]{4}[0]{8}[A-Z0-9]{10}",KW:"KW[0-9]{2}[A-Z]{4}[0-9]{22}",KZ:"KZ[0-9]{2}[0-9]{3}[A-Z0-9]{13}",LB:"LB[0-9]{2}[0-9]{4}[A-Z0-9]{20}",LI:"LI[0-9]{2}[0-9]{5}[A-Z0-9]{12}",LT:"LT[0-9]{2}[0-9]{5}[0-9]{11}",LU:"LU[0-9]{2}[0-9]{3}[A-Z0-9]{13}",LV:"LV[0-9]{2}[A-Z]{4}[A-Z0-9]{13}",MC:"MC[0-9]{2}[0-9]{5}[0-9]{5}[A-Z0-9]{11}[0-9]{2}",MD:"MD[0-9]{2}[A-Z0-9]{20}",ME:"ME[0-9]{2}[0-9]{3}[0-9]{13}[0-9]{2}",MG:"MG[0-9]{2}[0-9]{23}",MK:"MK[0-9]{2}[0-9]{3}[A-Z0-9]{10}[0-9]{2}",ML:"ML[0-9]{2}[A-Z]{1}[0-9]{23}",MR:"MR13[0-9]{5}[0-9]{5}[0-9]{11}[0-9]{2}",MT:"MT[0-9]{2}[A-Z]{4}[0-9]{5}[A-Z0-9]{18}",MU:"MU[0-9]{2}[A-Z]{4}[0-9]{2}[0-9]{2}[0-9]{12}[0-9]{3}[A-Z]{3}",MZ:"MZ[0-9]{2}[0-9]{21}",NL:"NL[0-9]{2}[A-Z]{4}[0-9]{10}",NO:"NO[0-9]{2}[0-9]{4}[0-9]{6}[0-9]{1}",PK:"PK[0-9]{2}[A-Z]{4}[A-Z0-9]{16}",PL:"PL[0-9]{2}[0-9]{8}[0-9]{16}",PS:"PS[0-9]{2}[A-Z]{4}[A-Z0-9]{21}",PT:"PT[0-9]{2}[0-9]{4}[0-9]{4}[0-9]{11}[0-9]{2}",QA:"QA[0-9]{2}[A-Z]{4}[A-Z0-9]{21}",RO:"RO[0-9]{2}[A-Z]{4}[A-Z0-9]{16}",RS:"RS[0-9]{2}[0-9]{3}[0-9]{13}[0-9]{2}",SA:"SA[0-9]{2}[0-9]{2}[A-Z0-9]{18}",SE:"SE[0-9]{2}[0-9]{3}[0-9]{16}[0-9]{1}",SI:"SI[0-9]{2}[0-9]{5}[0-9]{8}[0-9]{2}",SK:"SK[0-9]{2}[0-9]{4}[0-9]{6}[0-9]{10}",SM:"SM[0-9]{2}[A-Z]{1}[0-9]{5}[0-9]{5}[A-Z0-9]{12}",SN:"SN[0-9]{2}[A-Z]{1}[0-9]{23}",TN:"TN59[0-9]{2}[0-9]{3}[0-9]{13}[0-9]{2}",TR:"TR[0-9]{2}[0-9]{5}[A-Z0-9]{1}[A-Z0-9]{16}",VG:"VG[0-9]{2}[A-Z]{4}[0-9]{16}"};e=e.replace(/[^a-zA-Z0-9]/g,"").toUpperCase();var g=d.country||e.substr(0,2);if(!f[g])return!1;if(!new RegExp("^"+f[g]+"$").test(e))return!1;e=e.substr(4)+e.substr(0,4),e=a.map(e.split(""),function(a){var b=a.charCodeAt(0);return b>="A".charCodeAt(0)&&b<="Z".charCodeAt(0)?b-"A".charCodeAt(0)+10:a}),e=e.join("");for(var h=parseInt(e.substr(0,1),10),i=e.length,j=1;i>j;++j)h=(10*h+parseInt(e.substr(j,1),10))%97;return 1==h}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.id={html5Attributes:{message:"message",country:"country"},validate:function(a,b,c){var d=b.val();if(""==d)return!0;var e=c.country||d.substr(0,2),f=["_",e.toLowerCase()].join("");return this[f]&&"function"==typeof this[f]?this[f](d):!0},_validateJMBG:function(a,b){if(!/^\d{13}$/.test(a))return!1;var c=parseInt(a.substr(0,2),10),d=parseInt(a.substr(2,2),10),e=(parseInt(a.substr(4,3),10),parseInt(a.substr(7,2),10)),f=parseInt(a.substr(12,1),10);if(c>31||d>12)return!1;for(var g=0,h=0;6>h;h++)g+=(7-h)*(parseInt(a.charAt(h))+parseInt(a.charAt(h+6)));if(g=11-g%11,(10==g||11==g)&&(g=0),g!=f)return!1;switch(b.toUpperCase()){case"BA":return e>=10&&19>=e;case"MK":return e>=41&&49>=e;case"ME":return e>=20&&29>=e;case"RS":return e>=70&&99>=e;case"SI":return e>=50&&59>=e;default:return!0}},_ba:function(a){return this._validateJMBG(a,"BA")},_mk:function(a){return this._validateJMBG(a,"MK")},_me:function(a){return this._validateJMBG(a,"ME")},_rs:function(a){return this._validateJMBG(a,"RS")},_si:function(a){return this._validateJMBG(a,"SI")},_bg:function(b){if(!/^\d{10}$/.test(b)&&!/^\d{6}\s\d{3}\s\d{1}$/.test(b))return!1;b=b.replace(/\s/g,"");var c=parseInt(b.substr(0,2),10)+1900,d=parseInt(b.substr(2,2),10),e=parseInt(b.substr(4,2),10);if(d>40?(c+=100,d-=40):d>20&&(c-=100,d-=20),!a.fn.bootstrapValidator.helpers.date(c,d,e))return!1;for(var f=0,g=[2,4,8,5,10,9,7,3,6],h=0;9>h;h++)f+=parseInt(b.charAt(h))*g[h];return f=f%11%10,f==b.substr(9,1)},_br:function(a){if(/^1{11}|2{11}|3{11}|4{11}|5{11}|6{11}|7{11}|8{11}|9{11}|0{11}$/.test(a))return!1;if(!/^\d{11}$/.test(a)&&!/^\d{3}\.\d{3}\.\d{3}-\d{2}$/.test(a))return!1;a=a.replace(/\./g,"").replace(/-/g,"");for(var b=0,c=0;9>c;c++)b+=(10-c)*parseInt(a.charAt(c));if(b=11-b%11,(10==b||11==b)&&(b=0),b!=a.charAt(9))return!1;var d=0;for(c=0;10>c;c++)d+=(11-c)*parseInt(a.charAt(c));return d=11-d%11,(10==d||11==d)&&(d=0),d==a.charAt(10)},_ch:function(a){if(!/^756[\.]{0,1}[0-9]{4}[\.]{0,1}[0-9]{4}[\.]{0,1}[0-9]{2}$/.test(a))return!1;a=a.replace(/\D/g,"").substr(3);for(var b=a.length,c=0,d=8==b?[3,1]:[1,3],e=0;b-1>e;e++)c+=parseInt(a.charAt(e))*d[e%2];return c=10-c%10,c==a.charAt(b-1)},_cl:function(a){if(!/^\d{7,8}[-]{0,1}[0-9K]$/.test(a))return!1;for(a=a.replace(/\D/g,"");a.length<9;)a="0"+a;for(var b=0,c=[3,2,7,6,5,4,3,2],d=0;8>d;d++)b+=parseInt(a.charAt(d))*c[d];return b=11-b%11,11==b?b=0:10==b&&(b="K"),b==a.charAt(8)},_cz:function(b){if(!/^\d{9,10}$/.test(b))return!1;var c=1900+parseInt(b.substr(0,2)),d=parseInt(b.substr(2,2))%50%20,e=parseInt(b.substr(4,2));if(9==b.length){if(c>=1980&&(c-=100),c>1953)return!1}else 1954>c&&(c+=100);if(!a.fn.bootstrapValidator.helpers.date(c,d,e))return!1;if(10==b.length){var f=parseInt(b.substr(0,9),10)%11;return 1985>c&&(f%=10),f==b.substr(9,1)}return!0},_dk:function(b){if(!/^[0-9]{6}[-]{0,1}[0-9]{4}$/.test(b))return!1;b=b.replace(/-/g,"");var c=parseInt(b.substr(0,2),10),d=parseInt(b.substr(2,2),10),e=parseInt(b.substr(4,2),10);switch(!0){case-1!="5678".indexOf(b.charAt(6))&&e>=58:e+=1800;break;case-1!="0123".indexOf(b.charAt(6)):case-1!="49".indexOf(b.charAt(6))&&e>=37:e+=1900;break;default:e+=2e3}return a.fn.bootstrapValidator.helpers.date(e,d,c)},_ee:function(a){return this._lt(a)},_es:function(a){if(!/^[0-9A-Z]{8}[-]{0,1}[0-9A-Z]$/.test(a)&&!/^[XYZ][-]{0,1}[0-9]{7}[-]{0,1}[0-9A-Z]$/.test(a))return!1;a=a.replace(/-/g,"");var b="XYZ".indexOf(a.charAt(0));-1!=b&&(a=b+a.substr(1)+"");var c=parseInt(a.substr(0,8),10);return c="TRWAGMYFPDXBNJZSQVHLCKE"[c%23],c==a.substr(8,1)},_fi:function(b){if(!/^[0-9]{6}[-+A][0-9]{3}[0-9ABCDEFHJKLMNPRSTUVWXY]$/.test(b))return!1;var c=parseInt(b.substr(0,2),10),d=parseInt(b.substr(2,2),10),e=parseInt(b.substr(4,2),10),f={"+":1800,"-":1900,A:2e3};if(e=f[b.charAt(6)]+e,!a.fn.bootstrapValidator.helpers.date(e,d,c))return!1;var g=parseInt(b.substr(7,3));if(2>g)return!1;var h=b.substr(0,6)+b.substr(7,3)+"";return h=parseInt(h),"0123456789ABCDEFHJKLMNPRSTUVWXY".charAt(h%31)==b.charAt(10)},_hr:function(b){return/^[0-9]{11}$/.test(b)?a.fn.bootstrapValidator.helpers.mod_11_10(b):!1},_ie:function(a){if(!/^\d{7}[A-W][AHWTX]?$/.test(a))return!1;var b=function(a){for(;a.length<7;)a="0"+a;for(var b="WABCDEFGHIJKLMNOPQRSTUV",c=0,d=0;7>d;d++)c+=parseInt(a.charAt(d))*(8-d);return c+=9*b.indexOf(a.substr(7)),b[c%23]};return 9!=a.length||"A"!=a.charAt(8)&&"H"!=a.charAt(8)?a.charAt(7)==b(a.substr(0,7)):a.charAt(7)==b(a.substr(0,7)+a.substr(8)+"")},_is:function(b){if(!/^[0-9]{6}[-]{0,1}[0-9]{4}$/.test(b))return!1;b=b.replace(/-/g,"");var c=parseInt(b.substr(0,2),10),d=parseInt(b.substr(2,2),10),e=parseInt(b.substr(4,2),10),f=parseInt(b.charAt(9));if(e=9==f?1900+e:100*(20+f)+e,!a.fn.bootstrapValidator.helpers.date(e,d,c,!0))return!1;for(var g=0,h=[3,2,7,6,5,4,3,2],i=0;8>i;i++)g+=parseInt(b.charAt(i))*h[i];return g=11-g%11,g==b.charAt(8)},_lt:function(b){if(!/^[0-9]{11}$/.test(b))return!1;var c=parseInt(b.charAt(0)),d=parseInt(b.substr(1,2),10),e=parseInt(b.substr(3,2),10),f=parseInt(b.substr(5,2),10),g=c%2==0?17+c/2:17+(c+1)/2;if(d=100*g+d,!a.fn.bootstrapValidator.helpers.date(d,e,f,!0))return!1;for(var h=0,i=[1,2,3,4,5,6,7,8,9,1],j=0;10>j;j++)h+=parseInt(b.charAt(j))*i[j];if(h%=11,10!=h)return h==b.charAt(10);for(h=0,i=[3,4,5,6,7,8,9,1,2,3],j=0;10>j;j++)h+=parseInt(b.charAt(j))*i[j];return h%=11,10==h&&(h=0),h==b.charAt(10)},_lv:function(b){if(!/^[0-9]{6}[-]{0,1}[0-9]{5}$/.test(b))return!1;b=b.replace(/\D/g,"");var c=parseInt(b.substr(0,2)),d=parseInt(b.substr(2,2)),e=parseInt(b.substr(4,2));if(e=e+1800+100*parseInt(b.charAt(6)),!a.fn.bootstrapValidator.helpers.date(e,d,c,!0))return!1;for(var f=0,g=[10,5,8,4,2,1,6,3,7,9],h=0;10>h;h++)f+=parseInt(b.charAt(h))*g[h];return f=(f+1)%11%10,f==b.charAt(10)},_nl:function(a){for(;a.length<9;)a="0"+a;if(!/^[0-9]{4}[.]{0,1}[0-9]{2}[.]{0,1}[0-9]{3}$/.test(a))return!1;if(a=a.replace(/\./g,""),0==parseInt(a,10))return!1;for(var b=0,c=a.length,d=0;c-1>d;d++)b+=(9-d)*parseInt(a.charAt(d));return b%=11,10==b&&(b=0),b==a.charAt(c-1)},_ro:function(b){if(!/^[0-9]{13}$/.test(b))return!1;var c=parseInt(b.charAt(0));if(0==c||7==c||8==c)return!1;var d=parseInt(b.substr(1,2),10),e=parseInt(b.substr(3,2),10),f=parseInt(b.substr(5,2),10),g={1:1900,2:1900,3:1800,4:1800,5:2e3,6:2e3};if(f>31&&e>12)return!1;if(9!=c&&(d=g[c+""]+d,!a.fn.bootstrapValidator.helpers.date(d,e,f)))return!1;for(var h=0,i=[2,7,9,1,4,6,3,5,8,2,7,9],j=b.length,k=0;j-1>k;k++)h+=parseInt(b.charAt(k))*i[k];
+return h%=11,10==h&&(h=1),h==b.charAt(j-1)},_se:function(b){if(!/^[0-9]{10}$/.test(b)&&!/^[0-9]{6}[-|+][0-9]{4}$/.test(b))return!1;b=b.replace(/[^0-9]/g,"");var c=parseInt(b.substr(0,2))+1900,d=parseInt(b.substr(2,2)),e=parseInt(b.substr(4,2));return a.fn.bootstrapValidator.helpers.date(c,d,e)?a.fn.bootstrapValidator.helpers.luhn(b):!1},_sk:function(a){return this._cz(a)},_sm:function(a){return/^\d{5}$/.test(a)},_za:function(b){if(!/^[0-9]{10}[0|1][8|9][0-9]$/.test(b))return!1;var c=parseInt(b.substr(0,2)),d=(new Date).getFullYear()%100,e=parseInt(b.substr(2,2)),f=parseInt(b.substr(4,2));return c=c>=d?c+1900:c+2e3,a.fn.bootstrapValidator.helpers.date(c,e,f)?a.fn.bootstrapValidator.helpers.luhn(b):!1}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.identical={html5Attributes:{message:"message",field:"field"},validate:function(a,b,c){var d=b.val();if(""==d)return!0;var e=a.getFieldElements(c.field);return null==e?!0:d==e.val()?(a.updateStatus(c.field,a.STATUS_VALID,"identical"),!0):!1}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.imei={validate:function(b,c){var d=c.val();if(""==d)return!0;switch(!0){case/^\d{15}$/.test(d):case/^\d{2}-\d{6}-\d{6}-\d{1}$/.test(d):case/^\d{2}\s\d{6}\s\d{6}\s\d{1}$/.test(d):return d=d.replace(/[^0-9]/g,""),a.fn.bootstrapValidator.helpers.luhn(d);case/^\d{14}$/.test(d):case/^\d{16}$/.test(d):case/^\d{2}-\d{6}-\d{6}(|-\d{2})$/.test(d):case/^\d{2}\s\d{6}\s\d{6}(|\s\d{2})$/.test(d):return!0;default:return!1}}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.integer={enableByHtml5:function(a){return"number"==a.attr("type")},validate:function(a,b){var c=b.val();return""==c?!0:/^(?:-?(?:0|[1-9][0-9]*))$/.test(c)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.ip={html5Attributes:{message:"message",ipv4:"ipv4",ipv6:"ipv6"},validate:function(b,c,d){var e=c.val();return""==e?!0:(d=a.extend({},{ipv4:!0,ipv6:!0},d),d.ipv4?/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(e):d.ipv6?/^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/.test(str):!1)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.isbn={validate:function(a,b){var c=b.val();if(""==c)return!0;var d;switch(!0){case/^\d{9}[\dX]$/.test(c):case 13==c.length&&/^(\d+)-(\d+)-(\d+)-([\dX])$/.test(c):case 13==c.length&&/^(\d+)\s(\d+)\s(\d+)\s([\dX])$/.test(c):d="ISBN10";break;case/^(978|979)\d{9}[\dX]$/.test(c):case 17==c.length&&/^(978|979)-(\d+)-(\d+)-(\d+)-([\dX])$/.test(c):case 17==c.length&&/^(978|979)\s(\d+)\s(\d+)\s(\d+)\s([\dX])$/.test(c):d="ISBN13";break;default:return!1}c=c.replace(/[^0-9X]/gi,"");var e,f=c.split(""),g=f.length,h=0;switch(d){case"ISBN10":h=0;for(var i=0;g-1>i;i++)h+=(10-i)*parseInt(f[i]);return e=11-h%11,11==e?e=0:10==e&&(e="X"),e+""==f[g-1];case"ISBN13":h=0;for(var i=0;g-1>i;i++)h+=i%2==0?parseInt(f[i]):3*parseInt(f[i]);return e=10-h%10,10==e&&(e="0"),e+""==f[g-1];default:return!1}}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.isin={COUNTRY_CODES:"AF|AX|AL|DZ|AS|AD|AO|AI|AQ|AG|AR|AM|AW|AU|AT|AZ|BS|BH|BD|BB|BY|BE|BZ|BJ|BM|BT|BO|BQ|BA|BW|BV|BR|IO|BN|BG|BF|BI|KH|CM|CA|CV|KY|CF|TD|CL|CN|CX|CC|CO|KM|CG|CD|CK|CR|CI|HR|CU|CW|CY|CZ|DK|DJ|DM|DO|EC|EG|SV|GQ|ER|EE|ET|FK|FO|FJ|FI|FR|GF|PF|TF|GA|GM|GE|DE|GH|GI|GR|GL|GD|GP|GU|GT|GG|GN|GW|GY|HT|HM|VA|HN|HK|HU|IS|IN|ID|IR|IQ|IE|IM|IL|IT|JM|JP|JE|JO|KZ|KE|KI|KP|KR|KW|KG|LA|LV|LB|LS|LR|LY|LI|LT|LU|MO|MK|MG|MW|MY|MV|ML|MT|MH|MQ|MR|MU|YT|MX|FM|MD|MC|MN|ME|MS|MA|MZ|MM|NA|NR|NP|NL|NC|NZ|NI|NE|NG|NU|NF|MP|NO|OM|PK|PW|PS|PA|PG|PY|PE|PH|PN|PL|PT|PR|QA|RE|RO|RU|RW|BL|SH|KN|LC|MF|PM|VC|WS|SM|ST|SA|SN|RS|SC|SL|SG|SX|SK|SI|SB|SO|ZA|GS|SS|ES|LK|SD|SR|SJ|SZ|SE|CH|SY|TW|TJ|TZ|TH|TL|TG|TK|TO|TT|TN|TR|TM|TC|TV|UG|UA|AE|GB|US|UM|UY|UZ|VU|VE|VN|VG|VI|WF|EH|YE|ZM|ZW",validate:function(a,b){var c=b.val();if(""==c)return!0;c=c.toUpperCase();var d=new RegExp("^("+this.COUNTRY_CODES+")[0-9A-Z]{10}$");if(!d.test(c))return!1;for(var e="",f=c.length,g=0;f-1>g;g++){var h=c.charCodeAt(g);e+=h>57?(h-55).toString():c.charAt(g)}var i="",j=e.length,k=j%2!=0?0:1;for(g=0;j>g;g++)i+=parseInt(e[g])*(g%2==k?2:1)+"";var l=0;for(g=0;g<i.length;g++)l+=parseInt(i.charAt(g));return l=(10-l%10)%10,l==c.charAt(f-1)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.ismn={validate:function(a,b){var c=b.val();if(""==c)return!0;var d;switch(!0){case/^M\d{9}$/.test(c):case/^M-\d{4}-\d{4}-\d{1}$/.test(c):case/^M\s\d{4}\s\d{4}\s\d{1}$/.test(c):d="ISMN10";break;case/^9790\d{9}$/.test(c):case/^979-0-\d{4}-\d{4}-\d{1}$/.test(c):case/^979\s0\s\d{4}\s\d{4}\s\d{1}$/.test(c):d="ISMN13";break;default:return!1}"ISMN10"==d&&(c="9790"+c.substr(1)),c=c.replace(/[^0-9]/gi,"");for(var e=c.length,f=0,g=[1,3],h=0;e-1>h;h++)f+=parseInt(c.charAt(h))*g[h%2];return f=10-f%10,f==c.charAt(e-1)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.issn={validate:function(a,b){var c=b.val();if(""==c)return!0;if(!/^\d{4}\-\d{3}[\dX]$/.test(c))return!1;c=c.replace(/[^0-9X]/gi,"");var d=c.split(""),e=d.length,f=0;"X"==d[7]&&(d[7]=10);for(var g=0;e>g;g++)f+=(8-g)*parseInt(d[g]);return f%11==0}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.lessThan={html5Attributes:{message:"message",value:"value",inclusive:"inclusive"},enableByHtml5:function(a){var b=a.attr("max");return b?{value:b}:!1},validate:function(a,b,c){var d=b.val();return""==d?!0:(d=parseFloat(d),c.inclusive===!1?d<=c.value:d<c.value)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.mac={validate:function(a,b){var c=b.val();return""==c?!0:/^([0-9A-F]{2}[:-]){5}([0-9A-F]{2})$/.test(c)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.notEmpty={enableByHtml5:function(a){var b=a.attr("required")+"";return"required"==b||"true"==b},validate:function(b,c){var d=c.attr("type");return"radio"==d||"checkbox"==d?b.getFieldElements(c.attr("data-bv-field")).filter(":checked").length>0:""!=a.trim(c.val())}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.numeric={html5Attributes:{message:"message",separator:"separator"},validate:function(a,b,c){var d=b.val();if(""==d)return!0;var e=c.separator||".";return"."!=e&&(d=d.replace(e,".")),!isNaN(parseFloat(d))&&isFinite(d)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.phone={html5Attributes:{message:"message",country:"country"},validate:function(a,b,c){var d=b.val();if(""==d)return!0;var e=(c.country||"US").toUpperCase();switch(e){case"US":default:return d=d.replace(/\D/g,""),/^(?:(1\-?)|(\+1 ?))?\(?(\d{3})[\)\-\.]?(\d{3})[\-\.]?(\d{4})$/.test(d)&&10==d.length}}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.regexp={html5Attributes:{message:"message",regexp:"regexp"},enableByHtml5:function(a){var b=a.attr("pattern");return b?{regexp:b}:!1},validate:function(a,b,c){var d=b.val();if(""==d)return!0;var e="string"==typeof c.regexp?new RegExp(c.regexp):c.regexp;return e.test(d)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.remote={html5Attributes:{message:"message",url:"url",name:"name"},validate:function(b,c,d){var e=c.val();if(""==e)return!0;var f=c.attr("data-bv-field"),g=d.data;null==g&&(g={}),"function"==typeof g&&(g=g.call(this,b)),g[d.name||f]=e;var h=new a.Deferred,i=a.ajax({type:"POST",url:d.url,dataType:"json",data:g});return i.then(function(a){h.resolve(c,"remote",a.valid===!0||"true"===a.valid)}),h.fail(function(){i.abort()}),h}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.rtn={validate:function(a,b){var c=b.val();if(""==c)return!0;if(!/^\d{9}$/.test(c))return!1;for(var d=0,e=0;e<c.length;e+=3)d+=3*parseInt(c.charAt(e),10)+7*parseInt(c.charAt(e+1),10)+parseInt(c.charAt(e+2),10);return 0!=d&&d%10==0}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.sedol={validate:function(a,b){var c=b.val();if(""==c)return!0;if(c=c.toUpperCase(),!/^[0-9A-Z]{7}$/.test(c))return!1;for(var d=0,e=[1,3,1,7,3,9,1],f=c.length,g=0;f-1>g;g++)d+=e[g]*parseInt(c.charAt(g),36);return d=(10-d%10)%10,d==c.charAt(f-1)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.siren={validate:function(b,c){var d=c.val();return""==d?!0:/^\d{9}$/.test(d)?a.fn.bootstrapValidator.helpers.luhn(d):!1}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.siret={validate:function(a,b){var c=b.val();if(""==c)return!0;for(var d,e=0,f=c.length,g=0;f>g;g++)d=parseInt(c.charAt(g),10),g%2==0&&(d=2*d,d>9&&(d-=9)),e+=d;return e%10==0}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.step={html5Attributes:{message:"message",base:"baseValue",step:"step"},validate:function(b,c,d){var e=c.val();if(""==e)return!0;if(d=a.extend({},{baseValue:0,step:1},d),e=parseFloat(e),isNaN(e)||!isFinite(e))return!1;var f=function(a,b){var c=Math.pow(10,b);a*=c;var d=a>0|-(0>a),e=a%1===.5*d;return e?(Math.floor(a)+(d>0))/c:Math.round(a)/c},g=function(a,b){if(0==b)return 1;var c=(a+"").split("."),d=(b+"").split("."),e=(1==c.length?0:c[1].length)+(1==d.length?0:d[1].length);return f(a-b*Math.floor(a/b),e)},h=g(e-d.baseValue,d.step);return 0==h||h==d.step}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.stringCase={html5Attributes:{message:"message","case":"case"},validate:function(a,b,c){var d=b.val();if(""==d)return!0;var e=(c["case"]||"lower").toLowerCase();switch(e){case"upper":return d===d.toUpperCase();case"lower":default:return d===d.toLowerCase()}}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.stringLength={html5Attributes:{message:"message",min:"min",max:"max"},enableByHtml5:function(a){var b=a.attr("maxlength");return b?{max:parseInt(b,10)}:!1},validate:function(b,c,d){var e=c.val();if(""==e)return!0;var f=a.trim(e).length;return d.min&&f<d.min||d.max&&f>d.max?!1:!0}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.uri={enableByHtml5:function(a){return"url"==a.attr("type")},validate:function(a,b){var c=b.val();if(""==c)return!0;var d=new RegExp("^(?:(?:https?|ftp)://)(?:\\S+(?::\\S*)?@)?(?:(?!10(?:\\.\\d{1,3}){3})(?!127(?:\\.\\d{1,3}){3})(?!169\\.254(?:\\.\\d{1,3}){2})(?!192\\.168(?:\\.\\d{1,3}){2})(?!172\\.(?:1[6-9]|2\\d|3[0-1])(?:\\.\\d{1,3}){2})(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-z\\u00a1-\\uffff0-9]+-?)*[a-z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-z\\u00a1-\\uffff]{2,})))(?::\\d{2,5})?(?:/[^\\s]*)?$","i");return d.test(c)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.uuid={html5Attributes:{message:"message",version:"version"},validate:function(a,b,c){var d=b.val();if(""==d)return!0;var e={3:/^[0-9A-F]{8}-[0-9A-F]{4}-3[0-9A-F]{3}-[0-9A-F]{4}-[0-9A-F]{12}$/i,4:/^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i,5:/^[0-9A-F]{8}-[0-9A-F]{4}-5[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i,all:/^[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i},f=c.version?c.version+"":"all";return null==e[f]?!0:e[f].test(d)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.vat={html5Attributes:{message:"message",country:"country"},validate:function(a,b,c){var d=b.val();if(""==d)return!0;var e=c.country||d.substr(0,2),f=["_",e.toLowerCase()].join("");return this[f]&&"function"==typeof this[f]?this[f](d):!0},_at:function(a){if(!/^ATU[0-9]{8}$/.test(a))return!1;a=a.substr(3);for(var b=0,c=[1,2,1,2,1,2,1],d=0,e=0;7>e;e++)d=parseInt(a.charAt(e))*c[e],d>9&&(d=Math.floor(d/10)+d%10),b+=d;return b=10-(b+4)%10,10==b&&(b=0),b==a.substr(7,1)},_be:function(a){if(!/^BE[0]{0,1}[0-9]{9}$/.test(a))return!1;if(a=a.substr(2),9==a.length&&(a="0"+a),0==a.substr(1,1))return!1;var b=parseInt(a.substr(0,8),10)+parseInt(a.substr(8,2),10);return b%97==0},_bg:function(b){if(!/^BG[0-9]{9,10}$/.test(b))return!1;b=b.substr(2);var c=0,d=0;if(9==b.length){for(d=0;8>d;d++)c+=parseInt(b.charAt(d))*(d+1);if(c%=11,10==c)for(c=0,d=0;8>d;d++)c+=parseInt(b.charAt(d))*(d+3);return c%=10,c==b.substr(8)}if(10==b.length){var e=function(b){var c=parseInt(b.substr(0,2),10)+1900,d=parseInt(b.substr(2,2),10),e=parseInt(b.substr(4,2),10);if(d>40?(c+=100,d-=40):d>20&&(c-=100,d-=20),!a.fn.bootstrapValidator.helpers.date(c,d,e))return!1;for(var f=0,g=[2,4,8,5,10,9,7,3,6],h=0;9>h;h++)f+=parseInt(b.charAt(h))*g[h];return f=f%11%10,f==b.substr(9,1)},f=function(a){for(var b=0,c=[21,19,17,13,11,9,7,3,1],d=0;9>d;d++)b+=parseInt(a.charAt(d))*c[d];return b%=10,b==a.substr(9,1)},g=function(a){for(var b=0,c=[4,3,2,7,6,5,4,3,2],d=0;9>d;d++)b+=parseInt(a.charAt(d))*c[d];return b=11-b%11,10==b?!1:(11==b&&(b=0),b==a.substr(9,1))};return e(b)||f(b)||g(b)}return!1},_ch:function(a){if(!/^CHE[0-9]{9}(MWST)?$/.test(a))return!1;a=a.substr(3);for(var b=0,c=[5,4,3,2,7,6,5,4],d=0;8>d;d++)b+=parseInt(a.charAt(d),10)*c[d];return b=11-b%11,10==b?!1:(11==b&&(b=0),b==a.substr(8,1))},_cy:function(a){if(!/^CY[0-5|9]{1}[0-9]{7}[A-Z]{1}$/.test(a))return!1;if(a=a.substr(2),"12"==a.substr(0,2))return!1;for(var b=0,c={0:1,1:0,2:5,3:7,4:9,5:13,6:15,7:17,8:19,9:21},d=0;8>d;d++){var e=parseInt(a.charAt(d),10);d%2==0&&(e=c[e+""]),b+=e}return b="ABCDEFGHIJKLMNOPQRSTUVWXYZ"[b%26],b==a.substr(8,1)},_cz:function(b){if(!/^CZ[0-9]{8,10}$/.test(b))return!1;b=b.substr(2);var c=0,d=0;if(8==b.length){if(b.charAt(0)+""=="9")return!1;for(c=0,d=0;7>d;d++)c+=parseInt(b.charAt(d),10)*(8-d);return c=11-c%11,10==c&&(c=0),11==c&&(c=1),c==b.substr(7,1)}if(9==b.length&&b.charAt(0)+""=="6"){for(c=0,d=0;7>d;d++)c+=parseInt(b.charAt(d+1),10)*(8-d);return c=11-c%11,10==c&&(c=0),11==c&&(c=1),c=[8,7,6,5,4,3,2,1,0,9,10][c-1],c==b.substr(8,1)}if(9==b.length||10==b.length){var e=1900+parseInt(b.substr(0,2)),f=parseInt(b.substr(2,2))%50%20,g=parseInt(b.substr(4,2));if(9==b.length){if(e>=1980&&(e-=100),e>1953)return!1}else 1954>e&&(e+=100);if(!a.fn.bootstrapValidator.helpers.date(e,f,g))return!1;if(10==b.length){var h=parseInt(b.substr(0,9),10)%11;return 1985>e&&(h%=10),h==b.substr(9,1)}return!0}return!1},_de:function(b){return/^DE[0-9]{9}$/.test(b)?(b=b.substr(2),a.fn.bootstrapValidator.helpers.mod_11_10(b)):!1},_dk:function(a){if(!/^DK[0-9]{8}$/.test(a))return!1;a=a.substr(2);for(var b=0,c=[2,7,6,5,4,3,2,1],d=0;8>d;d++)b+=parseInt(a.charAt(d),10)*c[d];return b%11==0},_ee:function(a){if(!/^EE[0-9]{9}$/.test(a))return!1;a=a.substr(2);for(var b=0,c=[3,7,1,3,7,1,3,7,1],d=0;9>d;d++)b+=parseInt(a.charAt(d))*c[d];return b%10==0},_es:function(a){if(!/^ES[0-9A-Z][0-9]{7}[0-9A-Z]$/.test(a))return!1;a=a.substr(2);var b=function(a){var b=parseInt(a.substr(0,8),10);return b="TRWAGMYFPDXBNJZSQVHLCKE"[b%23],b==a.substr(8,1)},c=function(a){var b=["XYZ".indexOf(a.charAt(0)),a.substr(1)].join("");return b=parseInt(b,10),b="TRWAGMYFPDXBNJZSQVHLCKE"[b%23],b==a.substr(8,1)},d=function(a){var b,c=a.charAt(0);if(-1!="KLM".indexOf(c))return b=parseInt(a.substr(1,8),10),b="TRWAGMYFPDXBNJZSQVHLCKE"[b%23],b==a.substr(8,1);if(-1!="ABCDEFGHJNPQRSUVW".indexOf(c)){for(var d=0,e=[2,1,2,1,2,1,2],f=0,g=0;7>g;g++)f=parseInt(a.charAt(g+1))*e[g],f>9&&(f=Math.floor(f/10)+f%10),d+=f;return d=10-d%10,d==a.substr(8,1)||"JABCDEFGHI"[d]==a.substr(8,1)}return!1},e=a.charAt(0);return/^[0-9]$/.test(e)?b(a):/^[XYZ]$/.test(e)?c(a):d(a)},_fi:function(a){if(!/^FI[0-9]{8}$/.test(a))return!1;a=a.substr(2);for(var b=0,c=[7,9,10,5,8,4,2,1],d=0;8>d;d++)b+=parseInt(a.charAt(d))*c[d];return b%11==0},_fr:function(b){if(!/^FR[0-9A-Z]{2}[0-9]{9}$/.test(b))return!1;if(b=b.substr(2),!a.fn.bootstrapValidator.helpers.luhn(b.substr(2)))return!1;if(/^[0-9]{2}$/.test(b.substr(0,2)))return b.substr(0,2)==parseInt(b.substr(2)+"12",10)%97;var c,d="0123456789ABCDEFGHJKLMNPQRSTUVWXYZ";return c=/^[0-9]{1}$/.test(b.charAt(0))?24*d.indexOf(b.charAt(0))+d.indexOf(b.charAt(1))-10:34*d.indexOf(b.charAt(0))+d.indexOf(b.charAt(1))-100,(parseInt(b.substr(2),10)+1+Math.floor(c/11))%11==c%11},_gb:function(a){if(!(/^GB[0-9]{9}$/.test(a)||/^GB[0-9]{12}$/.test(a)||/^GBGD[0-9]{3}$/.test(a)||/^GBHA[0-9]{3}$/.test(a)||/^GB(GD|HA)8888[0-9]{5}$/.test(a)))return!1;a=a.substr(2);var b=a.length;if(5==b){var c=a.substr(0,2),d=parseInt(a.substr(2));return"GD"==c&&500>d||"HA"==c&&d>=500}if(11==b&&("GD8888"==a.substr(0,6)||"HA8888"==a.substr(0,6)))return"GD"==a.substr(0,2)&&parseInt(a.substr(6,3))>=500||"HA"==a.substr(0,2)&&parseInt(a.substr(6,3))<500?!1:parseInt(a.substr(6,3))%97==parseInt(a.substr(9,2));if(9==b||12==b){for(var e=0,f=[8,7,6,5,4,3,2,10,1],g=0;9>g;g++)e+=parseInt(a.charAt(g))*f[g];return e%=97,parseInt(a.substr(0,3))>=100?0==e||42==e||55==e:0==e}return!0},_gr:function(a){if(!/^GR[0-9]{9}$/.test(a))return!1;a=a.substr(2),8==a.length&&(a="0"+a);for(var b=0,c=[256,128,64,32,16,8,4,2],d=0;8>d;d++)b+=parseInt(a.charAt(d))*c[d];return b=b%11%10,b==a.substr(8,1)},_el:function(a){return/^EL[0-9]{9}$/.test(a)?(a="GR"+a.substr(2),this._gr(a)):!1},_hu:function(a){if(!/^HU[0-9]{8}$/.test(a))return!1;a=a.substr(2);for(var b=0,c=[9,7,3,1,9,7,3,1],d=0;8>d;d++)b+=parseInt(a.charAt(d))*c[d];return b%10==0},_hr:function(b){return/^HR[0-9]{11}$/.test(b)?(b=b.substr(2),a.fn.bootstrapValidator.helpers.mod_11_10(b)):!1},_ie:function(a){if(!/^IE[0-9]{1}[0-9A-Z\*\+]{1}[0-9]{5}[A-Z]{1,2}$/.test(a))return!1;a=a.substr(2);var b=function(a){for(;a.length<7;)a="0"+a;for(var b="WABCDEFGHIJKLMNOPQRSTUV",c=0,d=0;7>d;d++)c+=parseInt(a.charAt(d))*(8-d);return c+=9*b.indexOf(a.substr(7)),b[c%23]};return/^[0-9]+$/.test(a.substr(0,7))?a.charAt(7)==b(a.substr(0,7)+a.substr(8)+""):-1!="ABCDEFGHIJKLMNOPQRSTUVWXYZ+*".indexOf(a.charAt(1))?a.charAt(7)==b(a.substr(2,5)+a.substr(0,1)+""):!0},_it:function(b){if(!/^IT[0-9]{11}$/.test(b))return!1;if(b=b.substr(2),0==parseInt(b.substr(0,7)))return!1;var c=parseInt(b.substr(7,3));return 1>c||c>201&&999!=c&&888!=c?!1:a.fn.bootstrapValidator.helpers.luhn(b)},_lt:function(a){if(!/^LT([0-9]{7}1[0-9]{1}|[0-9]{10}1[0-9]{1})$/.test(a))return!1;a=a.substr(2);for(var b=a.length,c=0,d=0;b-1>d;d++)c+=parseInt(a.charAt(d))*(1+d%9);var e=c%11;if(10==e){c=0;for(var d=0;b-1>d;d++)c+=parseInt(a.charAt(d))*(1+(d+2)%9)}return e=e%11%10,e==a.charAt(b-1)},_lu:function(a){return/^LU[0-9]{8}$/.test(a)?(a=a.substr(2),a.substr(0,6)%89==a.substr(6,2)):!1},_lv:function(b){if(!/^LV[0-9]{11}$/.test(b))return!1;b=b.substr(2);var c=parseInt(b.charAt(0)),d=0,e=[],f=0,g=b.length;if(c>3){for(d=0,e=[9,1,4,8,3,10,2,5,7,6,1],f=0;g>f;f++)d+=parseInt(b.charAt(f))*e[f];return d%=11,3==d}var h=parseInt(b.substr(0,2)),i=parseInt(b.substr(2,2)),j=parseInt(b.substr(4,2));if(j=j+1800+100*parseInt(b.charAt(6)),!a.fn.bootstrapValidator.helpers.date(j,i,h))return!1;for(d=0,e=[10,5,8,4,2,1,6,3,7,9],f=0;g-1>f;f++)d+=parseInt(b.charAt(f))*e[f];return d=(d+1)%11%10,d==b.charAt(g-1)},_mt:function(a){if(!/^MT[0-9]{8}$/.test(a))return!1;a=a.substr(2);for(var b=0,c=[3,4,6,7,8,9,10,1],d=0;8>d;d++)b+=parseInt(a.charAt(d))*c[d];return b%37==0},_nl:function(a){if(!/^NL[0-9]{9}B[0-9]{2}$/.test(a))return!1;a=a.substr(2);for(var b=0,c=[9,8,7,6,5,4,3,2],d=0;8>d;d++)b+=parseInt(a.charAt(d))*c[d];return b%=11,b>9&&(b=0),b==a.substr(8,1)},_no:function(a){if(!/^NO[0-9]{9}$/.test(a))return!1;a=a.substr(2);for(var b=0,c=[3,2,7,6,5,4,3,2],d=0;8>d;d++)b+=parseInt(a.charAt(d))*c[d];return b=11-b%11,11==b&&(b=0),b==a.substr(8,1)},_pl:function(a){if(!/^PL[0-9]{10}$/.test(a))return!1;a=a.substr(2);for(var b=0,c=[6,5,7,2,3,4,5,6,7,-1],d=0;10>d;d++)b+=parseInt(a.charAt(d))*c[d];return b%11==0},_pt:function(a){if(!/^PT[0-9]{9}$/.test(a))return!1;a=a.substr(2);for(var b=0,c=[9,8,7,6,5,4,3,2],d=0;8>d;d++)b+=parseInt(a.charAt(d))*c[d];return b=11-b%11,b>9&&(b=0),b==a.substr(8,1)},_ro:function(a){if(!/^RO[1-9][0-9]{1,9}$/.test(a))return!1;a=a.substr(2);for(var b=a.length,c=[7,5,3,2,1,7,5,3,2].slice(10-b),d=0,e=0;b-1>e;e++)d+=parseInt(a.charAt(e))*c[e];return d=10*d%11%10,d==a.substr(b-1,1)},_ru:function(a){if(!/^RU([0-9]{9}|[0-9]{12})$/.test(a))return!1;if(a=a.substr(2),10==a.length){for(var b=0,c=[2,4,10,3,5,9,4,6,8,0],d=0;10>d;d++)b+=parseInt(a.charAt(d))*c[d];return b%=11,b>9&&(b%=10),b==a.substr(9,1)}if(12==a.length){for(var e=0,f=[7,2,4,10,3,5,9,4,6,8,0],g=0,h=[3,7,2,4,10,3,5,9,4,6,8,0],d=0;11>d;d++)e+=parseInt(a.charAt(d))*f[d],g+=parseInt(a.charAt(d))*h[d];return e%=11,e>9&&(e%=10),g%=11,g>9&&(g%=10),e==a.substr(10,1)&&g==a.substr(11,1)}return!1},_rs:function(a){if(!/^RS[0-9]{9}$/.test(a))return!1;a=a.substr(2);for(var b=10,c=0,d=0;8>d;d++)c=(parseInt(a.charAt(d))+b)%10,0==c&&(c=10),b=2*c%11;return(b+parseInt(a.substr(8,1)))%10==1},_se:function(b){return/^SE[0-9]{10}01$/.test(b)?(b=b.substr(2,10),a.fn.bootstrapValidator.helpers.luhn(b)):!1},_si:function(a){if(!/^SI[0-9]{8}$/.test(a))return!1;a=a.substr(2);for(var b=0,c=[8,7,6,5,4,3,2],d=0;7>d;d++)b+=parseInt(a.charAt(d))*c[d];return b=11-b%11,10==b&&(b=0),b==a.substr(7,1)},_sk:function(a){return/^SK[1-9][0-9][(2-4)|(6-9)][0-9]{7}$/.test(a)?(a=a.substr(2),a%11==0):!1}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.vin={validate:function(a,b){var c=b.val();if(""==c)return!0;if(!/^[a-hj-npr-z0-9]{8}[0-9xX][a-hj-npr-z0-9]{8}$/i.test(c))return!1;c=c.toUpperCase();for(var d={A:1,B:2,C:3,D:4,E:5,F:6,G:7,H:8,J:1,K:2,L:3,M:4,N:5,P:7,R:9,S:2,T:3,U:4,V:5,W:6,X:7,Y:8,Z:9,1:1,2:2,3:3,4:4,5:5,6:6,7:7,8:8,9:9,0:0},e=[8,7,6,5,4,3,2,10,0,9,8,7,6,5,4,3,2],f=0,g=c.length,h=0;g>h;h++)f+=d[c.charAt(h)+""]*e[h];var i=f%11;return 10==i&&(i="X"),i==c.charAt(8)}}}(window.jQuery),function(a){a.fn.bootstrapValidator.validators.zipCode={html5Attributes:{message:"message",country:"country"},validate:function(a,b,c){var d=b.val();if(""==d||!c.country)return!0;var e=(c.country||"US").toUpperCase();switch(e){case"CA":return/(?:A|B|C|E|G|J|K|L|M|N|P|R|S|T|V|X|Y){1}[0-9]{1}(?:A|B|C|E|G|J|K|L|M|N|P|R|S|T|V|X|Y){1}\s?[0-9]{1}(?:A|B|C|E|G|J|K|L|M|N|P|R|S|T|V|X|Y){1}[0-9]{1}/i.test(d);case"DK":return/^(DK(-|\s)?)?\d{4}$/i.test(d);case"GB":return this._gb(d);case"IT":return/^(I-|IT-)?\d{5}$/i.test(d);case"NL":return/^[1-9][0-9]{3} ?(?!sa|sd|ss)[a-z]{2}$/i.test(d);case"SE":return/^(S-)?\d{3}\s?\d{2}$/i.test(d);case"US":default:return/^\d{4,5}([\-]\d{4})?$/.test(d)}},_gb:function(a){for(var b="[ABCDEFGHIJKLMNOPRSTUWYZ]",c="[ABCDEFGHKLMNOPQRSTUVWXY]",d="[ABCDEFGHJKPMNRSTUVWXY]",e="[ABEHMNPRVWXY]",f="[ABDEFGHJLNPQRSTUWXYZ]",g=[new RegExp("^("+b+"{1}"+c+"?[0-9]{1,2})(\\s*)([0-9]{1}"+f+"{2})$","i"),new RegExp("^("+b+"{1}[0-9]{1}"+d+"{1})(\\s*)([0-9]{1}"+f+"{2})$","i"),new RegExp("^("+b+"{1}"+c+"{1}?[0-9]{1}"+e+"{1})(\\s*)([0-9]{1}"+f+"{2})$","i"),new RegExp("^(BF1)(\\s*)([0-6]{1}[ABDEFGHJLNPQRST]{1}[ABDEFGHJLNPQRSTUWZYZ]{1})$","i"),/^(GIR)(\s*)(0AA)$/i,/^(BFPO)(\s*)([0-9]{1,4})$/i,/^(BFPO)(\s*)(c\/o\s*[0-9]{1,3})$/i,/^([A-Z]{4})(\s*)(1ZZ)$/i,/^(AI-2640)$/i],h=0;h<g.length;h++)if(g[h].test(a))return!0;return!1}}}(window.jQuery);
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/gallery/gallery.html b/ruoyi-content/src/main/resources/templates/content/gallery/gallery.html
new file mode 100644
index 000000000..9becb9df5
--- /dev/null
+++ b/ruoyi-content/src/main/resources/templates/content/gallery/gallery.html
@@ -0,0 +1,211 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('图片上传')"/>
+</head>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form enctype="multipart/form-data" method="post"
+          onsubmit="return iframeCallback(this, pageAjaxDone)" id="formData"
+          class="form-horizontal">
+        <div class="panel panel-primary  panel-width">
+            <div class="panel-heading">
+                <h3 class="panel-title">图片信息</h3>
+            </div>
+            <div class="panel-body">
+
+                <div class="form-group">
+                    <label class="col-sm-4 control-label is-required">分享名片图片：</label>
+                    <div class="col-sm-5">
+                        <input name="imgUrl" id="shareImgs" class="file projectfile" type="file" required/>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label class="col-sm-4 control-label">添加广告：</label>
+                    <div class="col-sm-3">
+                        <select class="form-control" id="picAdId" name="picAdId">
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <table align="center">
+            <br/>
+            <tr>
+                <td></td>
+                <td class="control-label">
+                    <div class="vspace-30"></div>
+                </td>
+                <td align="center" colspan="2"><a
+                        class="btn btn-lg btn-primary" href="#" id="send">保存 <i
+                        class="icon-plus-sign"></i></a></td>
+            </tr>
+        </table>
+    </form>
+</div>
+<div class="modal fade" id="up_showDialog" tabindex="-1" role="dialog" aria-labelledby="gridSystemModalLabel"
+     aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="gridSystemModalLabel">
+                        <span class="glyphicon glyphicon-info-sign" aria-hidden="true"
+                              style="margin-right: 5px; top: 2px;"></span>数据保存
+                </h5>
+            </div>
+            <div class="modal-body">正在上传数据,请耐心等待......</div>
+        </div>
+        <!-- /.modal-content -->
+    </div>
+    <!-- /.modal-dialog -->
+</div>
+<!--创建成功提示-->
+<div class="modal fade" id="successBox" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
+     aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title fa fa-info-circle" id="myModalLabel">操作提示</h5>
+            </div>
+            <div class="modal-body">恭喜，创建成功！</div>
+            <div class="modal-footer">
+                <a type="button" id="continueAdd" th:href="@{/content/gallery}" class="btn btn-sm btn-primary">继续创建</a>
+                <a type="button" id="goList" th:href="@{/content/gallery}" class="btn btn-sm btn-primary">去查看</a>
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<link th:href="@{/css/bootstrapValidator.min.css}" rel="stylesheet"/>
+<link th:href="@{/css/fileinput.min.css}" rel="stylesheet"/>
+<script th:src="@{/js/bootstrapValidator.min.js}"></script>
+<script th:src="@{/js/fileinput.min.js}"></script>
+<script th:src="@{/js/fileinput_locale_zh.js}"></script>
+<script th:inline="javascript">
+    var prefix = ctx + "content/picAdverts"
+    var prefix1 = ctx + "content/gallery"
+
+    $(function () {
+        //初始化bootstrap校验设置
+        $('#formData').bootstrapValidator({
+            message: '内容不能为空！',
+            feedbackIcons: {
+                valid: 'glyphicon glyphicon-ok',
+                invalid: 'glyphicon glyphicon-remove',
+                validating: 'glyphicon glyphicon-refresh'
+            },
+            fields: {}
+        });
+
+        galleryTypeInit("picAdId");
+    });
+
+    function galleryTypeInit(id) {
+        $.ajax({
+            type: "post",
+            url: prefix + '/cardInfo',
+            success: function (data) {
+                if (data) {
+                    $("#" + id + " option").remove();
+                    var obj = data;
+                    $("#" + id).append("<option value=''>请选择</option>");
+                    for (var i = 0; i < obj.length; i++) {
+                        $("#" + id).append(
+                            "<option value='" + obj[i].picAdId + "'>"
+                            + obj[i].picAdName + "</option>");
+                    }
+                } else {
+                    $.modal.alertWarning("网络异常，请稍后再试！");
+                }
+            }
+        });
+    }
+
+    var fileoptions = {
+        showUpload: false,
+        showRemove: false,
+        language: 'zh',
+        allowedPreviewTypes: ['image'],
+        allowedFileExtensions: ['jpg', 'png', 'gif'],
+        maxFileSize: 0,
+        autoReplace: true,// 是否自动替换图片
+        uploadAsync: false,// 异步上传
+        maxFileCount: 1,
+        maxFilesNum: 1,
+        dropZoneEnabled: false,
+        showPreview: true,
+        msgUploadThreshold: '上传中',
+        msgUploadEnd: '完成'
+    }
+
+    /* 分享图 */
+    var delShareId;
+    $("#shareImgs").fileinput(fileoptions).on("filesuccessremove", function (event, data, msg) {
+        $("#shareImg").val('');
+    }).on("filecleared", function (event, data, msg) {
+        $("#shareImg").val('');
+    }).on("fileclear", function (event, data, msg) {
+        $("#shareImg").val('');
+    }).on('change', function (event) {
+        if (delShareId != null && delShareId != '') {
+            $(this).parents('.col-sm-5').find('.file-preview-thumbnails').empty();
+        }
+    });
+
+    var clickOn = false;
+    //触发提交 先上传附件
+    $("#send").click(function () {
+        if (clickOn) {
+            return false;
+        }
+        var shareImg = $("#shareImgs").val();
+        console.log(shareImg)
+        if (shareImg == "") {
+            $.modal.alertWarning("请先上传图片！");
+            return false;
+        }
+        // 获取表单对象
+        var formData1 = new FormData();
+        formData1.append('imgUrl', $('#shareImgs')[0].files[0]);
+        formData1.append('picAdId', $('#picAdId').val());
+        add(formData1);
+    });
+
+    //提交表单数据
+    function add(formData) {
+        // 显示提示弹框
+        $('#up_showDialog').find('.modal-dialog').css("padding-top", "150px");
+        $('#up_showDialog').modal({
+            keyboard: true,
+            backdrop: 'static'
+        });
+        $.ajax({
+            type: "post",
+            url: prefix1 + '/addGalleryImg',
+            data: formData,
+            processData: false,//不需要对数据进行处理
+            contentType: false,
+            cache: false,
+            dataType: "json",
+            success: function (data) {
+                // 隐藏
+                $('#up_showDialog').modal('hide');
+                if (data.result) {// 跳转到列表页面
+                    $('#successBox').find('.modal-dialog').css({
+                        "padding-top": "150px",
+                        "width": "300px"
+                    });
+                    $('#successBox').modal({
+                        keyboard: true,
+                        backdrop: 'static'
+                    });
+                } else {
+                    clickOn = false;// 置为可点击
+                }
+            }
+        });
+    }
+
+</script>
+</body>
+</html>
\ No newline at end of file

From 9f63dd92cc579e4c71912d8731bb079ad285eb1a Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Thu, 25 Mar 2021 18:00:05 +0800
Subject: [PATCH 05/30] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-content/pom.xml                         |   32 +
 .../controller/ArticleLabelController.java    |  220 ++
 .../controller/ArticleManageController.java   |  537 +++
 .../controller/BaseCodeController.java        |  312 ++
 .../content/controller/CommonController.java  |   71 +
 .../content/controller/GalleryController.java |    7 +-
 .../content/controller/LdComController.java   |   60 +
 .../controller/LibraryManageController.java   |  479 +++
 .../content/controller/ReportController.java  |   36 +
 .../StaffArticleManageController.java         |  212 ++
 .../content/domain/AdvertisementDTO.java      |    5 +
 .../content/domain/AdvertisementInfo.java     |  451 +++
 .../domain/AdvertisementInfoExample.java      | 1272 +++++++
 .../ruoyi/content/domain/ArticeClickInfo.java |   68 +
 .../content/domain/ArticeClickInfoExDTO.java  |  130 +
 .../ruoyi/content/domain/ArticleAdInfo.java   |  547 +++
 .../content/domain/ArticleAdInfoExample.java  | 1482 +++++++++
 .../ruoyi/content/domain/ArticleChannel.java  |  493 +++
 .../content/domain/ArticleChannelExample.java | 1392 ++++++++
 .../com/ruoyi/content/domain/ArticleDTO.java  |   55 +
 .../content/domain/ArticleForwardTrack.java   |  387 +++
 .../domain/ArticleForwardTrackExample.java    | 1342 ++++++++
 .../domain/ArticleForwardTrackKey.java        |   99 +
 .../com/ruoyi/content/domain/ArticleInfo.java |  739 +++++
 .../content/domain/ArticleInfoExample.java    | 1832 ++++++++++
 .../ruoyi/content/domain/ArticleLabel.java    |  323 ++
 .../content/domain/ArticleLabelExample.java   |  992 ++++++
 .../content/domain/ArticleLabelRelDTO.java    |   31 +
 .../domain/ArticleLabelRelationship.java      |   99 +
 .../ArticleLabelRelationshipExample.java      |  482 +++
 .../content/domain/ArticlePersonalConfig.java |  227 ++
 .../domain/ArticlePersonalConfigExample.java  |  782 +++++
 .../content/domain/ArticlePublishSend.java    |  419 +++
 .../content/domain/ArticlePublishSendDTO.java |   68 +
 .../domain/ArticlePublishSendExample.java     | 1192 +++++++
 .../content/domain/ArticlePublishTrack.java   |  578 ++++
 .../domain/ArticlePublishTrackExample.java    | 1694 ++++++++++
 .../ruoyi/content/domain/ArticleSendUrl.java  |  291 ++
 .../content/domain/ArticleSendUrlExample.java |  932 ++++++
 .../content/domain/ArticleinfoExDTO.java      |  238 ++
 .../ruoyi/content/domain/AttachmentInfo.java  |  451 +++
 .../content/domain/AttachmentInfoExample.java | 1272 +++++++
 .../ruoyi/content/domain/AuthorityExDto.java  |   40 +
 .../ruoyi/content/domain/BaseCodeTree.java    |  130 +
 .../com/ruoyi/content/domain/BaseDTO.java     |   10 +
 .../ruoyi/content/domain/BranchIdArticle.java |   65 +
 .../com/ruoyi/content/domain/CardInfo.java    |  515 +++
 .../ruoyi/content/domain/CardInfoExample.java | 1412 ++++++++
 .../com/ruoyi/content/domain/ChannelInfo.java |  355 ++
 .../content/domain/ChannelInfoExample.java    | 1062 ++++++
 .../ruoyi/content/domain/ClickTrackInfo.java  |  643 ++++
 .../content/domain/ClickTrackInfoExample.java | 1632 +++++++++
 .../ruoyi/content/domain/ClickUserInfo.java   |   46 +
 .../content/domain/CmsRoleAuthority.java      |  259 ++
 .../domain/CmsRoleAuthorityExample.java       |  862 +++++
 .../ruoyi/content/domain/CmsSysAuthority.java |  387 +++
 .../domain/CmsSysAuthorityExample.java        | 1132 +++++++
 .../com/ruoyi/content/domain/CmsSysRole.java  |  259 ++
 .../content/domain/CmsSysRoleAuthorDto.java   |   68 +
 .../content/domain/CmsSysRoleExample.java     |  852 +++++
 .../com/ruoyi/content/domain/CmsSysUser.java  |  611 ++++
 .../content/domain/CmsSysUserExample.java     | 1632 +++++++++
 .../content/domain/CmsUSerSysRoleDto.java     |   32 +
 .../com/ruoyi/content/domain/CmsUserRole.java |  291 ++
 .../content/domain/CmsUserRoleExample.java    |  922 +++++
 .../content/domain/CompanyArticleInfo.java    |   67 +
 .../com/ruoyi/content/domain/CompanyInfo.java |  547 +++
 .../content/domain/CompanyInfoExample.java    | 1482 +++++++++
 .../java/com/ruoyi/content/domain/LdCom.java  | 1221 +++++++
 .../ruoyi/content/domain/LdComExample.java    | 2953 +++++++++++++++++
 .../com/ruoyi/content/domain/LdComParty.java  |  131 +
 .../content/domain/LdComPartyExample.java     |  582 ++++
 .../com/ruoyi/content/domain/LdExCom.java     |   22 +
 .../java/com/ruoyi/content/domain/OssDTO.java |   66 +
 .../com/ruoyi/content/domain/PageDTO.java     |  108 +
 .../com/ruoyi/content/domain/PicAdInfo.java   |  419 +++
 .../content/domain/PicAdInfoExample.java      | 1202 +++++++
 .../content/domain/PublishedArticleInfo.java  |  129 +
 .../domain/RedisPublishedArticleInfo.java     |  100 +
 .../com/ruoyi/content/domain/UserInfo.java    |  861 +++++
 .../com/ruoyi/content/domain/UserInfoDTO.java |   28 +
 .../ruoyi/content/domain/UserInfoExample.java | 2241 +++++++++++++
 .../ruoyi/content/domain/WxUserInfoDto.java   |   99 +
 .../content/domain/YwyForwardUserInfo.java    |   61 +
 .../ruoyi/content/domain/YwyPublishInfo.java  |   74 +
 .../content/exception/MyTimeoutException.java |   24 +
 .../mapper/AdvertisementInfoMapper.java       |   99 +
 .../mapper/ArticeClickInfoExMapper.java       |   32 +
 .../content/mapper/ArticleAdInfoMapper.java   |   99 +
 .../content/mapper/ArticleAdQueryMapper.java  |   16 +
 .../content/mapper/ArticleChannelMapper.java  |   99 +
 .../mapper/ArticleChannelQueryMapper.java     |   67 +
 .../mapper/ArticleForwardTrackMapper.java     |  100 +
 .../content/mapper/ArticleInfoMapper.java     |  123 +
 .../content/mapper/ArticleLabelMapper.java    |   99 +
 .../ArticleLabelRelationshipMapper.java       |   99 +
 .../mapper/ArticlePersonalConfigMapper.java   |  100 +
 .../mapper/ArticlePublishSendMapper.java      |  100 +
 .../mapper/ArticlePublishTrackMapper.java     |   99 +
 .../ArticlePublishTrackQueryMapper.java       |   46 +
 .../content/mapper/ArticleQueryMapper.java    |   53 +
 .../content/mapper/ArticleSendUrlMapper.java  |   99 +
 .../mapper/AttachmentInfoExMapper.java        |   16 +
 .../content/mapper/AttachmentInfoMapper.java  |   99 +
 .../mapper/AuthorityFindfExMapper.java        |   25 +
 .../content/mapper/BaseCodeExMapper.java      |   25 +
 .../ruoyi/content/mapper/CardInfoMapper.java  |   99 +
 .../content/mapper/ChannelInfoMapper.java     |   99 +
 .../content/mapper/ClickTrackInfoMapper.java  |  123 +
 .../mapper/ClickTrackInfoQueryMapper.java     |   15 +
 .../mapper/CmsRoleAuthorityMapper.java        |   68 +
 .../mapper/CmsSysAuthorityExMapper.java       |   25 +
 .../content/mapper/CmsSysAuthorityMapper.java |  101 +
 .../content/mapper/CmsSysRoleExMapper.java    |   21 +
 .../content/mapper/CmsSysRoleMapper.java      |   99 +
 .../content/mapper/CmsSysUserExMapper.java    |   35 +
 .../content/mapper/CmsSysUserMapper.java      |   99 +
 .../content/mapper/CmsUserRoleMapper.java     |   99 +
 .../content/mapper/CompanyInfoMapper.java     |   99 +
 .../com/ruoyi/content/mapper/LdComMapper.java |   99 +
 .../content/mapper/LdComPartyMapper.java      |   99 +
 .../content/mapper/LdComQueryMapper.java      |   14 +
 .../ruoyi/content/mapper/PicAdInfoMapper.java |   99 +
 .../content/mapper/PicAdQueryMapper.java      |   14 +
 .../ruoyi/content/mapper/UserInfoMapper.java  |  104 +
 .../content/service/ArticleLabelService.java  |   58 +
 .../ruoyi/content/service/ArticleService.java |  187 ++
 .../content/service/BaseCodeService.java      |  103 +
 .../service/CmsRoleAuthorityService.java      |   37 +
 .../ruoyi/content/service/CmsRoleService.java |   43 +
 .../service/CmsSysAuthorityService.java       |   76 +
 .../content/service/CmsUserRoleService.java   |   23 +
 .../ruoyi/content/service/CmsUserService.java |   52 +
 .../ruoyi/content/service/LdComService.java   |   12 +
 .../ruoyi/content/service/LibraryService.java |  135 +
 .../service/StaffArticleManageService.java    |   49 +
 .../content/service/TemplateSendService.java  |   26 +
 .../ruoyi/content/service/UserService.java    |   22 +
 .../content/service/WechatIMGService.java     |    9 +
 .../content/service/WmsOperatorService.java   |    7 +
 .../service/impl/ArticleLabelServiceImpl.java |  152 +
 .../service/impl/ArticleServiceImpl.java      | 1201 +++++++
 .../service/impl/BaseCodeServiceImpl.java     |  578 ++++
 .../impl/CmsArticleAdInfoServiceImpl.java     |    1 -
 .../impl/CmsRoleAuthorityServiceImpl.java     |  228 ++
 .../service/impl/CmsRoleServiceImpl.java      |  287 ++
 .../impl/CmsSysAuthorityServiceImpl.java      |  384 +++
 .../service/impl/CmsUserRoleServiceImpl.java  |  139 +
 .../service/impl/CmsUserServiceImpl.java      |  400 +++
 .../service/impl/LdComServiceImpl.java        |   38 +
 .../service/impl/LibraryServiceImpl.java      | 1103 ++++++
 .../impl/StaffArticleManageServiceimpl.java   |  149 +
 .../service/impl/TemplateSendServiceImpl.java |  147 +
 .../content/service/impl/UserServiceImpl.java |  109 +
 .../service/impl/WechatIMGServiceImpl.java    |  212 ++
 .../service/impl/WmsUserOperatorImpl.java     |   22 +
 .../com/ruoyi/content/task/OnTimeSendMsg.java |   58 +
 .../com/ruoyi/content/utils/CheckUtil.java    |   46 +
 .../java/com/ruoyi/content/utils/Data.java    |  344 ++
 .../com/ruoyi/content/utils/DateUtil.java     |  641 ++++
 .../com/ruoyi/content/utils/EncoderUtil.java  |  177 +
 .../ruoyi/content/utils/FileUploadUtil.java   |  157 +
 .../ruoyi/content/utils/FreemakerUtil.java    |  160 +
 .../content/utils/GetMessageFromArticle.java  |  570 ++++
 .../com/ruoyi/content/utils/GsonUtil.java     |   63 +
 .../ruoyi/content/utils/HtmlCompressor.java   |  263 ++
 .../com/ruoyi/content/utils/HttpUtil.java     |  393 +++
 .../com/ruoyi/content/utils/IndexMap.java     |   61 +
 .../java/com/ruoyi/content/utils/Notify.java  |  156 +
 .../java/com/ruoyi/content/utils/OSSUtil.java |   25 +-
 .../ruoyi/content/utils/PasswordHelper.java   |   58 +
 .../com/ruoyi/content/utils/PathUtil.java     |   56 +
 .../com/ruoyi/content/utils/RandomUtils.java  |   90 +
 .../com/ruoyi/content/utils/SystemConfig.java |   59 +
 .../com/ruoyi/content/utils/ToolUtil.java     |  287 ++
 .../ruoyi/content/utils/TransNoManage.java    |  104 +
 .../content/AdvertisementInfoMapper.xml       |  430 +++
 .../content/ArticeClickInfoExMapper.xml       |  178 +
 .../mapper/content/ArticleAdInfoMapper.xml    |  478 +++
 .../mapper/content/ArticleAdQueryMapper.xml   |   55 +
 .../mapper/content/ArticleChannelMapper.xml   |  466 +++
 .../content/ArticleChannelQueryMapper.xml     |  324 ++
 .../content/ArticleForwardTrackMapper.xml     |  448 +++
 .../mapper/content/ArticleInfoMapper.xml      |  674 ++++
 .../mapper/content/ArticleLabelMapper.xml     |  351 ++
 .../ArticleLabelRelationshipMapper.xml        |  241 ++
 .../content/ArticlePersonalConfigMapper.xml   |  325 ++
 .../content/ArticlePublishSendMapper.xml      |  413 +++
 .../content/ArticlePublishTrackMapper.xml     |  488 +++
 .../ArticlePublishTrackQueryMapper.xml        |  141 +
 .../mapper/content/ArticleQueryMapper.xml     |  378 +++
 .../mapper/content/ArticleSendUrlMapper.xml   |  353 ++
 .../mapper/content/AttachmentInfoMapper.xml   |  430 +++
 .../mapper/content/AuthorityExMapper.xml      |   38 +
 .../mapper/content/BaseCodeExMapper.xml       |  123 +
 .../mapper/content/BaseCodeMapper.xml         |   22 +-
 .../mapper/content/CardInfoMapper.xml         |  463 +++
 .../mapper/content/ChannelInfoMapper.xml      |  383 +++
 .../mapper/content/ClickTrackInfoMapper.xml   |  621 ++++
 .../content/ClickTrackInfoQueryMapper.xml     |   44 +
 .../mapper/content/CmsArticleAdInfoMapper.xml |   12 +-
 .../mapper/content/CmsPicAdInfoMapper.xml     |   10 +-
 .../mapper/content/CmsRoleAuthorityMapper.xml |  268 ++
 .../content/CmsSysAuthorityExMapper.xml       |   93 +
 .../mapper/content/CmsSysAuthorityMapper.xml  |  399 +++
 .../mapper/content/CmsSysRoleExMapper.xml     |   60 +
 .../mapper/content/CmsSysRoleMapper.xml       |  334 ++
 .../mapper/content/CmsSysUserExMapper.xml     |   69 +
 .../mapper/content/CmsSysUserMapper.xml       |  510 +++
 .../mapper/content/CmsUserRoleMapper.xml      |  351 ++
 .../mapper/content/CompanyInfoMapper.xml      |  478 +++
 .../mapper/content/GalleryChannelMapper.xml   |   22 +-
 .../mapper/content/GalleryPicInfoMapper.xml   |   22 +-
 .../mapper/content/GalleryQueryMapper.xml     |    6 +-
 .../resources/mapper/content/LdComMapper.xml  |  812 +++++
 .../mapper/content/LdComPartyMapper.xml       |  273 ++
 .../mapper/content/LdComQueryMapper.xml       |   65 +
 .../mapper/content/PicAdInfoMapper.xml        |  415 +++
 .../mapper/content/PicAdQueryMapper.xml       |   44 +
 .../mapper/content/UserInfoMapper.xml         |  735 ++++
 220 files changed, 73415 insertions(+), 58 deletions(-)
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleLabelController.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/controller/CommonController.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/controller/LdComController.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/controller/ReportController.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementDTO.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementInfoExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticeClickInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticeClickInfoExDTO.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleAdInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleAdInfoExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleChannel.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleChannelExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleDTO.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrack.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrackExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrackKey.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleInfoExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabel.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelDTO.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelationship.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelationshipExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePersonalConfig.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePersonalConfigExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSend.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSendDTO.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSendExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishTrack.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishTrackExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrlExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleinfoExDTO.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/AttachmentInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/AttachmentInfoExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/AuthorityExDto.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCodeTree.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseDTO.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/BranchIdArticle.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CardInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CardInfoExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ChannelInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ChannelInfoExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickTrackInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickTrackInfoExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickUserInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsRoleAuthority.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsRoleAuthorityExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysAuthority.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysAuthorityExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRole.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRoleAuthorDto.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRoleExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysUser.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysUserExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUSerSysRoleDto.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUserRole.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUserRoleExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyArticleInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyInfoExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/LdCom.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComParty.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComPartyExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/LdExCom.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/OssDTO.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/PageDTO.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/PicAdInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/PicAdInfoExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/PublishedArticleInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/RedisPublishedArticleInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfoDTO.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfoExample.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/WxUserInfoDto.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/YwyForwardUserInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/YwyPublishInfo.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/exception/MyTimeoutException.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/AdvertisementInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticeClickInfoExMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleAdInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleAdQueryMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleChannelMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleChannelQueryMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleForwardTrackMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleLabelMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleLabelRelationshipMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePersonalConfigMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishSendMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishTrackMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishTrackQueryMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleSendUrlMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/AttachmentInfoExMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/AttachmentInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/AuthorityFindfExMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CardInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ChannelInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ClickTrackInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ClickTrackInfoQueryMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsRoleAuthorityMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysAuthorityExMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysAuthorityMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysRoleExMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysRoleMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysUserExMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysUserMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsUserRoleMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/CompanyInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComPartyMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComQueryMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/PicAdInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/PicAdQueryMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/UserInfoMapper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleLabelService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/CmsRoleAuthorityService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/CmsRoleService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/CmsSysAuthorityService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/CmsUserRoleService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/CmsUserService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/LdComService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/TemplateSendService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/UserService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/WechatIMGService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/WmsOperatorService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleLabelServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsRoleAuthorityServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsRoleServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsSysAuthorityServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsUserRoleServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsUserServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LdComServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/TemplateSendServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/UserServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/WechatIMGServiceImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/WmsUserOperatorImpl.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/task/OnTimeSendMsg.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/CheckUtil.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/Data.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/DateUtil.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/EncoderUtil.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/FileUploadUtil.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/FreemakerUtil.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/GetMessageFromArticle.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/GsonUtil.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/HtmlCompressor.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/HttpUtil.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/IndexMap.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/Notify.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/PasswordHelper.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/PathUtil.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/RandomUtils.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/SystemConfig.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/ToolUtil.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/utils/TransNoManage.java
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/AdvertisementInfoMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticeClickInfoExMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticleAdInfoMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticleAdQueryMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticleChannelMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticleChannelQueryMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticleForwardTrackMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticleInfoMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticleLabelMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticleLabelRelationshipMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticlePersonalConfigMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticlePublishSendMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticlePublishTrackMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticlePublishTrackQueryMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticleSendUrlMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/AttachmentInfoMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/AuthorityExMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/CardInfoMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ChannelInfoMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ClickTrackInfoMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/ClickTrackInfoQueryMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/CmsRoleAuthorityMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/CmsSysAuthorityExMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/CmsSysAuthorityMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/CmsSysRoleExMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/CmsSysRoleMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/CmsSysUserExMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/CmsSysUserMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/CmsUserRoleMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/CompanyInfoMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/LdComMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/LdComPartyMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/LdComQueryMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/PicAdInfoMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/PicAdQueryMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/mapper/content/UserInfoMapper.xml

diff --git a/ruoyi-content/pom.xml b/ruoyi-content/pom.xml
index a5c6c22e5..61aa247d4 100644
--- a/ruoyi-content/pom.xml
+++ b/ruoyi-content/pom.xml
@@ -23,6 +23,38 @@
             <artifactId>ruoyi-common</artifactId>
         </dependency>
 
+        <!-- 爬虫 -->
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.13.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>core</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.zxing</groupId>
+            <artifactId>javase</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.30</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.40.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.6</version>
+        </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleLabelController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleLabelController.java
new file mode 100644
index 000000000..bcefe36a2
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleLabelController.java
@@ -0,0 +1,220 @@
+package com.ruoyi.content.controller;
+
+import com.ruoyi.content.domain.ArticleLabel;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.ArticleLabelService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@Controller
+@RequestMapping("/label")
+public class ArticleLabelController {
+
+    private final static Logger logger = LoggerFactory.getLogger(ArticleManageController.class);
+
+    @Autowired
+    private ArticleLabelService articleLabelService;
+
+    /**
+     * 查询所有标签信息(本程序调用)
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping("/queryLabel")
+    @ResponseBody
+    public Message queryLabel(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        logger.info("查询所有标签信息控制层方法开始");
+        Message msg = new Message();
+        Map<String, Object> labelMap = new HashMap<String, Object>();
+        // 查询标签表
+        List<ArticleLabel> labelList = articleLabelService.queryLabel();
+        if (null != labelList && labelList.size() > 0) {
+            labelMap.put("labelList", labelList);
+            msg.setInfo("查询标签成功");
+            msg.setObject(labelMap);
+            msg.setResult(true);
+        } else {
+            labelMap.put("labelList", labelList);
+            msg.setInfo("查询标签失败");
+            msg.setObject(labelMap);
+            msg.setResult(false);
+        }
+
+        logger.info("查询所有标签信息控制层方法结束");
+        return msg;
+    }
+
+//	/**
+//	 * 根据公司id查询查询标签信息(远端OSS调用)
+//	 * @param request
+//	 * @param response
+//	 * @param companyId
+//	 * @return
+//	 */
+//	@RequestMapping("/queryLabelOss")
+//	@ResponseBody
+//	public Message queryLabelOss(HttpServletRequest request,HttpServletResponse response,String companyId) {
+//		response.setHeader("Access-Control-Allow-Origin", "*");
+//		Thread.currentThread().setName(UUID.randomUUID().toString());
+//		logger.info("查询所有标签信息控制层方法开始,公司companyId【{}】",companyId);
+//		Message msg = new Message();
+//		Map<String, Object> labelMap = new HashMap<String, Object>();
+//		// 标签列表信息
+//		List<ArticleLabel> labelList = new ArrayList<ArticleLabel>();
+//		labelList = articleLabelService.queryLabelOss(companyId);
+//		if(null != labelList && labelList.size() > 0 ) {
+//			labelMap.put("labelList", labelList);
+//			msg.setInfo("查询标签成功");
+//			msg.setObject(labelMap);
+//			msg.setResult(true);
+//		} else {
+//			labelMap.put("labelList", labelList);
+//			msg.setInfo("查询标签失败");
+//			msg.setObject(labelMap);
+//			msg.setResult(false);
+//		}
+//		logger.info("查询标签信息控制层方法结束");
+//		return msg;
+//		
+//	}
+
+    /**
+     * 保存文章的标签信息
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping("/addlabel")
+    @ResponseBody
+    public Message saveLabel(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("保存文章标签信息控制层方法开始");
+        String articleId = request.getParameter("articleId"); // 文章id
+        String labelIds = request.getParameter("labelIds"); // 标签id
+        logger.info("要添加标签的文章articleId【{}】,标签labelId【{}】", articleId, labelIds);
+        // 文章ID和标签ID
+        if (StringUtils.isBlank(articleId) || StringUtils.isBlank(labelIds)) {
+            logger.info("给文章添加标签缺少参数,articleId【{}】,labelIds【{}】", articleId, labelIds);
+        }
+        msg = articleLabelService.addlabel(articleId, labelIds);
+        logger.info("保存文章标签信息控制层方法结束");
+        return msg;
+    }
+
+    /**
+     * 新增标签信息
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(method = RequestMethod.GET)
+    @ResponseBody
+    public Message addLabel(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("新增标签信息控制层方法开始");
+        String labelName = request.getParameter("name"); // 标签名称
+        logger.info("标签labelName【{}】", labelName);
+        // 文章ID和标签ID
+        if (StringUtils.isBlank(labelName)) {
+            logger.info("新增标签缺少参数,labelName【{}】", labelName);
+            msg.setResult(false);
+            msg.setInfo("labelName不能为空");
+            return msg;
+        }
+        msg = articleLabelService.saveLabel(labelName);
+        logger.info("新增标签信息控制层方法结束");
+        return msg;
+    }
+
+    /**
+     * 修改标签信息
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(method = RequestMethod.PUT)
+    @ResponseBody
+    public Message updateLabel(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("修改标签信息控制层方法开始");
+        String labelId = request.getParameter("id"); // 标签id
+        String labelName = request.getParameter("name"); // 标签名称
+        logger.info("标签labelName【{}】", labelName);
+        // 文章ID和标签ID
+        if (StringUtils.isBlank(labelId)) {
+            logger.info("修改标签缺少参数,labelId【{}】", labelId);
+            msg.setResult(false);
+            msg.setInfo("labelId不能为空");
+            return msg;
+        }
+        if (StringUtils.isBlank(labelName)) {
+            logger.info("修改标签缺少参数,labelName【{}】", labelName);
+            msg.setResult(false);
+            msg.setInfo("labelName不能为空");
+            return msg;
+        }
+        msg = articleLabelService.updateLabel(Integer.valueOf(labelId), labelName);
+        logger.info("修改标签信息控制层方法结束");
+        return msg;
+    }
+
+    /**
+     * 删除标签信息
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(method = RequestMethod.DELETE)
+    @ResponseBody
+    public Message deleteLabel(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("删除标签信息控制层方法开始");
+        String labelId = request.getParameter("id"); // 标签名称
+        logger.info("标签labelId【{}】", labelId);
+        // 文章ID和标签ID
+        if (StringUtils.isBlank(labelId)) {
+            logger.info("删除标签缺少参数,labelId【{}】", labelId);
+            msg.setResult(false);
+            msg.setInfo("labelId不能为空");
+            return msg;
+        }
+        msg = articleLabelService.deleteLabel(Integer.valueOf(labelId));
+        logger.info("删除标签信息控制层方法结束");
+        return msg;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
new file mode 100644
index 000000000..a38227c81
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
@@ -0,0 +1,537 @@
+package com.ruoyi.content.controller;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.content.domain.ArticleInfo;
+import com.ruoyi.content.domain.PageDTO;
+import com.ruoyi.content.domain.PublishedArticleInfo;
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.ArticleService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 说明：文章管理
+ *
+ * @author Ma.C
+ * @date 2018年5月2日
+ */
+@Controller
+@RequestMapping("/article")
+public class ArticleManageController {
+    private final static Logger logger = LoggerFactory.getLogger(ArticleManageController.class);
+    @Autowired
+    private ArticleService articleService;
+
+    /**
+     * 查询所有公司发布的文章信息
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/articleArry")
+    @ResponseBody
+    public PageDTO articleArry(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("查询文章列表的控制层方法开始！");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        PageDTO pageDTO = new PageDTO();
+        try {
+            String rowsVal = request.getParameter("rows");
+            String page = request.getParameter("page");
+            String articelName = request.getParameter("articelName");
+            String articelAuthor = request.getParameter("articelAuthor");
+            String channelId = request.getParameter("channelId");
+            String special = request.getParameter("special");
+            String articleState = request.getParameter("articleState");
+            int rows = Integer.parseInt(rowsVal);
+            int startRow = rows * (Integer.parseInt(page) - 1);
+            List<PublishedArticleInfo> list = articleService.queryArticle(startRow, rows, articelName, articelAuthor,
+                    special, channelId, articleState);
+            pageDTO.setPage(Integer.parseInt(page));
+            pageDTO.setStartRow(startRow);
+            pageDTO.setDataRows(list);
+            int count = articleService.countArticleInfoByState(articelName, articelAuthor, special, channelId,
+                    articleState);
+            pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
+            pageDTO.setRecords(count);
+            pageDTO.setPage(Integer.parseInt(page));
+        } catch (Exception e) {
+            logger.info("查询当前用户发布的文章失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("查询文章列表的控制层方法结束！");
+        return pageDTO;
+    }
+
+    /**
+     * 更新文章基本信息
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/articleUp")
+    @ResponseBody
+    public Message articleUp(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("修改文章信息的控制层方法开始！");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("获取修改文章信息页面参数！");
+
+        String articleId = request.getParameter("articleId");
+        String articleName = request.getParameter("articleName");
+        String articleAuthor = request.getParameter("articleAuthor");
+        String special = request.getParameter("special");
+        String channelId = request.getParameter("channelId");
+        /* String articleState = request.getParameter("articleState"); */
+        String shareTitle = request.getParameter("shareTitle");
+        String shareDes = request.getParameter("shareDes");
+        String originalUrl = request.getParameter("originalUrl");
+        ArticleInfo articleInfo = new ArticleInfo();
+        articleInfo = articleService.queryArticleByArticleId(articleId);
+        articleInfo.setArticleAuthor(articleAuthor);
+        articleInfo.setArticleName(articleName);
+        articleInfo.setSpecial(special);
+        articleInfo.setChannelId(channelId);
+        /* articleInfo.setArticleState(articleState); */
+        articleInfo.setShareTitle(shareTitle);
+        articleInfo.setShareDes(shareDes);
+        articleInfo.setOriginalUrl(originalUrl);
+        articleInfo.setUpdateDate(DateUtils.getDate());
+        articleInfo.setUpdateTime(DateUtils.getTimeNow());
+        try {
+            msg = articleService.articleUpByArticleId(articleInfo);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("修改文章信息失败【{}】", e.getMessage());
+        }
+        logger.info("修改文章信息的控制层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 文章列表的删除功能
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/delArticleInfo")
+    @ResponseBody
+    public Message delArticleInfo(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("删除文章信息的控制层方法开始！");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        String id = request.getParameter("ids");
+        try {
+            msg = articleService.delArticleInfo(id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("删除文章信息失败【{}】", e.getMessage());
+        }
+        logger.info("删除文章信息的控制层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 通过文章链接获取文章内容
+     *
+     * @return
+     */
+    @RequestMapping("/getArticleContentByUrl")
+    @ResponseBody
+    public Message getArticleContentByUrl(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("通过文章链接获取文章内容控制层方法开始");
+        String createUser = request.getParameter("createUser");
+        if (StringUtils.isBlank(createUser)) {
+            logger.info("用户已离线");
+            throw new BusinessException("通过文章链接获取文章内容,用户已离线");
+        }
+        String originalUrl = request.getParameter("originalUrl"); // 文章连接,如果是通过连接导入文章,则必传
+        String author = request.getParameter("author"); // 作者
+        String ids = request.getParameter("ids"); // 广告ids
+        String isAuthorization = request.getParameter("isAuthorization"); // 是否授权
+        String isReserve = request.getParameter("isReserve"); // 是否预约
+        String automaticName = request.getParameter("automaticName");// 自定义名
+        String introduction = request.getParameter("introduction"); // 介绍
+        String isJoinActive = request.getParameter("isJoinActive");// 是否添加活动
+        String labelIds = request.getParameter("labelIds");
+        logger.info(
+                "创建文章的控制层方法开始!传入参数originalUrl[{}], author[{}], createUser[{}],ids[{}],isAuthorization[{}],isReserve[{}],automaticName[{}],introduction[{}],labelIds[{}],isJoinActive[{}]",
+                new Object[]{originalUrl, author, createUser, ids, isAuthorization, isReserve, automaticName,
+                        introduction, labelIds, isJoinActive});
+        if (StringUtils.isBlank(originalUrl)) {
+            logger.info("创建文章内容参数为空!");
+            msg.setInfo("请粘微信文章地址");
+            msg.setResult(false);
+            logger.info("通过文章链接获取文章内容控制层方法结束");
+            return msg;
+        }
+        try {
+            msg = this.articleService.getArticleContentByUrl(originalUrl, createUser, author, ids, isAuthorization,
+                    isReserve, automaticName, introduction, labelIds, isJoinActive);
+        } catch (Exception e) {
+            logger.info("创建文章失败【{}】", e.getMessage());
+            msg.setInfo("创建文章异常");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        logger.info("通过文章链接获取文章内容控制层方法结束");
+        return msg;
+    }
+
+    /**
+     * 通过文章链接获取文章内容
+     *
+     * @return
+     */
+    @RequestMapping("/create")
+    @ResponseBody
+    public Message getArticleContent(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("通过文章链接获取文章内容控制层方法开始");
+        String createUser = request.getParameter("createUser");
+        if (StringUtils.isBlank(createUser)) {
+            logger.info("用户已离线");
+            throw new BusinessException("通过文章链接获取文章内容,用户已离线");
+        }
+        String author = request.getParameter("author"); // 作者
+        String ids = request.getParameter("ids"); // 广告ids
+        String isAuthorization = request.getParameter("isAuthorization"); // 是否授权
+        String isReserve = request.getParameter("isReserve"); // 是否预约
+        String automaticName = request.getParameter("automaticName");// 自定义名
+        String introduction = request.getParameter("introduction"); // 介绍
+        String isJoinActive = request.getParameter("isJoinActive");// 是否添加活动
+        String labelIds = request.getParameter("labelIds");
+        String articleName = request.getParameter("articleName");
+        String shareImgUrl = request.getParameter("shareImgUrl");
+        String shareDes = request.getParameter("shareDes");
+        String articleContent = request.getParameter("articleContent");
+        logger.info(
+                "创建文章的控制层方法开始!传入参数author[{}], createUser[{}],ids[{}],isAuthorization[{}],isReserve[{}],automaticName[{}],introduction[{}],labelIds[{}],isJoinActive[{}]",
+                new Object[]{author, createUser, ids, isAuthorization, isReserve, automaticName, introduction,
+                        labelIds, isJoinActive});
+        try {
+            msg = this.articleService.getArticleContent(createUser, author, ids, isAuthorization, isReserve,
+                    automaticName, introduction, labelIds, isJoinActive, articleName, shareImgUrl, shareDes,
+                    articleContent);
+        } catch (Exception e) {
+            logger.info("创建文章失败【{}】", e.getMessage());
+            msg.setInfo("创建文章异常");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        logger.info("通过文章链接获取文章内容控制层方法结束");
+        return msg;
+    }
+
+//	/**
+//	 * 发布文章(第一次发布)
+//	 * @return
+//	 */
+//	@RequestMapping("/publishArticle")
+//	@ResponseBody
+//	public Message publishArticle(HttpServletRequest request,HttpServletResponse response){
+//		response.setHeader("Access-Control-Allow-Origin", "*");
+//		Thread.currentThread().setName(UUID.randomUUID().toString());
+//		logger.info("第一次发布文章的控制层方法开始");
+//		CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+//		String author = userInfoDTO.getName();
+//		String createUser = userInfoDTO.getEmail();		//文章创建者（后台管理员）
+//		String companyId = userInfoDTO.getDepartmentId();//管理员公司id
+//		
+//		if (StringUtils.isBlank(createUser)) {
+//			throw new BusinessException("您已离线,请重新登陆");
+//		}
+//		Message msg = new Message();
+//		String articleContent = request.getParameter("articleContent");		//文章内容
+//		String articleName = request.getParameter("articleName");			//文章标题
+//		String originalUrl = request.getParameter("originalUrl");			//文章链接
+//		String shareImgUrl = request.getParameter("shareImgUrl");			//分享展示图片
+//		String shareTitle = request.getParameter("shareTitle");				//分享标题
+//		String shareDes = request.getParameter("shareDes");              	//分享描述
+//		String listPicUrl = request.getParameter("listPicUrl");				//文章列表显示图片url
+////		String cardId = request.getParameter("cardId");						//名片id
+//		String adId = request.getParameter("adId");							//广告id
+//		
+//		//广告id集合
+//		ArticleInfo article = new ArticleInfo();
+//		article.setArticleAuthor(author);
+//		article.setArticleName(articleName);
+//		article.setOriginalUrl(originalUrl);
+//		article.setShareImgUrl(shareImgUrl);
+//		article.setShareTitle(shareTitle);
+//		article.setShareDes(shareDes);
+//		article.setListPicUrl(listPicUrl);
+//		article.setCreateUser(createUser);
+//		article.setCompanyId(companyId);
+//		
+//		logger.info("第一次发布文章请求参数,articleName[{}],originalUrl[{}],shareImgUrl[{}],shareTitle[{}],shareDes[{}],listPicUrl[{}],createUser[{}],companyId[{}]",
+//				articleName,originalUrl,shareImgUrl,shareTitle,shareDes,listPicUrl,createUser,companyId);
+//		Map<String, Object> requestMap = new HashMap<String ,Object>();
+//		requestMap.put("article", article);
+//		requestMap.put("articleContent", articleContent);
+//		requestMap.put("adId", adId);
+//		if (StringUtils.isBlank(articleContent) || StringUtils.isBlank(articleName) || StringUtils.isBlank(originalUrl) || 
+//				StringUtils.isBlank(shareImgUrl) || StringUtils.isBlank(shareTitle) || StringUtils.isBlank(listPicUrl)|| StringUtils.isBlank(companyId)|| StringUtils.isBlank(createUser)) {
+//			logger.info("保存文章失败,缺少参数");
+//			msg.setInfo("第一次发布文章,缺少请求参数");
+//			msg.setResult(false);
+//			return msg;
+//		}
+//		//根据链接获取的文章
+//		
+//		msg = articleService.publishArticle(requestMap);
+//		logger.info("发布文章的控制层方法结束");
+//		return msg;
+//	}
+
+    /**
+     * 保存(更新)文章静态页面 @Title: updateArticle @Description: TODO() @param @return
+     * 参数 @return Message 返回类型 @throws
+     */
+    @RequestMapping("/updateArticle")
+    @ResponseBody
+    public Message updateArticle(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        logger.info("更新已发布文章的控制层方法开始");
+        Message msg = new Message();
+        String articleId = request.getParameter("articleId"); // 文章id
+        String articleContent = request.getParameter("articleContent"); // 文章内容
+        String shareTitle = request.getParameter("shareTitle"); // 分享标题
+        String shareImgUrl = request.getParameter("shareImgUrl");
+        String shareDes = request.getParameter("shareDes");
+        String adId = request.getParameter("adId"); // 广告id
+        String companyId = request.getParameter("companyId"); // 公司id
+        String publishId = request.getParameter("publishId"); // 发布id
+        String isAuthorization = request.getParameter("isAuthorization");
+        String isReserve = request.getParameter("isReserve");
+        String isJoinActive = request.getParameter("isJoinActive");
+        String automaticName = request.getParameter("automaticName");// 自定义名
+        String introduction = request.getParameter("introduction"); // 介绍
+        logger.info(
+                "调用生成静态页面参数articleId[{}],shareTitle[{}],shareImgUrl[{}],shareDes[{}],publishId[{}],companyId[{}],isAuthorization[{}],isReserve[{}],automaticName[{}],introduction[{}],isJoinActive[{}]",
+                articleId, shareTitle, shareImgUrl, shareDes, publishId, companyId, isAuthorization, isReserve,
+                automaticName, introduction, isJoinActive);
+        // 文章名称
+        if (StringUtils.isBlank(articleId) && articleId == null) {
+            logger.info("更新已发布的文章缺少参数,articleId[{}]", articleId);
+            msg.setInfo("跟新已发布的文章缺少参数");
+            msg.setResult(false);
+            return msg;
+        }
+        logger.info("要更新的文章aritcleId[{}]", Integer.valueOf(articleId));
+        ArticleInfo article = new ArticleInfo();
+        article.setArticleId(Integer.valueOf(articleId));
+        article.setShareImgUrl(shareImgUrl);
+        article.setShareDes(shareDes);
+        article.setShareTitle(shareTitle);
+
+        Map<String, Object> requestMap = new HashMap<String, Object>();
+        requestMap.put("article", article);
+        requestMap.put("articleContent", articleContent);
+        requestMap.put("adId", adId);
+        requestMap.put("companyId", companyId);
+        requestMap.put("publishId", publishId);
+        requestMap.put("isAuthorization", isAuthorization);
+        requestMap.put("isReserve", isReserve);
+        requestMap.put("isJoinActive", isJoinActive);
+        requestMap.put("automaticName", automaticName);
+        requestMap.put("introduction", introduction);
+        msg = articleService.savePulishedArticle(requestMap);
+        logger.info("更新已发布文章的控制层方法结束");
+        return msg;
+    }
+
+//	/**
+//	 * 1.2 获取个人已经发布过的文章内容
+//	* @Title: getArticleContentByPublish
+//	* @Description: TODO()
+//	* @param @return    参数
+//	* @return Message    返回类型
+//	* @throws
+//	 */
+//	@RequestMapping("/getArticleContentByPublish")
+//	@ResponseBody
+//	public Message getArticleContentByPublish(HttpServletRequest request,HttpServletResponse response) {
+//		response.setHeader("Access-Control-Allow-Origin", "*");
+//		Thread.currentThread().setName(UUID.randomUUID().toString());
+//		logger.info("获取个人已经发布过的文章内容控制层方法开始");
+//		Message msg = new Message();
+//		String userId = request.getParameter("userId");
+//		if (StringUtils.isBlank(userId)) {
+//			logger.info("用户已离线");
+//			throw new BusinessException("通过文章链接获取文章内容,用户已离线");
+//		}
+////		String articleId = request.getParameter("articleId");		//文章id
+//		String publishId = request.getParameter("publishId");		//发布id
+//		msg = articleService.getArticleContentByPublish(publishId, userId);
+//		logger.info("获取个人已经发布过的文章内容控制层方法结束");
+//		return msg;
+//	}
+
+    /**
+     * @Title: queryPublishedDetails
+     * @Description: TODO(获取文章浏览详情)
+     */
+    @RequestMapping("/queryPublishedDetails")
+    @ResponseBody
+    public Message queryPublishedDetails(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("文章浏览详情控制层开始!");
+        // 获取文章浏览详情
+        String userId = request.getParameter("userId");
+        String articleId = request.getParameter("articleId");// 文章Id
+        msg = articleService.queryPublishedDetails(userId, articleId);
+        logger.info("文章浏览详情控制层结束!");
+        return msg;
+    }
+
+//	/**
+//	* @Title: changeSate
+//	* @Description: TODO(文章发布)
+//	 */
+//	@RequestMapping("/changeSate")
+//	@ResponseBody
+//	public Message changeSate(HttpServletRequest request,HttpServletResponse response){
+//		response.setHeader("Access-Control-Allow-Origin", "*");
+//		Thread.currentThread().setName(UUID.randomUUID().toString());
+//		Message msg = new Message();
+//		logger.info("文章发布控制层开始!");
+//		//修改文章状态
+//		String articleId = request.getParameter("ids");//文章Id
+//		try {
+//			msg = articleService.changeSate(articleId);
+//		} catch (Exception e) {
+//			logger.info("发布文章失败【{}】",e.getMessage());
+//			e.printStackTrace();
+//		}
+//		logger.info("文章发布控制层结束!");
+//		return msg;
+//	}
+
+    /**
+     * 查询当前公司发布的文章信息
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/articleBranchIdArry")
+    @ResponseBody
+    public PageDTO articleBranchIdArry(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("查询文章列表的控制层方法开始！");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        PageDTO pageDTO = new PageDTO();
+        try {
+            String rowsVal = request.getParameter("rows");
+            String page = request.getParameter("page");
+            int rows = Integer.parseInt(rowsVal);
+            int startRow = rows * (Integer.parseInt(page) - 1);
+            // 1.根据登录信息查哪个公司登录
+            String companyId = "1";
+            String branchId = "86";
+            pageDTO = articleService.queryBranchIdArticle(companyId, branchId, startRow, rows);
+            pageDTO.setPage(Integer.parseInt(page));
+            pageDTO.setPage(Integer.parseInt(page));
+        } catch (Exception e) {
+            logger.info("查询当前用户发布的文章失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("查询文章列表的控制层方法结束！");
+        return pageDTO;
+    }
+
+    /**
+     * 创建文章的删除功能
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/delArticle")
+    @ResponseBody
+    public Message delArticle(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("创建文章的删除功能的控制层方法开始！");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        String id = request.getParameter("ids");
+        try {
+            msg = articleService.delArticle(id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("创建文章的删除功能失败【{}】", e.getMessage());
+        }
+        logger.info("创建文章的删除功能的控制层方法结束！");
+        return msg;
+    }
+
+    /**
+     * @Title: articleUrlCopy
+     * @Description: TODO(生成文章链接)
+     */
+    @RequestMapping("/articleUrlCopy")
+    @ResponseBody
+    public Message articleUrlCopy(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("生成文章链接控制层开始!");
+        try {
+            String articleId = request.getParameter("articleId");// 文章Id
+            String publishId = request.getParameter("publishId");
+            String userId = "24";
+
+            msg = this.articleService.articleUrlCopy(articleId, userId, publishId);
+        } catch (Exception e) {
+            logger.info("生成文章链接失败【{}】", e.getMessage());
+        }
+        logger.info("生成文章链接控制层结束!");
+        return msg;
+    }
+
+    /**
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/delHTML")
+    @ResponseBody
+    public Message delHTML(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("创建文章的删除HTML的控制层方法开始！");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        String id = request.getParameter("ids");
+        try {
+            msg = this.articleService.delHTML(id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("创建文章的删除HTML功能失败【{}】", e.getMessage());
+        }
+        logger.info("创建文章的删除HTML功能的控制层方法结束！");
+        return msg;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
new file mode 100644
index 000000000..98dc7855d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
@@ -0,0 +1,312 @@
+package com.ruoyi.content.controller;
+
+import com.ruoyi.content.domain.BaseCode;
+import com.ruoyi.content.domain.BaseCodeTree;
+import com.ruoyi.content.domain.PageDTO;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.BaseCodeService;
+import com.ruoyi.content.utils.DateUtil;
+import com.ruoyi.content.utils.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
+
+/**
+ * 说明：栏目管理
+ *
+ * @author wang.q
+ * @date 2017年10月11日
+ */
+@Controller
+@RequestMapping("/column")
+public class BaseCodeController {
+    private final static Logger logger = LoggerFactory.getLogger(BaseCodeController.class);
+    @Autowired
+    private BaseCodeService baseCodeService;
+
+    /**
+     * 分页查询栏目信息
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/columnArry")
+    @ResponseBody
+    public PageDTO columnArry(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("进入查询当前用户发布的栏目的控制层方法");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        PageDTO pageDTO = new PageDTO();
+        try {
+            String rowsVal = request.getParameter("rows");
+            String page = request.getParameter("page");
+            String codeType = request.getParameter("codeType");
+            String codeCname = request.getParameter("codeCname");
+            String orderNo = request.getParameter("orderNo");
+            int rows = Integer.parseInt(rowsVal);
+            int startRow = rows * (Integer.parseInt(page) - 1);
+            List<BaseCode> list = baseCodeService.queryBaseCode(startRow, rows, codeType, codeCname, orderNo);
+            pageDTO.setPage(Integer.parseInt(page));
+            pageDTO.setStartRow(startRow);
+            pageDTO.setDataRows(list);
+            int count = baseCodeService.countBaseCode(codeType, codeCname, orderNo);
+            pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
+            pageDTO.setRecords(count);
+            pageDTO.setPage(Integer.parseInt(page));
+        } catch (Exception e) {
+            logger.info("查询当前用户发布的栏目失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("跳出查询当前用户发布的栏目的控制层方法");
+        return pageDTO;
+    }
+
+    /**
+     * 添加栏目
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/addColumn")
+    @ResponseBody
+    public Message addColumn(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("进入新建栏目控制层方法");
+        Message msg = new Message();
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        String codeType = request.getParameter("codeType");
+        String codeCname = request.getParameter("codeCname");
+        //String orderNo = request.getParameter("orderNo");
+        String branchId = request.getParameter("branchId");
+        //后来加的参数
+        String radioValue = request.getParameter("radioValue");
+        String selectSec = request.getParameter("selectSec");
+        String thirdCodeCnames = request.getParameter("thirdCodeCnames");
+        //String thirdOrderNos = request.getParameter("thirdOrderNos");
+        if ("thr".equals(radioValue)) {
+            codeType = selectSec;
+            codeCname = thirdCodeCnames;
+            //orderNo =thirdOrderNos;
+        }
+        logger.info("请求参数：codeType:【{}】，codeCname:【{}】"
+                        + "，branchId:【{}】，radioValue:【{}】,selectSec:【{}】"
+                        + ",thirdCodeCnames:【{}】"
+                , codeType, codeCname, branchId, radioValue, selectSec, thirdCodeCnames);
+        BaseCode baseCode = new BaseCode();
+        baseCode.setCodeCname(codeCname);
+        baseCode.setCodeType(codeType);
+        //baseCode.setOrderNo(orderNo);
+        baseCode.setBranchId(branchId);
+        logger.info("入参service层的baseCode：【{}】", JsonUtil.objectToJackson(baseCode));
+        try {
+            msg = baseCodeService.saveBaseCode(baseCode);
+        } catch (Exception e) {
+            logger.info("新建栏目失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("跳出新建栏目的控制层方法");
+        return msg;
+    }
+
+    /**
+     * 更新栏目信息
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/updateColumn")
+    @ResponseBody
+    public Message updateColumn(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("进入更新栏目控制层方法");
+        Message msg = new Message();
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        String codeType = request.getParameter("codeType");
+        String codeCname = request.getParameter("codeCname");
+        Integer id = Integer.valueOf(request.getParameter("id"));
+        logger.info("接收的id[{}]", id);
+        String codeCode = request.getParameter("codeCode");
+        String codeEname = request.getParameter("codeEname");
+        String codeTname = request.getParameter("codeTname");
+        String createTime = request.getParameter("createTime");
+        String createUser = request.getParameter("createUser");
+        //String orderNo = request.getParameter("orderNo");
+        String state = request.getParameter("state");
+        String companyId = request.getParameter("companyId");
+        String branchId = request.getParameter("branchId");
+        BaseCode baseCode = new BaseCode();
+        baseCode.setId(id);
+        baseCode.setCodeCname(codeCname);
+        baseCode.setCodeType(codeType);
+        baseCode.setCodeCode(codeCode);
+        baseCode.setCodeEname(codeEname);
+        baseCode.setCodeTname(codeTname);
+        baseCode.setCompanyId(companyId);
+        baseCode.setBranchId(branchId);
+        if (StringUtils.isNotBlank(createTime) && !createTime.equals("无")) {
+            baseCode.setCreateTime(DateUtil.convertStringToDate(createTime, DateUtil.YMDHMS));
+        }
+        baseCode.setCreateUser(createUser);
+        //baseCode.setOrderNo(orderNo);
+        baseCode.setState(state);
+        try {
+            msg = baseCodeService.updateBaseCode(baseCode);
+        } catch (Exception e) {
+            logger.info("更新栏目失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("跳出更新栏目控制层方法");
+        return msg;
+    }
+
+    /**
+     * 修改栏目信息
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/changeState")
+    @ResponseBody
+    public Message changeState(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("进入修改栏目状态栏目控制层方法");
+        Message msg = new Message();
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        String ids = request.getParameter("ids");
+        try {
+            msg = baseCodeService.queryBaseCode(ids);
+        } catch (Exception e) {
+            logger.info("修改栏目失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("跳出修改栏目控制层方法");
+        return msg;
+    }
+
+    /**
+     * 删除栏目
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/delColumn")
+    @ResponseBody
+    public Message delColumn(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("进入删除栏目状态栏目控制层方法");
+        Message msg = new Message();
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        String ids = request.getParameter("ids");
+        try {
+            msg = baseCodeService.delBaseCode(ids);
+        } catch (Exception e) {
+            logger.info("修改栏目失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("跳出删除栏目控制层方法");
+        return msg;
+    }
+
+    /**
+     * 根据code查询基础数据集合
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/queryBasicData")
+    @ResponseBody
+    public Message getSMSCode(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        String basicType = request.getParameter("bType");
+        Message msg = new Message();
+        Map<String, Object> policyMap = new HashMap<String, Object>();
+        // 银行列表信息
+        List<BaseCode> bankList = new ArrayList<BaseCode>();
+        bankList = baseCodeService.queryBaseCodeByType(basicType);
+        policyMap.put("baseList", bankList);
+        msg.setInfo("成功");
+        msg.setObject(policyMap);
+        msg.setResult(true);
+        return msg;
+    }
+
+    /**
+     * 获取栏目全部信息
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/queryColumn")
+    @ResponseBody
+    public Message getColumn(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Message msg = new Message();
+        Map<String, Object> policyMap = new HashMap<String, Object>();
+        // 查询栏目列表
+        List<BaseCode> columnList = baseCodeService.queryColumn();
+        policyMap.put("columnList", columnList);
+        msg.setInfo("成功");
+        msg.setObject(policyMap);
+        msg.setResult(true);
+        return msg;
+    }
+
+    /**
+     * 获取栏目树
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/columnTree")
+    @ResponseBody
+    public Message columnTree(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Message msg = new Message();
+        Map<String, Object> policyMap = new HashMap<String, Object>();
+        String codeCode = request.getParameter("codeCode");
+        // 查询栏目树
+        List<BaseCodeTree> columnList = baseCodeService.columnTree(codeCode);
+        policyMap.put("columnList", columnList);
+        msg.setInfo("成功");
+        msg.setObject(policyMap);
+        msg.setResult(true);
+        return msg;
+    }
+
+    /**
+     * 操作栏目排序
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/operateColumn")
+    @ResponseBody
+    public Message operateColumn(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        logger.info("进入操作栏目排序的控制层方法");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Message msg = new Message();
+        String columnId = request.getParameter("id");
+        String operateType = request.getParameter("operateType");
+        msg = baseCodeService.operateColumn(columnId, operateType);
+        logger.info("操作栏目排序的控制层方法结束");
+        return msg;
+    }
+
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/CommonController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/CommonController.java
new file mode 100644
index 000000000..4f4db69d7
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/CommonController.java
@@ -0,0 +1,71 @@
+package com.ruoyi.content.controller;
+
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.CmsRoleAuthorityService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Enumeration;
+import java.util.List;
+
+/**
+ * 说明：公共controller
+ *
+ * @author wang.q
+ * @date 2017年8月25日
+ */
+@Controller
+@RequestMapping("/common")
+public class CommonController {
+    private static Logger logger = LoggerFactory.getLogger(CommonController.class);
+    @Autowired
+    private CmsRoleAuthorityService authorityService;
+
+    /**
+     * 查询访问人的所有菜单权限
+     *
+     * @return
+     */
+    @RequestMapping(value = "/menus")
+    @ResponseBody
+    public Message menus(HttpServletRequest req, HttpServletResponse res) {
+        System.out.println("----------menus------------menus-------------menus------menus----------");
+        Enumeration<String> headerNames = req.getHeaderNames();
+        while (headerNames.hasMoreElements()) {
+            //获取每个请求头名称
+            String headerName = headerNames.nextElement();
+            //跟距请求头获取请求值
+            String value = req.getHeader(headerName);
+            System.out.println(headerName);
+            System.out.println(value);
+
+        }
+        System.out.println("--------menus----------menus---------menus----------menus------menus--------");
+
+
+        Message msg = new Message();
+        try {
+            List<?> list = authorityService.queryUserRole();
+            if (list != null && list.size() > 0) {
+                msg.setObject(list);
+                msg.setResult(true);
+            } else {
+                msg.setResult(false);
+                msg.setInfo("未获取菜单，或您已离线。请重新登录！");
+            }
+        } catch (Exception e) {
+            // TODO: handle exception
+            msg.setResult(false);
+            msg.setInfo(e.getMessage());
+            logger.info("获取菜单失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        return msg;
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java
index f88b7a761..c0a2fc2f1 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java
@@ -28,10 +28,15 @@ public class GalleryController extends BaseController {
     private GalleryService galleryService;
 
     @GetMapping()
-    public String adverts() {
+    public String gallery() {
         return prefix + "/gallery";
     }
 
+    @GetMapping("page")
+    public String galleryPage() {
+        return prefix + "/list";
+    }
+
     /**
      * 上传图库图片
      *
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/LdComController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/LdComController.java
new file mode 100644
index 000000000..bf764c3e8
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/LdComController.java
@@ -0,0 +1,60 @@
+package com.ruoyi.content.controller;
+
+import com.ruoyi.content.domain.LdComParty;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.LdComService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @author qin.hx
+ * @ClassName: ArticleAdController
+ * @Description: TODO(广告处理控制层)
+ * @date 2018年4月26日
+ */
+@Controller
+@RequestMapping("/ldcom")
+public class LdComController {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LdComController.class);
+
+    @Autowired
+    private LdComService ldComService;
+
+    /**
+     * 查询所有广告列表（本程序调用）
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/queryldcomList")
+    @ResponseBody
+    public Message queryldcomList(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        LOGGER.info("获取渠道支公司列表控制层方法开始");
+        Message msg = new Message();
+        Map<String, Object> adMap = new HashMap<String, Object>();
+        // 广告列表信息
+        List<LdComParty> ldcomList = ldComService.queryldcomList();
+        adMap.put("ldcomList", ldcomList);
+        msg.setInfo("成功");
+        msg.setObject(adMap);
+        msg.setResult(true);
+        LOGGER.info("获取渠道支公司列表控制层方法结束");
+        return msg;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java
new file mode 100644
index 000000000..13cc296e9
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java
@@ -0,0 +1,479 @@
+package com.ruoyi.content.controller;
+
+
+import com.ruoyi.content.domain.PageDTO;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.LibraryService;
+import com.ruoyi.content.utils.CheckUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * 说明：文章管理
+ *
+ * @author Ma.C
+ * @date 2018年5月2日
+ */
+@Controller
+@RequestMapping("/article")
+public class LibraryManageController {
+    private final static Logger logger = LoggerFactory.getLogger(LibraryManageController.class);
+    @Autowired
+    private LibraryService libraryService;
+    @Autowired
+    private CheckUtil checkUtil;
+
+    /**
+     * 查询文库信息
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/libraryArry")
+    @ResponseBody
+    public PageDTO libraryArry(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("查询文库列表的控制层方法开始！");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        PageDTO pageDTO = new PageDTO();
+        try {
+            String rowsVal = request.getParameter("rows");
+            String page = request.getParameter("page");
+            String articelName = request.getParameter("articelName");
+            String articleThirdTypeInit = request.getParameter("articleThirdTypeInit");
+            String channel = request.getParameter("channel");
+            String special = request.getParameter("special");
+            String articleState = request.getParameter("articleState");
+            if (articleThirdTypeInit != null && !"".equals(articleThirdTypeInit.trim())) {
+                channel = articleThirdTypeInit;
+            } else {
+                special = channel;
+            }
+            int rows = Integer.parseInt(rowsVal);
+            int startRow = rows * (Integer.parseInt(page) - 1);
+            List<HashMap<String, Object>> list = libraryService.queryLibrary(startRow, rows, articelName,
+                    special, channel, articleState);
+            pageDTO.setPage(Integer.parseInt(page));
+            pageDTO.setStartRow(startRow);
+            pageDTO.setDataRows(list);
+            //int count = libraryService.countArticleInfoByState(articelName,special, channel, articleState);
+            int count = libraryService.countArticleByParam(articelName, special, channel, articleState);
+            pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
+            pageDTO.setRecords(count);
+            pageDTO.setPage(Integer.parseInt(page));
+        } catch (Exception e) {
+            logger.info("查询当前用户发布的文章失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("查询文章列表的控制层方法结束！");
+        return pageDTO;
+    }
+
+    /**
+     * 更新文章栏目关系
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+/*	@RequestMapping("/addLibrary")
+	@ResponseBody
+	public Message articleUp(HttpServletRequest request, HttpServletResponse response) {
+		logger.info("给文章添加栏目的控制层方法开始！");
+		response.setHeader("Access-Control-Allow-Origin", "*");
+		Message resultMsg = new Message();
+		Thread.currentThread().setName(UUID.randomUUID().toString());
+		CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+		String companyId = userInfoDTO.getCompanyId();
+		String branchId = userInfoDTO.getBranchId();
+		logger.info("获取修改文章信息页面参数！");
+		String channelId = request.getParameter("channelId");
+		String articleInfo = request.getParameter("articleInfo");
+		logger.info("保存的文章列表是："+articleInfo);
+		JsonArray jsonArray = new JsonParser().parse(articleInfo).getAsJsonArray();
+		logger.info("jsonArray:"+jsonArray);
+		int successNum = 0;
+		try {
+			for (JsonElement ele : jsonArray) {
+				JsonObject obj = ele.getAsJsonObject();
+				logger.info("单个保存参数信息：articleId：【{}】，publishId：【{}】，articleName：【{}】",obj.get("articleId").toString(),
+						obj.get("publishId").toString(),obj.get("articleName").toString());
+				//判断是业务员还是管理员创建的文章
+	//			int count = libraryService.checkCreateUser(articleId,originalUrl,createUser);
+	//			if(count>0) {
+	//				logger.info("爬取业务员文章url失败");
+	//			}
+				//根据栏目id去查一二级栏目
+				BaseCode baseCode = new BaseCode();
+				baseCode = libraryService.queryBaseCodeByChannelId(channelId);	
+	//			String publishId = userInfoDTO.getUserId() + "a" + articleId;
+				//保存在文库表
+				ArticleChannel articleChannel = new ArticleChannel();
+				articleChannel.setArticleId(Integer.valueOf(obj.get("articleId").getAsInt()));
+				articleChannel.setPublishId(obj.get("publishId").getAsString());
+				articleChannel.setArticleName(obj.get("articleName").getAsString());
+				articleChannel.setSpecial(baseCode.getCodeType());
+				articleChannel.setChannel(baseCode.getCodeCode());
+				articleChannel.setCompanyId(companyId);
+				articleChannel.setBranchId(branchId);
+				articleChannel.setPublishDate(DateUtil.currentDate());
+				articleChannel.setPublishTime(DateUtil.currentTime());
+				articleChannel.setUpdateDate(DateUtil.currentDate());
+				articleChannel.setUpdateTime(DateUtil.currentTime());
+				articleChannel.setArticleState("0");
+				Message msg = libraryService.addLibrary(articleChannel);
+				if(msg.getResult()) {
+					successNum++;
+				}
+			}
+			if(successNum==0) {
+				resultMsg.setResult(false);
+				resultMsg.setInfo("收录失败！已有其他版本的文章被收录到同一栏目下！");
+			}else {
+				resultMsg.setInfo("添加成功！");
+				resultMsg.setResult(true);
+				HashMap<String, Object> resultMap = new HashMap<String, Object>();
+				resultMap.put("successNum", successNum);
+				resultMap.put("failed", jsonArray.size()-successNum);
+				resultMsg.setObject(resultMap);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.info("修改文章信息失败【{}】" , e.getMessage());
+		}
+		logger.info("修改文章信息的控制层方法结束！");
+		return resultMsg;
+	}*/
+
+
+    /**
+     * 更新文章栏目关系
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/addLibrary")
+    @ResponseBody
+    public Message articleUp(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("给文章添加栏目的控制层方法开始！");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Message msg = new Message();
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        String companyId = "1";
+        String branchId = "86";
+        String channelId = request.getParameter("channelId");
+        String articleInfoList = request.getParameter("articleInfo");
+        logger.info("批量收录文章控制层获取接口入参参数：companyId：【{}】，branchId：【{}】，channelId：【{}】，articleInfoList：【{}】", companyId,
+                branchId, channelId, articleInfoList);
+        msg = libraryService.addLibrary(companyId, branchId, channelId, articleInfoList);
+        logger.info("修改文章信息的控制层方法结束！");
+        return msg;
+    }
+
+    @RequestMapping("/removeArticleItem")
+    @ResponseBody
+    public Message removeArticleItem(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("批量移除栏目下文章控制层方法开始！");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        String companyId = "1";
+        String branchId = "86";
+        String channelId = request.getParameter("channelId");
+        String articleInfoList = request.getParameter("articleInfo");
+        logger.info("批量收录文章控制层获取接口入参参数：companyId：【{}】，branchId：【{}】，channelId：【{}】，articleInfoList：【{}】", companyId,
+                branchId, channelId, articleInfoList);
+        msg = libraryService.removeArticleItem(companyId, branchId, channelId, articleInfoList);
+        logger.info("修改文章信息的控制层方法结束！");
+        return msg;
+    }
+
+    /**
+     * @Title: changeSate
+     * @Description: TODO(文章发布)
+     */
+    @RequestMapping("/changeSate")
+    @ResponseBody
+    public Message changeSate(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("文章发布控制层开始!");
+        //修改文章状态
+        String ids = request.getParameter("ids");//文章Id
+        String eState = request.getParameter("eState");
+        String sState = request.getParameter("sState");
+        String publishId = request.getParameter("publishId");
+        try {
+            msg = libraryService.changeSate(ids, eState, sState, publishId);
+//			logger.info("开始调用消息推送方法！");
+//			templateSendService.newArticleSend(companyId);
+//			logger.info("结束调用消息推送!");
+        } catch (Exception e) {
+            logger.info("发布文章失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("文章发布控制层结束!");
+        return msg;
+    }
+
+
+    /**
+     * 删除文章信息
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/delLibrary")
+    @ResponseBody
+    public Message delLibrary(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("删除文章信息的控制层方法开始！");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        String id = request.getParameter("ids");
+        try {
+            msg = libraryService.delArticle(id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("删除文章信息失败【{}】", e.getMessage());
+        }
+        logger.info("删除文章信息的控制层方法结束！");
+        return msg;
+    }
+
+
+    @RequestMapping("/preview")
+    @ResponseBody
+    public Message preview(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("文章预览控制层开始!");
+        //获取文章浏览详情
+        String publishId = request.getParameter("publishId");//文章Id
+        logger.info("预览接收到的publishId[{}]", publishId);
+        msg = libraryService.queryEditUrlByPublishId(publishId);
+        logger.info("文章预览控制层结束【{}】!", msg);
+        return msg;
+    }
+
+
+    /**
+     * @Title: articleSend
+     * @Description: TODO(文章推送)
+     */
+    @RequestMapping("/articleSend")
+    @ResponseBody
+    public Message articleSend(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        String openId = "o43yZt9cXHtRwvNF8ZdpGw9r0RGI";
+        logger.info("文章推送控制层开始!");
+        //修改文章状态
+        String articleId = request.getParameter("articleId");//文章Id
+        String publishId = request.getParameter("publishId");
+        String agentCode = request.getParameter("agentCode");
+        String sendType = request.getParameter("sendType"); //推送方式 0：推送企业号/个人，1：复制链路
+        String partyId = request.getParameter("partyId");
+        String data = publishId + "-" + partyId;
+        if (StringUtils.isNotBlank(partyId) && checkUtil.isRepeat(openId, "articleSend", data)) {
+            logger.info("openId【{}】文章在30秒内重复推送！data【{}】", openId, data);
+            msg.setInfo("文章已推送");
+            msg.setResult(false);
+            return msg;
+        }
+        try {
+            msg = libraryService.articleSend(articleId, publishId, agentCode, sendType, partyId, null);
+        } catch (Exception e) {
+            logger.info("发布文章失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("文章发布控制层结束!");
+        return msg;
+    }
+
+
+    /**
+     * @Title: onTimeSend
+     * @Description: TODO(文章定时推送)
+     */
+    @RequestMapping("/onTimeSend")
+    @ResponseBody
+    public Message onTimeSend(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        logger.info("文章定时推送控制层开始!");
+        //修改文章状态
+        String articleId = request.getParameter("articleId");
+        String publishId = request.getParameter("publishId");
+        String agentCode = request.getParameter("agentCode");
+        String sendType = request.getParameter("sendType");
+        String partyId = request.getParameter("partyId");
+        String sendTime = request.getParameter("sendTime");
+        try {
+            msg = libraryService.onTimeSend(articleId, publishId, agentCode, sendType, partyId, sendTime);
+        } catch (Exception e) {
+            logger.info("定时发布文章失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("文章定时推送控制层结束!");
+        return msg;
+    }
+
+
+    /**
+     * 更新文库信息进行排序
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/updateLibrary")
+    @ResponseBody
+    public Message updateLibrary(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("更新文库信息的控制层方法开始！");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        String id = request.getParameter("id");
+        String orderNo = request.getParameter("orderNo");
+        try {
+            msg = libraryService.updateLibrary(id, orderNo);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("更新文库信息失败【{}】", e.getMessage());
+        }
+        logger.info("更新文库信息的控制层方法结束！");
+        return msg;
+    }
+
+
+    /**
+     * 删除文章信息
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/delLibraryHTML")
+    @ResponseBody
+    public Message delLibraryHTML(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("删除文章信息的控制层方法开始！");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        String id = request.getParameter("ids");
+        try {
+            msg = libraryService.delLibraryHTML(id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("删除文章信息失败【{}】", e.getMessage());
+        }
+        logger.info("删除文章信息的控制层方法结束！");
+        return msg;
+    }
+
+
+    /**
+     * 批量转换文章和栏目的关系
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/onkeyExChange")
+    @ResponseBody
+    public Message onkeyExChange(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("给文章转换栏目的控制层方法开始！");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+
+        Message msg = new Message();
+        String companyId = "1";
+        String branchId = "86";
+        String from = request.getParameter("from");
+        String to = request.getParameter("to");
+        logger.info("接收的请求参数：from:【{}】,to【{}】", from, to);
+        try {
+            msg = libraryService.onkeyExChange(from, to, companyId, branchId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("修改文章信息失败【{}】", e.getMessage());
+        }
+        logger.info("修改文章信息的控制层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 查询待推送的文章信息
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/noSendPublishArticle")
+    @ResponseBody
+    public PageDTO noSendPublishArticle(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("查询未推送出去的文章列表！");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        PageDTO pageDTO = new PageDTO();
+        try {
+            String rowsVal = request.getParameter("rows");
+            String page = request.getParameter("page");
+            int rows = Integer.parseInt(rowsVal);
+            int startRow = rows * (Integer.parseInt(page) - 1);
+            String articleId = request.getParameter("articleId");
+            String publishId = request.getParameter("publishId");
+            // 1.根据文章id去查publish表，找出该文章对应所有业务员
+            pageDTO = libraryService.noSendPublishArticle(articleId, startRow, rows, publishId);
+            pageDTO.setPage(Integer.parseInt(page));
+
+            return pageDTO;
+        } catch (Exception e) {
+            logger.info("系统异常！", e);
+            return pageDTO;
+        }
+    }
+
+
+    /**
+     * 批量转换文章和栏目的关系
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/delOnTimeTask")
+    @ResponseBody
+    public Message delOnTimeTask(HttpServletRequest request, HttpServletResponse response) {
+        logger.info("删除未执行的定时任务开始！");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        String delId = request.getParameter("delId");
+        logger.info("接收的请求参数：delId:【{}】", delId);
+        try {
+            msg = libraryService.delOnTimeTask(delId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("删除未执行的定时任务失败【{}】", e.getMessage());
+        }
+        logger.info("删除未执行的定时任务控制层方法结束！");
+        return msg;
+    }
+
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ReportController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ReportController.java
new file mode 100644
index 000000000..59b52be36
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ReportController.java
@@ -0,0 +1,36 @@
+package com.ruoyi.content.controller;
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 说明：报表管理
+ *
+ * @author Ma.C
+ * @date 2018年8月10日
+ */
+@Controller
+@RequestMapping("/report")
+public class ReportController {
+    private final static Logger logger = LoggerFactory.getLogger(ReportController.class);
+
+//	@RequestMapping("/reportList")
+//	public void reportList(HttpServletRequest request, HttpServletResponse response) {
+//		Thread.currentThread().setName(UUID.randomUUID().toString());
+//		ModelAndView mv = new ModelAndView();
+//		mv.setViewName("/micro/report/report");
+//		logger.info("进入报表管理界面！");
+//		try {
+//			response.sendRedirect("http://sales-int.ihxlife.com/gv/dist/index.html");
+//		} catch (IOException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		return;
+//	}
+//	
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java
new file mode 100644
index 000000000..dec476aa6
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java
@@ -0,0 +1,212 @@
+package com.ruoyi.content.controller;
+
+import com.ruoyi.content.domain.ClickTrackInfo;
+import com.ruoyi.content.domain.ClickUserInfo;
+import com.ruoyi.content.domain.PageDTO;
+import com.ruoyi.content.domain.UserInfo;
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.mapper.ArticlePublishTrackMapper;
+import com.ruoyi.content.mapper.CmsSysUserExMapper;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.StaffArticleManageService;
+import com.ruoyi.content.utils.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.util.*;
+
+@Controller
+@RequestMapping("/article")
+public class StaffArticleManageController {
+    private final static Logger logger = LoggerFactory.getLogger(ArticleManageController.class);
+
+    @Autowired
+    private StaffArticleManageService staffArticleManageService;
+    @Autowired
+    private CmsSysUserExMapper cmsSysUserExMapper;
+    @Autowired
+    private ArticlePublishTrackMapper articlePublishTrackMapper;
+
+    /**
+     * 查询该文章有多少业务员发布过
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping("/articleSharingTrackList")
+    @ResponseBody
+    public PageDTO articleSharingTrack(HttpServletRequest request) {
+
+        logger.info("查询文章分享阅读轨迹的控制层方法开始！");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        PageDTO pageDTO = new PageDTO();
+        try {
+            String rowsVal = request.getParameter("rows");
+            String page = request.getParameter("page");
+            int rows = Integer.parseInt(rowsVal);
+            int startRow = rows * (Integer.parseInt(page) - 1);
+            String articleId = request.getParameter("articleId");
+            // 1.根据文章id去查publish表，找出该文章对应所有业务员
+            pageDTO = staffArticleManageService.querySalesmanByArticleId(articleId, startRow, rows);
+            pageDTO.setPage(Integer.parseInt(page));
+
+            return pageDTO;
+        } catch (Exception e) {
+            logger.info("系统异常！", e);
+            return pageDTO;
+        }
+
+    }
+
+    /**
+     * 查询该文章
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping("/publishInfoList")
+    @ResponseBody
+    public PageDTO publishInfoList(HttpServletRequest request) {
+
+
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        PageDTO pageDTO = new PageDTO();
+        try {
+            String rowsVal = request.getParameter("rows");
+            String page = request.getParameter("page");
+            int rows = Integer.parseInt(rowsVal);
+            int startRow = rows * (Integer.parseInt(page) - 1);
+            String userId = request.getParameter("userId");
+            String articleId = request.getParameter("articleId");
+
+            logger.info("查询该业务员userId[{}]的文章articleId[{}]发布情况开始！", userId, articleId);
+
+
+            // 1.根据文章id去查publish表，找出该文章对应所有业务员
+            pageDTO = staffArticleManageService.queryClickInfoByUserId(userId, articleId, startRow, rows);
+            pageDTO.setPage(Integer.parseInt(page));
+
+            return pageDTO;
+        } catch (Exception e) {
+            logger.info("系统异常！", e);
+            return pageDTO;
+        }
+
+    }
+
+    /**
+     * 文章分享轨迹信息查询
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping("/articleSharingTrackInfo")
+    @ResponseBody
+    public Message articleSharingTrackInfo(HttpServletRequest request) {
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        Map<String, Object> returnMap = new HashMap<String, Object>();
+        List<ClickUserInfo> clickUserInfos = new ArrayList<ClickUserInfo>();
+        ClickTrackInfo clickTrackInfo = new ClickTrackInfo();
+        logger.info("查询用户查看分享文章轨迹信息的控制层方法开始！");
+        String clickId = request.getParameter("clickId");
+        if (StringUtils.isBlank(clickId)) {
+            returnMap.put("ClickTrackInfo", clickTrackInfo);
+        } else {
+            clickTrackInfo = staffArticleManageService.articleSharingTrackInfo(clickId);
+            //发布人id
+            UserInfo userInfo = new UserInfo();
+            String publishUserId = clickTrackInfo.getPublishUserId();
+            if (!publishUserId.contains("cofms")) {
+                // UserInfoMapper
+                userInfo = staffArticleManageService.queryPublishUserInfo(publishUserId);
+                try {
+                    userInfo.setNickName(new String(Base64.getDecoder().decode(userInfo.getNickName()), "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    throw new BusinessException("用户昵称解码异常[{" + e.getMessage() + "}]");
+                }
+                logger.info("转换后的用户昵称为:" + userInfo.getNickName());
+            } else {
+                userInfo.setNickName("后台管理员");
+                userInfo.setHeadImgUrl("/static/common/image/logo.png");
+                userInfo.setOpenid("");
+            }
+            returnMap.put("userInfo", userInfo);
+            String clickUserInfo = clickTrackInfo.getClickUserInfo();
+            if (StringUtils.isNotBlank(clickUserInfo)) {
+                clickUserInfos = JsonUtil.JsonToCollectionType(clickUserInfo, List.class, ClickUserInfo.class);
+
+                for (ClickUserInfo clickUserInfo2 : clickUserInfos) {
+                    try {
+                        clickUserInfo2.setNickName(
+                                new String(Base64.getDecoder().decode(clickUserInfo2.getNickName()), "UTF-8"));
+                    } catch (UnsupportedEncodingException e) {
+                        throw new BusinessException("用户昵称解码异常[{" + e.getMessage() + "}]");
+                    }
+                }
+            }
+            returnMap.put("ClickUserInfoList", clickUserInfos);
+
+            String clickUserNickname = clickTrackInfo.getClickUserNickname();
+            if (StringUtils.isNotBlank(clickUserNickname)) {
+                try {
+                    clickTrackInfo.setClickUserNickname(
+                            new String(Base64.getDecoder().decode(clickUserNickname), "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    throw new BusinessException("用户昵称解码异常[{" + e.getMessage() + "}]");
+                }
+            }
+            returnMap.put("ClickTrackInfo", clickTrackInfo);
+            msg.setInfo("获取浏览详情查询成功");
+            msg.setResult(true);
+            msg.setObject(returnMap);
+        }
+        logger.info("查询用户查看分享文章轨迹信息的控制层方法结束！");
+        return msg;
+    }
+
+//    // 复制链路
+//    @RequestMapping("/copyShareUrl")
+//    @ResponseBody
+//    public ModelAndView copyShareUrl(ModelAndView modelAndView, String articleId, String publishId) {
+//        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+//        String email = userInfoDTO.getEmail();
+//        String companyId = userInfoDTO.getCompanyId();
+//        CmsSysUser cmsSysUser = cmsSysUserExMapper.queryLoginInfoByEmail(email);
+//        String userId = cmsSysUser.getUserId();
+////		ArticleInfo articleInfo = staffArticleManageService.queryModifiedViewUrl(articleId);
+//        ArticlePublishTrackExample example = new ArticlePublishTrackExample();
+//        ArticlePublishTrackExample.Criteria criteria = example.createCriteria();
+//        criteria.andPublishIdEqualTo(publishId);
+//        criteria.andArticleIdEqualTo(String.valueOf(articleId));
+//        List<ArticlePublishTrack> aplist = articlePublishTrackMapper.selectByExample(example);
+//        // http://hx-cdn.oss-cn-szfinance-a.aliyuncs.com/contentMKT/console/template/html/view/20180525/272b20180525074506941010.html
+////		String viewUrl = articleInfo.getModifiedViewUrl();
+//        String viewUrl = aplist.get(0).getPublishViewUrl();
+//        String[] viewUrls = viewUrl.split("/");
+//        // 272b20180525074506941010.html
+//        String url = viewUrls[viewUrls.length - 1];
+//        String[] urls = url.split("b");
+//        // 20180525074506941010.html
+//        String url1 = urls[urls.length - 1];
+//        String versionNumber = url1.substring(0, 20);
+//        logger.info("版本号versionNumber[{}]", versionNumber);
+//
+//        modelAndView.setViewName("/micro/article/copyShareUrl");
+//        modelAndView.addObject("articleId", articleId);
+//        modelAndView.addObject("versionNumber", versionNumber);
+//        modelAndView.addObject("userId", userId);
+//        modelAndView.addObject("companyId", companyId);
+//        return modelAndView;
+//
+//    }
+
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementDTO.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementDTO.java
new file mode 100644
index 000000000..9d1393654
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementDTO.java
@@ -0,0 +1,5 @@
+package com.ruoyi.content.domain;
+
+public class AdvertisementDTO {
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementInfo.java
new file mode 100644
index 000000000..02acc892b
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementInfo.java
@@ -0,0 +1,451 @@
+package com.ruoyi.content.domain;
+
+public class AdvertisementInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.AD_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private Integer adId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.AD_TITLE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String adTitle;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.AD_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String adType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.AD_IMAGE_url
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String adImageUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.AD_LINK_url
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String adLinkUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.AD_CONTENT
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String adContent;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.AD_STATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String adState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column advertisement_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.AD_ID
+     *
+     * @return the value of advertisement_info.AD_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Integer getAdId() {
+        return adId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.AD_ID
+     *
+     * @param adId the value for advertisement_info.AD_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setAdId(Integer adId) {
+        this.adId = adId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.COMPANY_ID
+     *
+     * @return the value of advertisement_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.COMPANY_ID
+     *
+     * @param companyId the value for advertisement_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.AD_TITLE
+     *
+     * @return the value of advertisement_info.AD_TITLE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getAdTitle() {
+        return adTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.AD_TITLE
+     *
+     * @param adTitle the value for advertisement_info.AD_TITLE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setAdTitle(String adTitle) {
+        this.adTitle = adTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.AD_TYPE
+     *
+     * @return the value of advertisement_info.AD_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getAdType() {
+        return adType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.AD_TYPE
+     *
+     * @param adType the value for advertisement_info.AD_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setAdType(String adType) {
+        this.adType = adType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.AD_IMAGE_url
+     *
+     * @return the value of advertisement_info.AD_IMAGE_url
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getAdImageUrl() {
+        return adImageUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.AD_IMAGE_url
+     *
+     * @param adImageUrl the value for advertisement_info.AD_IMAGE_url
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setAdImageUrl(String adImageUrl) {
+        this.adImageUrl = adImageUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.AD_LINK_url
+     *
+     * @return the value of advertisement_info.AD_LINK_url
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getAdLinkUrl() {
+        return adLinkUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.AD_LINK_url
+     *
+     * @param adLinkUrl the value for advertisement_info.AD_LINK_url
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setAdLinkUrl(String adLinkUrl) {
+        this.adLinkUrl = adLinkUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.AD_CONTENT
+     *
+     * @return the value of advertisement_info.AD_CONTENT
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getAdContent() {
+        return adContent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.AD_CONTENT
+     *
+     * @param adContent the value for advertisement_info.AD_CONTENT
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setAdContent(String adContent) {
+        this.adContent = adContent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.AD_STATE
+     *
+     * @return the value of advertisement_info.AD_STATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getAdState() {
+        return adState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.AD_STATE
+     *
+     * @param adState the value for advertisement_info.AD_STATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setAdState(String adState) {
+        this.adState = adState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.CREATE_DATE
+     *
+     * @return the value of advertisement_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.CREATE_DATE
+     *
+     * @param createDate the value for advertisement_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.CREATE_TIME
+     *
+     * @return the value of advertisement_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.CREATE_TIME
+     *
+     * @param createTime the value for advertisement_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.CREATE_USER
+     *
+     * @return the value of advertisement_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.CREATE_USER
+     *
+     * @param createUser the value for advertisement_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.UPDATE_USER
+     *
+     * @return the value of advertisement_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.UPDATE_USER
+     *
+     * @param updateUser the value for advertisement_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.UPDATE_DATE
+     *
+     * @return the value of advertisement_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.UPDATE_DATE
+     *
+     * @param updateDate the value for advertisement_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column advertisement_info.UPDATE_TIME
+     *
+     * @return the value of advertisement_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column advertisement_info.UPDATE_TIME
+     *
+     * @param updateTime the value for advertisement_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementInfoExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementInfoExample.java
new file mode 100644
index 000000000..e18cbd7ab
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AdvertisementInfoExample.java
@@ -0,0 +1,1272 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AdvertisementInfoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public AdvertisementInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andAdIdIsNull() {
+            addCriterion("AD_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdIsNotNull() {
+            addCriterion("AD_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdEqualTo(Integer value) {
+            addCriterion("AD_ID =", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotEqualTo(Integer value) {
+            addCriterion("AD_ID <>", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdGreaterThan(Integer value) {
+            addCriterion("AD_ID >", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("AD_ID >=", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdLessThan(Integer value) {
+            addCriterion("AD_ID <", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdLessThanOrEqualTo(Integer value) {
+            addCriterion("AD_ID <=", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdIn(List<Integer> values) {
+            addCriterion("AD_ID in", values, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotIn(List<Integer> values) {
+            addCriterion("AD_ID not in", values, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdBetween(Integer value1, Integer value2) {
+            addCriterion("AD_ID between", value1, value2, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("AD_ID not between", value1, value2, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleIsNull() {
+            addCriterion("AD_TITLE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleIsNotNull() {
+            addCriterion("AD_TITLE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleEqualTo(String value) {
+            addCriterion("AD_TITLE =", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleNotEqualTo(String value) {
+            addCriterion("AD_TITLE <>", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleGreaterThan(String value) {
+            addCriterion("AD_TITLE >", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_TITLE >=", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleLessThan(String value) {
+            addCriterion("AD_TITLE <", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleLessThanOrEqualTo(String value) {
+            addCriterion("AD_TITLE <=", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleLike(String value) {
+            addCriterion("AD_TITLE like", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleNotLike(String value) {
+            addCriterion("AD_TITLE not like", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleIn(List<String> values) {
+            addCriterion("AD_TITLE in", values, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleNotIn(List<String> values) {
+            addCriterion("AD_TITLE not in", values, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleBetween(String value1, String value2) {
+            addCriterion("AD_TITLE between", value1, value2, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleNotBetween(String value1, String value2) {
+            addCriterion("AD_TITLE not between", value1, value2, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeIsNull() {
+            addCriterion("AD_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeIsNotNull() {
+            addCriterion("AD_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeEqualTo(String value) {
+            addCriterion("AD_TYPE =", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNotEqualTo(String value) {
+            addCriterion("AD_TYPE <>", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeGreaterThan(String value) {
+            addCriterion("AD_TYPE >", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_TYPE >=", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeLessThan(String value) {
+            addCriterion("AD_TYPE <", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeLessThanOrEqualTo(String value) {
+            addCriterion("AD_TYPE <=", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeLike(String value) {
+            addCriterion("AD_TYPE like", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNotLike(String value) {
+            addCriterion("AD_TYPE not like", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeIn(List<String> values) {
+            addCriterion("AD_TYPE in", values, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNotIn(List<String> values) {
+            addCriterion("AD_TYPE not in", values, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeBetween(String value1, String value2) {
+            addCriterion("AD_TYPE between", value1, value2, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNotBetween(String value1, String value2) {
+            addCriterion("AD_TYPE not between", value1, value2, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlIsNull() {
+            addCriterion("AD_IMAGE_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlIsNotNull() {
+            addCriterion("AD_IMAGE_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlEqualTo(String value) {
+            addCriterion("AD_IMAGE_url =", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlNotEqualTo(String value) {
+            addCriterion("AD_IMAGE_url <>", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlGreaterThan(String value) {
+            addCriterion("AD_IMAGE_url >", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_IMAGE_url >=", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlLessThan(String value) {
+            addCriterion("AD_IMAGE_url <", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlLessThanOrEqualTo(String value) {
+            addCriterion("AD_IMAGE_url <=", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlLike(String value) {
+            addCriterion("AD_IMAGE_url like", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlNotLike(String value) {
+            addCriterion("AD_IMAGE_url not like", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlIn(List<String> values) {
+            addCriterion("AD_IMAGE_url in", values, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlNotIn(List<String> values) {
+            addCriterion("AD_IMAGE_url not in", values, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlBetween(String value1, String value2) {
+            addCriterion("AD_IMAGE_url between", value1, value2, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlNotBetween(String value1, String value2) {
+            addCriterion("AD_IMAGE_url not between", value1, value2, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlIsNull() {
+            addCriterion("AD_LINK_url is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlIsNotNull() {
+            addCriterion("AD_LINK_url is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlEqualTo(String value) {
+            addCriterion("AD_LINK_url =", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlNotEqualTo(String value) {
+            addCriterion("AD_LINK_url <>", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlGreaterThan(String value) {
+            addCriterion("AD_LINK_url >", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_LINK_url >=", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlLessThan(String value) {
+            addCriterion("AD_LINK_url <", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlLessThanOrEqualTo(String value) {
+            addCriterion("AD_LINK_url <=", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlLike(String value) {
+            addCriterion("AD_LINK_url like", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlNotLike(String value) {
+            addCriterion("AD_LINK_url not like", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlIn(List<String> values) {
+            addCriterion("AD_LINK_url in", values, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlNotIn(List<String> values) {
+            addCriterion("AD_LINK_url not in", values, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlBetween(String value1, String value2) {
+            addCriterion("AD_LINK_url between", value1, value2, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlNotBetween(String value1, String value2) {
+            addCriterion("AD_LINK_url not between", value1, value2, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentIsNull() {
+            addCriterion("AD_CONTENT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentIsNotNull() {
+            addCriterion("AD_CONTENT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentEqualTo(String value) {
+            addCriterion("AD_CONTENT =", value, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentNotEqualTo(String value) {
+            addCriterion("AD_CONTENT <>", value, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentGreaterThan(String value) {
+            addCriterion("AD_CONTENT >", value, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_CONTENT >=", value, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentLessThan(String value) {
+            addCriterion("AD_CONTENT <", value, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentLessThanOrEqualTo(String value) {
+            addCriterion("AD_CONTENT <=", value, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentLike(String value) {
+            addCriterion("AD_CONTENT like", value, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentNotLike(String value) {
+            addCriterion("AD_CONTENT not like", value, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentIn(List<String> values) {
+            addCriterion("AD_CONTENT in", values, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentNotIn(List<String> values) {
+            addCriterion("AD_CONTENT not in", values, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentBetween(String value1, String value2) {
+            addCriterion("AD_CONTENT between", value1, value2, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdContentNotBetween(String value1, String value2) {
+            addCriterion("AD_CONTENT not between", value1, value2, "adContent");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateIsNull() {
+            addCriterion("AD_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateIsNotNull() {
+            addCriterion("AD_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateEqualTo(String value) {
+            addCriterion("AD_STATE =", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateNotEqualTo(String value) {
+            addCriterion("AD_STATE <>", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateGreaterThan(String value) {
+            addCriterion("AD_STATE >", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_STATE >=", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateLessThan(String value) {
+            addCriterion("AD_STATE <", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateLessThanOrEqualTo(String value) {
+            addCriterion("AD_STATE <=", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateLike(String value) {
+            addCriterion("AD_STATE like", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateNotLike(String value) {
+            addCriterion("AD_STATE not like", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateIn(List<String> values) {
+            addCriterion("AD_STATE in", values, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateNotIn(List<String> values) {
+            addCriterion("AD_STATE not in", values, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateBetween(String value1, String value2) {
+            addCriterion("AD_STATE between", value1, value2, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateNotBetween(String value1, String value2) {
+            addCriterion("AD_STATE not between", value1, value2, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table advertisement_info
+     *
+     * @mbggenerated do_not_delete_during_merge Mon Mar 26 15:46:22 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticeClickInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticeClickInfo.java
new file mode 100644
index 000000000..a60c9298d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticeClickInfo.java
@@ -0,0 +1,68 @@
+package com.ruoyi.content.domain;
+
+
+
+public class ArticeClickInfo {
+	// 浏览者信息
+	private String clickUserHeadimgurl; // 用户头像url
+	private String clickUserNickname;// 用户昵称
+	private String watchTime; // 观察时间
+	private String createDate; 	// 浏览时间yyyy-mm-dd
+	private String createTime;	// 浏览时间 HH-mm
+	private String shareState; // 分享状态 0-未分享、1-已分享
+
+	public ArticeClickInfo() {
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getClickUserHeadimgurl() {
+		return clickUserHeadimgurl;
+	}
+
+	public void setClickUserHeadimgurl(String clickUserHeadimgurl) {
+		this.clickUserHeadimgurl = clickUserHeadimgurl;
+	}
+
+	public String getClickUserNickname() {
+//		if (StringUtils.isNotBlank(clickUserNickname)) {
+//			return Base64.getDecoder().decode(clickUserNickname).toString();
+//		}
+		return clickUserNickname;
+	}
+
+	public void setClickUserNickname(String clickUserNickname) {
+		this.clickUserNickname = clickUserNickname;
+	}
+
+	public String getWatchTime() {
+		return watchTime;
+	}
+
+	public void setWatchTime(String watchTime) {
+		this.watchTime = watchTime;
+	}
+
+	public String getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+
+	public String getShareState() {
+		return shareState;
+	}
+
+	public void setShareState(String shareState) {
+		this.shareState = shareState;
+	}
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticeClickInfoExDTO.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticeClickInfoExDTO.java
new file mode 100644
index 000000000..78dff02b4
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticeClickInfoExDTO.java
@@ -0,0 +1,130 @@
+package com.ruoyi.content.domain;
+
+
+
+public class ArticeClickInfoExDTO {
+	// 浏览者信息
+	private String clickUserHeadimgurl; // 用户头像url
+	private String clickUserNickname;// 用户昵称
+	private String watchTime; // 观察时间
+	private String createDate; 	// 浏览时间yyyy-mm-dd
+	private String createTime;	// 浏览时间 HH-mm
+	private String shareState; // 分享状态 0-未分享、1-已分享
+	private String fromShareState;// 查看文章的人是否已分享,0-未分享,1-对话框分享(包含个人和群组),2-朋友圈分享,5-对话框和朋友圈都分享了'
+	private String articleId; //文章id
+	private String articleName;//文章名称
+	private String pushDate;//发布时间
+	private String articleAutchor;
+	private String clickUserInfo;
+	private String clickId;
+	public ArticeClickInfoExDTO() {
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getClickUserHeadimgurl() {
+		return clickUserHeadimgurl;
+	}
+
+	public void setClickUserHeadimgurl(String clickUserHeadimgurl) {
+		this.clickUserHeadimgurl = clickUserHeadimgurl;
+	}
+
+	public String getClickUserNickname() {
+//		if (StringUtils.isNotBlank(clickUserNickname)) {
+//			return Base64.getDecoder().decode(clickUserNickname).toString();
+//		}
+		return clickUserNickname;
+	}
+
+	public void setClickUserNickname(String clickUserNickname) {
+		this.clickUserNickname = clickUserNickname;
+	}
+
+	public String getWatchTime() {
+		return watchTime;
+	}
+
+	public void setWatchTime(String watchTime) {
+		this.watchTime = watchTime;
+	}
+
+	public String getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+
+	public String getShareState() {
+		return shareState;
+	}
+
+	public void setShareState(String shareState) {
+		this.shareState = shareState;
+	}
+
+	public String getFromShareState() {
+		return fromShareState;
+	}
+
+	public void setFromShareState(String fromShareState) {
+		this.fromShareState = fromShareState;
+	}
+
+	public String getArticleId() {
+		return articleId;
+	}
+
+	public void setArticleId(String articleId) {
+		this.articleId = articleId;
+	}
+
+	public String getArticleName() {
+		return articleName;
+	}
+
+	public void setArticleName(String articleName) {
+		this.articleName = articleName;
+	}
+
+	public String getPushDate() {
+		return pushDate;
+	}
+
+	public void setPushDate(String pushDate) {
+		this.pushDate = pushDate;
+	}
+
+	public String getArticleAutchor() {
+		return articleAutchor;
+	}
+
+	public void setArticleAutchor(String articleAutchor) {
+		this.articleAutchor = articleAutchor;
+	}
+
+	public String getClickUserInfo() {
+		return clickUserInfo;
+	}
+
+	public void setClickUserInfo(String clickUserInfo) {
+		this.clickUserInfo = clickUserInfo;
+	}
+
+	public String getClickId() {
+		return clickId;
+	}
+
+	public void setClickId(String clickId) {
+		this.clickId = clickId;
+	}
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleAdInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleAdInfo.java
new file mode 100644
index 000000000..c7e2b911d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleAdInfo.java
@@ -0,0 +1,547 @@
+package com.ruoyi.content.domain;
+
+public class ArticleAdInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.AD_ID
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private Integer adId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.COMPANY_ID
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.AD_TYPE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String adType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.AD_TYPE_NAME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String adTypeName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.AD_LINK_URL
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String adLinkUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.AD_TITLE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String adTitle;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.AD_NAME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String adName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.AD_SUMMARY
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String adSummary;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.AD_COLOR_TYPE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String adColorType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.AD_IMAGE_URL
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String adImageUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.AD_STATE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String adState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.CREATE_DATE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.CREATE_TIME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.CREATE_USER
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.UPDATE_USER
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.UPDATE_DATE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_ad_info.UPDATE_TIME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.AD_ID
+     *
+     * @return the value of article_ad_info.AD_ID
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public Integer getAdId() {
+        return adId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.AD_ID
+     *
+     * @param adId the value for article_ad_info.AD_ID
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setAdId(Integer adId) {
+        this.adId = adId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.COMPANY_ID
+     *
+     * @return the value of article_ad_info.COMPANY_ID
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.COMPANY_ID
+     *
+     * @param companyId the value for article_ad_info.COMPANY_ID
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.AD_TYPE
+     *
+     * @return the value of article_ad_info.AD_TYPE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getAdType() {
+        return adType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.AD_TYPE
+     *
+     * @param adType the value for article_ad_info.AD_TYPE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setAdType(String adType) {
+        this.adType = adType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.AD_TYPE_NAME
+     *
+     * @return the value of article_ad_info.AD_TYPE_NAME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getAdTypeName() {
+        return adTypeName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.AD_TYPE_NAME
+     *
+     * @param adTypeName the value for article_ad_info.AD_TYPE_NAME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setAdTypeName(String adTypeName) {
+        this.adTypeName = adTypeName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.AD_LINK_URL
+     *
+     * @return the value of article_ad_info.AD_LINK_URL
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getAdLinkUrl() {
+        return adLinkUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.AD_LINK_URL
+     *
+     * @param adLinkUrl the value for article_ad_info.AD_LINK_URL
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setAdLinkUrl(String adLinkUrl) {
+        this.adLinkUrl = adLinkUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.AD_TITLE
+     *
+     * @return the value of article_ad_info.AD_TITLE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getAdTitle() {
+        return adTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.AD_TITLE
+     *
+     * @param adTitle the value for article_ad_info.AD_TITLE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setAdTitle(String adTitle) {
+        this.adTitle = adTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.AD_NAME
+     *
+     * @return the value of article_ad_info.AD_NAME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getAdName() {
+        return adName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.AD_NAME
+     *
+     * @param adName the value for article_ad_info.AD_NAME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setAdName(String adName) {
+        this.adName = adName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.AD_SUMMARY
+     *
+     * @return the value of article_ad_info.AD_SUMMARY
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getAdSummary() {
+        return adSummary;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.AD_SUMMARY
+     *
+     * @param adSummary the value for article_ad_info.AD_SUMMARY
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setAdSummary(String adSummary) {
+        this.adSummary = adSummary;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.AD_COLOR_TYPE
+     *
+     * @return the value of article_ad_info.AD_COLOR_TYPE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getAdColorType() {
+        return adColorType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.AD_COLOR_TYPE
+     *
+     * @param adColorType the value for article_ad_info.AD_COLOR_TYPE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setAdColorType(String adColorType) {
+        this.adColorType = adColorType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.AD_IMAGE_URL
+     *
+     * @return the value of article_ad_info.AD_IMAGE_URL
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getAdImageUrl() {
+        return adImageUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.AD_IMAGE_URL
+     *
+     * @param adImageUrl the value for article_ad_info.AD_IMAGE_URL
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setAdImageUrl(String adImageUrl) {
+        this.adImageUrl = adImageUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.AD_STATE
+     *
+     * @return the value of article_ad_info.AD_STATE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getAdState() {
+        return adState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.AD_STATE
+     *
+     * @param adState the value for article_ad_info.AD_STATE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setAdState(String adState) {
+        this.adState = adState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.CREATE_DATE
+     *
+     * @return the value of article_ad_info.CREATE_DATE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.CREATE_DATE
+     *
+     * @param createDate the value for article_ad_info.CREATE_DATE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.CREATE_TIME
+     *
+     * @return the value of article_ad_info.CREATE_TIME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.CREATE_TIME
+     *
+     * @param createTime the value for article_ad_info.CREATE_TIME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.CREATE_USER
+     *
+     * @return the value of article_ad_info.CREATE_USER
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.CREATE_USER
+     *
+     * @param createUser the value for article_ad_info.CREATE_USER
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.UPDATE_USER
+     *
+     * @return the value of article_ad_info.UPDATE_USER
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.UPDATE_USER
+     *
+     * @param updateUser the value for article_ad_info.UPDATE_USER
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.UPDATE_DATE
+     *
+     * @return the value of article_ad_info.UPDATE_DATE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.UPDATE_DATE
+     *
+     * @param updateDate the value for article_ad_info.UPDATE_DATE
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_ad_info.UPDATE_TIME
+     *
+     * @return the value of article_ad_info.UPDATE_TIME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_ad_info.UPDATE_TIME
+     *
+     * @param updateTime the value for article_ad_info.UPDATE_TIME
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleAdInfoExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleAdInfoExample.java
new file mode 100644
index 000000000..101348310
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleAdInfoExample.java
@@ -0,0 +1,1482 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArticleAdInfoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public ArticleAdInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andAdIdIsNull() {
+            addCriterion("AD_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdIsNotNull() {
+            addCriterion("AD_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdEqualTo(Integer value) {
+            addCriterion("AD_ID =", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotEqualTo(Integer value) {
+            addCriterion("AD_ID <>", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdGreaterThan(Integer value) {
+            addCriterion("AD_ID >", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("AD_ID >=", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdLessThan(Integer value) {
+            addCriterion("AD_ID <", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdLessThanOrEqualTo(Integer value) {
+            addCriterion("AD_ID <=", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdIn(List<Integer> values) {
+            addCriterion("AD_ID in", values, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotIn(List<Integer> values) {
+            addCriterion("AD_ID not in", values, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdBetween(Integer value1, Integer value2) {
+            addCriterion("AD_ID between", value1, value2, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("AD_ID not between", value1, value2, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeIsNull() {
+            addCriterion("AD_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeIsNotNull() {
+            addCriterion("AD_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeEqualTo(String value) {
+            addCriterion("AD_TYPE =", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNotEqualTo(String value) {
+            addCriterion("AD_TYPE <>", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeGreaterThan(String value) {
+            addCriterion("AD_TYPE >", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_TYPE >=", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeLessThan(String value) {
+            addCriterion("AD_TYPE <", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeLessThanOrEqualTo(String value) {
+            addCriterion("AD_TYPE <=", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeLike(String value) {
+            addCriterion("AD_TYPE like", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNotLike(String value) {
+            addCriterion("AD_TYPE not like", value, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeIn(List<String> values) {
+            addCriterion("AD_TYPE in", values, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNotIn(List<String> values) {
+            addCriterion("AD_TYPE not in", values, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeBetween(String value1, String value2) {
+            addCriterion("AD_TYPE between", value1, value2, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNotBetween(String value1, String value2) {
+            addCriterion("AD_TYPE not between", value1, value2, "adType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameIsNull() {
+            addCriterion("AD_TYPE_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameIsNotNull() {
+            addCriterion("AD_TYPE_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameEqualTo(String value) {
+            addCriterion("AD_TYPE_NAME =", value, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameNotEqualTo(String value) {
+            addCriterion("AD_TYPE_NAME <>", value, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameGreaterThan(String value) {
+            addCriterion("AD_TYPE_NAME >", value, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_TYPE_NAME >=", value, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameLessThan(String value) {
+            addCriterion("AD_TYPE_NAME <", value, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameLessThanOrEqualTo(String value) {
+            addCriterion("AD_TYPE_NAME <=", value, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameLike(String value) {
+            addCriterion("AD_TYPE_NAME like", value, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameNotLike(String value) {
+            addCriterion("AD_TYPE_NAME not like", value, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameIn(List<String> values) {
+            addCriterion("AD_TYPE_NAME in", values, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameNotIn(List<String> values) {
+            addCriterion("AD_TYPE_NAME not in", values, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameBetween(String value1, String value2) {
+            addCriterion("AD_TYPE_NAME between", value1, value2, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTypeNameNotBetween(String value1, String value2) {
+            addCriterion("AD_TYPE_NAME not between", value1, value2, "adTypeName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlIsNull() {
+            addCriterion("AD_LINK_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlIsNotNull() {
+            addCriterion("AD_LINK_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlEqualTo(String value) {
+            addCriterion("AD_LINK_URL =", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlNotEqualTo(String value) {
+            addCriterion("AD_LINK_URL <>", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlGreaterThan(String value) {
+            addCriterion("AD_LINK_URL >", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_LINK_URL >=", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlLessThan(String value) {
+            addCriterion("AD_LINK_URL <", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlLessThanOrEqualTo(String value) {
+            addCriterion("AD_LINK_URL <=", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlLike(String value) {
+            addCriterion("AD_LINK_URL like", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlNotLike(String value) {
+            addCriterion("AD_LINK_URL not like", value, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlIn(List<String> values) {
+            addCriterion("AD_LINK_URL in", values, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlNotIn(List<String> values) {
+            addCriterion("AD_LINK_URL not in", values, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlBetween(String value1, String value2) {
+            addCriterion("AD_LINK_URL between", value1, value2, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdLinkUrlNotBetween(String value1, String value2) {
+            addCriterion("AD_LINK_URL not between", value1, value2, "adLinkUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleIsNull() {
+            addCriterion("AD_TITLE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleIsNotNull() {
+            addCriterion("AD_TITLE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleEqualTo(String value) {
+            addCriterion("AD_TITLE =", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleNotEqualTo(String value) {
+            addCriterion("AD_TITLE <>", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleGreaterThan(String value) {
+            addCriterion("AD_TITLE >", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_TITLE >=", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleLessThan(String value) {
+            addCriterion("AD_TITLE <", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleLessThanOrEqualTo(String value) {
+            addCriterion("AD_TITLE <=", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleLike(String value) {
+            addCriterion("AD_TITLE like", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleNotLike(String value) {
+            addCriterion("AD_TITLE not like", value, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleIn(List<String> values) {
+            addCriterion("AD_TITLE in", values, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleNotIn(List<String> values) {
+            addCriterion("AD_TITLE not in", values, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleBetween(String value1, String value2) {
+            addCriterion("AD_TITLE between", value1, value2, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdTitleNotBetween(String value1, String value2) {
+            addCriterion("AD_TITLE not between", value1, value2, "adTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameIsNull() {
+            addCriterion("AD_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameIsNotNull() {
+            addCriterion("AD_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameEqualTo(String value) {
+            addCriterion("AD_NAME =", value, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameNotEqualTo(String value) {
+            addCriterion("AD_NAME <>", value, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameGreaterThan(String value) {
+            addCriterion("AD_NAME >", value, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_NAME >=", value, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameLessThan(String value) {
+            addCriterion("AD_NAME <", value, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameLessThanOrEqualTo(String value) {
+            addCriterion("AD_NAME <=", value, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameLike(String value) {
+            addCriterion("AD_NAME like", value, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameNotLike(String value) {
+            addCriterion("AD_NAME not like", value, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameIn(List<String> values) {
+            addCriterion("AD_NAME in", values, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameNotIn(List<String> values) {
+            addCriterion("AD_NAME not in", values, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameBetween(String value1, String value2) {
+            addCriterion("AD_NAME between", value1, value2, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdNameNotBetween(String value1, String value2) {
+            addCriterion("AD_NAME not between", value1, value2, "adName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryIsNull() {
+            addCriterion("AD_SUMMARY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryIsNotNull() {
+            addCriterion("AD_SUMMARY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryEqualTo(String value) {
+            addCriterion("AD_SUMMARY =", value, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryNotEqualTo(String value) {
+            addCriterion("AD_SUMMARY <>", value, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryGreaterThan(String value) {
+            addCriterion("AD_SUMMARY >", value, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_SUMMARY >=", value, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryLessThan(String value) {
+            addCriterion("AD_SUMMARY <", value, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryLessThanOrEqualTo(String value) {
+            addCriterion("AD_SUMMARY <=", value, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryLike(String value) {
+            addCriterion("AD_SUMMARY like", value, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryNotLike(String value) {
+            addCriterion("AD_SUMMARY not like", value, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryIn(List<String> values) {
+            addCriterion("AD_SUMMARY in", values, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryNotIn(List<String> values) {
+            addCriterion("AD_SUMMARY not in", values, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryBetween(String value1, String value2) {
+            addCriterion("AD_SUMMARY between", value1, value2, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdSummaryNotBetween(String value1, String value2) {
+            addCriterion("AD_SUMMARY not between", value1, value2, "adSummary");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeIsNull() {
+            addCriterion("AD_COLOR_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeIsNotNull() {
+            addCriterion("AD_COLOR_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeEqualTo(String value) {
+            addCriterion("AD_COLOR_TYPE =", value, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeNotEqualTo(String value) {
+            addCriterion("AD_COLOR_TYPE <>", value, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeGreaterThan(String value) {
+            addCriterion("AD_COLOR_TYPE >", value, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_COLOR_TYPE >=", value, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeLessThan(String value) {
+            addCriterion("AD_COLOR_TYPE <", value, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeLessThanOrEqualTo(String value) {
+            addCriterion("AD_COLOR_TYPE <=", value, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeLike(String value) {
+            addCriterion("AD_COLOR_TYPE like", value, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeNotLike(String value) {
+            addCriterion("AD_COLOR_TYPE not like", value, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeIn(List<String> values) {
+            addCriterion("AD_COLOR_TYPE in", values, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeNotIn(List<String> values) {
+            addCriterion("AD_COLOR_TYPE not in", values, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeBetween(String value1, String value2) {
+            addCriterion("AD_COLOR_TYPE between", value1, value2, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdColorTypeNotBetween(String value1, String value2) {
+            addCriterion("AD_COLOR_TYPE not between", value1, value2, "adColorType");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlIsNull() {
+            addCriterion("AD_IMAGE_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlIsNotNull() {
+            addCriterion("AD_IMAGE_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlEqualTo(String value) {
+            addCriterion("AD_IMAGE_URL =", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlNotEqualTo(String value) {
+            addCriterion("AD_IMAGE_URL <>", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlGreaterThan(String value) {
+            addCriterion("AD_IMAGE_URL >", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_IMAGE_URL >=", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlLessThan(String value) {
+            addCriterion("AD_IMAGE_URL <", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlLessThanOrEqualTo(String value) {
+            addCriterion("AD_IMAGE_URL <=", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlLike(String value) {
+            addCriterion("AD_IMAGE_URL like", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlNotLike(String value) {
+            addCriterion("AD_IMAGE_URL not like", value, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlIn(List<String> values) {
+            addCriterion("AD_IMAGE_URL in", values, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlNotIn(List<String> values) {
+            addCriterion("AD_IMAGE_URL not in", values, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlBetween(String value1, String value2) {
+            addCriterion("AD_IMAGE_URL between", value1, value2, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdImageUrlNotBetween(String value1, String value2) {
+            addCriterion("AD_IMAGE_URL not between", value1, value2, "adImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateIsNull() {
+            addCriterion("AD_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateIsNotNull() {
+            addCriterion("AD_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateEqualTo(String value) {
+            addCriterion("AD_STATE =", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateNotEqualTo(String value) {
+            addCriterion("AD_STATE <>", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateGreaterThan(String value) {
+            addCriterion("AD_STATE >", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_STATE >=", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateLessThan(String value) {
+            addCriterion("AD_STATE <", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateLessThanOrEqualTo(String value) {
+            addCriterion("AD_STATE <=", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateLike(String value) {
+            addCriterion("AD_STATE like", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateNotLike(String value) {
+            addCriterion("AD_STATE not like", value, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateIn(List<String> values) {
+            addCriterion("AD_STATE in", values, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateNotIn(List<String> values) {
+            addCriterion("AD_STATE not in", values, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateBetween(String value1, String value2) {
+            addCriterion("AD_STATE between", value1, value2, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdStateNotBetween(String value1, String value2) {
+            addCriterion("AD_STATE not between", value1, value2, "adState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_ad_info
+     *
+     * @mbggenerated do_not_delete_during_merge Thu Aug 02 14:00:18 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleChannel.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleChannel.java
new file mode 100644
index 000000000..b7c4d0c7e
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleChannel.java
@@ -0,0 +1,493 @@
+package com.ruoyi.content.domain;
+
+public class ArticleChannel {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.ARTICLE_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private Integer articleId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.ARTICLE_NAME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String articleName;
+    
+    private String articleVersion;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.SPECIAL
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String special;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.CHANNEL
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String channel;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.ARTICLE_STATE
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String articleState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.PUBLISH_DATE
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String publishDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.PUBLISH_TIME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String publishTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.UPDATE_DATE
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.UPDATE_TIME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.COMPANY_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.BRANCH_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String branchId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.PUBLISH_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String publishId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.ORDER_NO
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private Integer orderNo;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_channel.TOP_TIME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    private String topTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.ID
+     *
+     * @return the value of article_channel.ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.ID
+     *
+     * @param id the value for article_channel.ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.ARTICLE_ID
+     *
+     * @return the value of article_channel.ARTICLE_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public Integer getArticleId() {
+        return articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.ARTICLE_ID
+     *
+     * @param articleId the value for article_channel.ARTICLE_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setArticleId(Integer articleId) {
+        this.articleId = articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.ARTICLE_NAME
+     *
+     * @return the value of article_channel.ARTICLE_NAME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getArticleName() {
+        return articleName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.ARTICLE_NAME
+     *
+     * @param articleName the value for article_channel.ARTICLE_NAME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setArticleName(String articleName) {
+        this.articleName = articleName;
+    }
+    
+	public String getArticleVersion() {
+		return this.articleVersion;
+	}
+
+	public void setArticleVersion(String articleVersion) {
+		this.articleVersion = articleVersion;
+	}
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.SPECIAL
+     *
+     * @return the value of article_channel.SPECIAL
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getSpecial() {
+        return special;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.SPECIAL
+     *
+     * @param special the value for article_channel.SPECIAL
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setSpecial(String special) {
+        this.special = special;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.CHANNEL
+     *
+     * @return the value of article_channel.CHANNEL
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getChannel() {
+        return channel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.CHANNEL
+     *
+     * @param channel the value for article_channel.CHANNEL
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setChannel(String channel) {
+        this.channel = channel;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.ARTICLE_STATE
+     *
+     * @return the value of article_channel.ARTICLE_STATE
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getArticleState() {
+        return articleState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.ARTICLE_STATE
+     *
+     * @param articleState the value for article_channel.ARTICLE_STATE
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setArticleState(String articleState) {
+        this.articleState = articleState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.PUBLISH_DATE
+     *
+     * @return the value of article_channel.PUBLISH_DATE
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getPublishDate() {
+        return publishDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.PUBLISH_DATE
+     *
+     * @param publishDate the value for article_channel.PUBLISH_DATE
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setPublishDate(String publishDate) {
+        this.publishDate = publishDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.PUBLISH_TIME
+     *
+     * @return the value of article_channel.PUBLISH_TIME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getPublishTime() {
+        return publishTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.PUBLISH_TIME
+     *
+     * @param publishTime the value for article_channel.PUBLISH_TIME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setPublishTime(String publishTime) {
+        this.publishTime = publishTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.UPDATE_DATE
+     *
+     * @return the value of article_channel.UPDATE_DATE
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.UPDATE_DATE
+     *
+     * @param updateDate the value for article_channel.UPDATE_DATE
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.UPDATE_TIME
+     *
+     * @return the value of article_channel.UPDATE_TIME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.UPDATE_TIME
+     *
+     * @param updateTime the value for article_channel.UPDATE_TIME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.COMPANY_ID
+     *
+     * @return the value of article_channel.COMPANY_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.COMPANY_ID
+     *
+     * @param companyId the value for article_channel.COMPANY_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.BRANCH_ID
+     *
+     * @return the value of article_channel.BRANCH_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getBranchId() {
+        return branchId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.BRANCH_ID
+     *
+     * @param branchId the value for article_channel.BRANCH_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setBranchId(String branchId) {
+        this.branchId = branchId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.PUBLISH_ID
+     *
+     * @return the value of article_channel.PUBLISH_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getPublishId() {
+        return publishId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.PUBLISH_ID
+     *
+     * @param publishId the value for article_channel.PUBLISH_ID
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setPublishId(String publishId) {
+        this.publishId = publishId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.ORDER_NO
+     *
+     * @return the value of article_channel.ORDER_NO
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.ORDER_NO
+     *
+     * @param orderNo the value for article_channel.ORDER_NO
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_channel.TOP_TIME
+     *
+     * @return the value of article_channel.TOP_TIME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getTopTime() {
+        return topTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_channel.TOP_TIME
+     *
+     * @param topTime the value for article_channel.TOP_TIME
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setTopTime(String topTime) {
+        this.topTime = topTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleChannelExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleChannelExample.java
new file mode 100644
index 000000000..97be10961
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleChannelExample.java
@@ -0,0 +1,1392 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArticleChannelExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public ArticleChannelExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNull() {
+            addCriterion("ARTICLE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNotNull() {
+            addCriterion("ARTICLE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID =", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID <>", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThan(Integer value) {
+            addCriterion("ARTICLE_ID >", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID >=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThan(Integer value) {
+            addCriterion("ARTICLE_ID <", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID <=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIn(List<Integer> values) {
+            addCriterion("ARTICLE_ID in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotIn(List<Integer> values) {
+            addCriterion("ARTICLE_ID not in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdBetween(Integer value1, Integer value2) {
+            addCriterion("ARTICLE_ID between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ARTICLE_ID not between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameIsNull() {
+            addCriterion("ARTICLE_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameIsNotNull() {
+            addCriterion("ARTICLE_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameEqualTo(String value) {
+            addCriterion("ARTICLE_NAME =", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameNotEqualTo(String value) {
+            addCriterion("ARTICLE_NAME <>", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameGreaterThan(String value) {
+            addCriterion("ARTICLE_NAME >", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameGreaterThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_NAME >=", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameLessThan(String value) {
+            addCriterion("ARTICLE_NAME <", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameLessThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_NAME <=", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameLike(String value) {
+            addCriterion("ARTICLE_NAME like", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameNotLike(String value) {
+            addCriterion("ARTICLE_NAME not like", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameIn(List<String> values) {
+            addCriterion("ARTICLE_NAME in", values, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameNotIn(List<String> values) {
+            addCriterion("ARTICLE_NAME not in", values, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameBetween(String value1, String value2) {
+            addCriterion("ARTICLE_NAME between", value1, value2, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameNotBetween(String value1, String value2) {
+            addCriterion("ARTICLE_NAME not between", value1, value2, "articleName");
+            return (Criteria) this;
+        }
+        
+		public Criteria andArticleVersionIsNull() {
+			addCriterion("ARTICLE_VERSION is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionIsNotNull() {
+			addCriterion("ARTICLE_VERSION is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionEqualTo(String value) {
+			addCriterion("ARTICLE_VERSION =", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionNotEqualTo(String value) {
+			addCriterion("ARTICLE_VERSION <>", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionGreaterThan(String value) {
+			addCriterion("ARTICLE_VERSION >", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionGreaterThanOrEqualTo(String value) {
+			addCriterion("ARTICLE_VERSION >=", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionLessThan(String value) {
+			addCriterion("ARTICLE_VERSION <", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionLessThanOrEqualTo(String value) {
+			addCriterion("ARTICLE_VERSION <=", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionLike(String value) {
+			addCriterion("ARTICLE_VERSION like", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionNotLike(String value) {
+			addCriterion("ARTICLE_VERSION not like", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionIn(List<String> values) {
+			addCriterion("ARTICLE_VERSION in", values, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionNotIn(List<String> values) {
+			addCriterion("ARTICLE_VERSION not in", values, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionBetween(String value1, String value2) {
+			addCriterion("ARTICLE_VERSION between", value1, value2, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionNotBetween(String value1, String value2) {
+			addCriterion("ARTICLE_VERSION not between", value1, value2, "articleVersion");
+			return (Criteria) this;
+		}
+
+        public Criteria andSpecialIsNull() {
+            addCriterion("SPECIAL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIsNotNull() {
+            addCriterion("SPECIAL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialEqualTo(String value) {
+            addCriterion("SPECIAL =", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotEqualTo(String value) {
+            addCriterion("SPECIAL <>", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialGreaterThan(String value) {
+            addCriterion("SPECIAL >", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialGreaterThanOrEqualTo(String value) {
+            addCriterion("SPECIAL >=", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLessThan(String value) {
+            addCriterion("SPECIAL <", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLessThanOrEqualTo(String value) {
+            addCriterion("SPECIAL <=", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLike(String value) {
+            addCriterion("SPECIAL like", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotLike(String value) {
+            addCriterion("SPECIAL not like", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIn(List<String> values) {
+            addCriterion("SPECIAL in", values, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotIn(List<String> values) {
+            addCriterion("SPECIAL not in", values, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialBetween(String value1, String value2) {
+            addCriterion("SPECIAL between", value1, value2, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotBetween(String value1, String value2) {
+            addCriterion("SPECIAL not between", value1, value2, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIsNull() {
+            addCriterion("CHANNEL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIsNotNull() {
+            addCriterion("CHANNEL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelEqualTo(String value) {
+            addCriterion("CHANNEL =", value, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNotEqualTo(String value) {
+            addCriterion("CHANNEL <>", value, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelGreaterThan(String value) {
+            addCriterion("CHANNEL >", value, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelGreaterThanOrEqualTo(String value) {
+            addCriterion("CHANNEL >=", value, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLessThan(String value) {
+            addCriterion("CHANNEL <", value, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLessThanOrEqualTo(String value) {
+            addCriterion("CHANNEL <=", value, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelLike(String value) {
+            addCriterion("CHANNEL like", value, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNotLike(String value) {
+            addCriterion("CHANNEL not like", value, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIn(List<String> values) {
+            addCriterion("CHANNEL in", values, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNotIn(List<String> values) {
+            addCriterion("CHANNEL not in", values, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelBetween(String value1, String value2) {
+            addCriterion("CHANNEL between", value1, value2, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNotBetween(String value1, String value2) {
+            addCriterion("CHANNEL not between", value1, value2, "channel");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateIsNull() {
+            addCriterion("ARTICLE_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateIsNotNull() {
+            addCriterion("ARTICLE_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateEqualTo(String value) {
+            addCriterion("ARTICLE_STATE =", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateNotEqualTo(String value) {
+            addCriterion("ARTICLE_STATE <>", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateGreaterThan(String value) {
+            addCriterion("ARTICLE_STATE >", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateGreaterThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_STATE >=", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateLessThan(String value) {
+            addCriterion("ARTICLE_STATE <", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateLessThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_STATE <=", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateLike(String value) {
+            addCriterion("ARTICLE_STATE like", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateNotLike(String value) {
+            addCriterion("ARTICLE_STATE not like", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateIn(List<String> values) {
+            addCriterion("ARTICLE_STATE in", values, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateNotIn(List<String> values) {
+            addCriterion("ARTICLE_STATE not in", values, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateBetween(String value1, String value2) {
+            addCriterion("ARTICLE_STATE between", value1, value2, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateNotBetween(String value1, String value2) {
+            addCriterion("ARTICLE_STATE not between", value1, value2, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateIsNull() {
+            addCriterion("PUBLISH_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateIsNotNull() {
+            addCriterion("PUBLISH_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateEqualTo(String value) {
+            addCriterion("PUBLISH_DATE =", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotEqualTo(String value) {
+            addCriterion("PUBLISH_DATE <>", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateGreaterThan(String value) {
+            addCriterion("PUBLISH_DATE >", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_DATE >=", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateLessThan(String value) {
+            addCriterion("PUBLISH_DATE <", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_DATE <=", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateLike(String value) {
+            addCriterion("PUBLISH_DATE like", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotLike(String value) {
+            addCriterion("PUBLISH_DATE not like", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateIn(List<String> values) {
+            addCriterion("PUBLISH_DATE in", values, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotIn(List<String> values) {
+            addCriterion("PUBLISH_DATE not in", values, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateBetween(String value1, String value2) {
+            addCriterion("PUBLISH_DATE between", value1, value2, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_DATE not between", value1, value2, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIsNull() {
+            addCriterion("PUBLISH_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIsNotNull() {
+            addCriterion("PUBLISH_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeEqualTo(String value) {
+            addCriterion("PUBLISH_TIME =", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeNotEqualTo(String value) {
+            addCriterion("PUBLISH_TIME <>", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeGreaterThan(String value) {
+            addCriterion("PUBLISH_TIME >", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_TIME >=", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeLessThan(String value) {
+            addCriterion("PUBLISH_TIME <", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_TIME <=", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeLike(String value) {
+            addCriterion("PUBLISH_TIME like", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeNotLike(String value) {
+            addCriterion("PUBLISH_TIME not like", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIn(List<String> values) {
+            addCriterion("PUBLISH_TIME in", values, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeNotIn(List<String> values) {
+            addCriterion("PUBLISH_TIME not in", values, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeBetween(String value1, String value2) {
+            addCriterion("PUBLISH_TIME between", value1, value2, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_TIME not between", value1, value2, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNull() {
+            addCriterion("BRANCH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNotNull() {
+            addCriterion("BRANCH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdEqualTo(String value) {
+            addCriterion("BRANCH_ID =", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotEqualTo(String value) {
+            addCriterion("BRANCH_ID <>", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThan(String value) {
+            addCriterion("BRANCH_ID >", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID >=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThan(String value) {
+            addCriterion("BRANCH_ID <", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID <=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLike(String value) {
+            addCriterion("BRANCH_ID like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotLike(String value) {
+            addCriterion("BRANCH_ID not like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIn(List<String> values) {
+            addCriterion("BRANCH_ID in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotIn(List<String> values) {
+            addCriterion("BRANCH_ID not in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID not between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIsNull() {
+            addCriterion("PUBLISH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIsNotNull() {
+            addCriterion("PUBLISH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdEqualTo(String value) {
+            addCriterion("PUBLISH_ID =", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotEqualTo(String value) {
+            addCriterion("PUBLISH_ID <>", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdGreaterThan(String value) {
+            addCriterion("PUBLISH_ID >", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_ID >=", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLessThan(String value) {
+            addCriterion("PUBLISH_ID <", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_ID <=", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLike(String value) {
+            addCriterion("PUBLISH_ID like", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotLike(String value) {
+            addCriterion("PUBLISH_ID not like", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIn(List<String> values) {
+            addCriterion("PUBLISH_ID in", values, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotIn(List<String> values) {
+            addCriterion("PUBLISH_ID not in", values, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdBetween(String value1, String value2) {
+            addCriterion("PUBLISH_ID between", value1, value2, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_ID not between", value1, value2, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIsNull() {
+            addCriterion("ORDER_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIsNotNull() {
+            addCriterion("ORDER_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoEqualTo(Integer value) {
+            addCriterion("ORDER_NO =", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotEqualTo(Integer value) {
+            addCriterion("ORDER_NO <>", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoGreaterThan(Integer value) {
+            addCriterion("ORDER_NO >", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ORDER_NO >=", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLessThan(Integer value) {
+            addCriterion("ORDER_NO <", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoLessThanOrEqualTo(Integer value) {
+            addCriterion("ORDER_NO <=", value, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoIn(List<Integer> values) {
+            addCriterion("ORDER_NO in", values, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotIn(List<Integer> values) {
+            addCriterion("ORDER_NO not in", values, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoBetween(Integer value1, Integer value2) {
+            addCriterion("ORDER_NO between", value1, value2, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andOrderNoNotBetween(Integer value1, Integer value2) {
+            addCriterion("ORDER_NO not between", value1, value2, "orderNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeIsNull() {
+            addCriterion("TOP_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeIsNotNull() {
+            addCriterion("TOP_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeEqualTo(String value) {
+            addCriterion("TOP_TIME =", value, "topTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeNotEqualTo(String value) {
+            addCriterion("TOP_TIME <>", value, "topTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeGreaterThan(String value) {
+            addCriterion("TOP_TIME >", value, "topTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("TOP_TIME >=", value, "topTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeLessThan(String value) {
+            addCriterion("TOP_TIME <", value, "topTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeLessThanOrEqualTo(String value) {
+            addCriterion("TOP_TIME <=", value, "topTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeLike(String value) {
+            addCriterion("TOP_TIME like", value, "topTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeNotLike(String value) {
+            addCriterion("TOP_TIME not like", value, "topTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeIn(List<String> values) {
+            addCriterion("TOP_TIME in", values, "topTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeNotIn(List<String> values) {
+            addCriterion("TOP_TIME not in", values, "topTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeBetween(String value1, String value2) {
+            addCriterion("TOP_TIME between", value1, value2, "topTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTopTimeNotBetween(String value1, String value2) {
+            addCriterion("TOP_TIME not between", value1, value2, "topTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_channel
+     *
+     * @mbggenerated do_not_delete_during_merge Wed Mar 06 16:10:09 CST 2019
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleDTO.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleDTO.java
new file mode 100644
index 000000000..a0d97631a
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleDTO.java
@@ -0,0 +1,55 @@
+package com.ruoyi.content.domain;
+
+import java.io.Serializable;
+
+public class ArticleDTO implements Serializable{
+
+	private static final long serialVersionUID = -4566641360099978631L;
+
+	private String publishId;		//文章发布id
+	private String articleId;		//文章id
+	private String articleName;		//文章名称
+	private String listPicUrl;		//文章列表显示图片
+	private String createDate;		//文章发布日期
+	private String visitors;		//文章浏览人数
+	
+	public String getPublishId() {
+		return publishId;
+	}
+	public void setPublishId(String publishId) {
+		this.publishId = publishId;
+	}
+	public String getArticleId() {
+		return articleId;
+	}
+	public void setArticleId(String articleId) {
+		this.articleId = articleId;
+	}
+	public String getArticleName() {
+		return articleName;
+	}
+	public void setArticleName(String articleName) {
+		this.articleName = articleName;
+	}
+	public String getListPicUrl() {
+		return listPicUrl;
+	}
+	public void setListPicUrl(String listPicUrl) {
+		this.listPicUrl = listPicUrl;
+	}
+	public String getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+	public String getVisitors() {
+		return visitors;
+	}
+	public void setVisitors(String visitors) {
+		this.visitors = visitors;
+	}
+	
+	
+	
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrack.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrack.java
new file mode 100644
index 000000000..78cba3939
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrack.java
@@ -0,0 +1,387 @@
+package com.ruoyi.content.domain;
+
+public class ArticleForwardTrack extends ArticleForwardTrackKey {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.FORWARD_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private Integer forwardId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.COMPANY_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.CLICK_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String clickId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.PUBLISH_USER_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String publishUserId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.VERSION_NUMBER
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String versionNumber;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.SHARE_STATE
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String shareState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.CREATE_DATE
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.CREATE_TIME
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.CREATE_USER
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.UPDATE_USER
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.UPDATE_DATE
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.UPDATE_TIME
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.FORWARD_ID
+     *
+     * @return the value of article_forward_track.FORWARD_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public Integer getForwardId() {
+        return forwardId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.FORWARD_ID
+     *
+     * @param forwardId the value for article_forward_track.FORWARD_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setForwardId(Integer forwardId) {
+        this.forwardId = forwardId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.COMPANY_ID
+     *
+     * @return the value of article_forward_track.COMPANY_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.COMPANY_ID
+     *
+     * @param companyId the value for article_forward_track.COMPANY_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.CLICK_ID
+     *
+     * @return the value of article_forward_track.CLICK_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getClickId() {
+        return clickId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.CLICK_ID
+     *
+     * @param clickId the value for article_forward_track.CLICK_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setClickId(String clickId) {
+        this.clickId = clickId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.PUBLISH_USER_ID
+     *
+     * @return the value of article_forward_track.PUBLISH_USER_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getPublishUserId() {
+        return publishUserId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.PUBLISH_USER_ID
+     *
+     * @param publishUserId the value for article_forward_track.PUBLISH_USER_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setPublishUserId(String publishUserId) {
+        this.publishUserId = publishUserId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.VERSION_NUMBER
+     *
+     * @return the value of article_forward_track.VERSION_NUMBER
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getVersionNumber() {
+        return versionNumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.VERSION_NUMBER
+     *
+     * @param versionNumber the value for article_forward_track.VERSION_NUMBER
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setVersionNumber(String versionNumber) {
+        this.versionNumber = versionNumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.SHARE_STATE
+     *
+     * @return the value of article_forward_track.SHARE_STATE
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getShareState() {
+        return shareState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.SHARE_STATE
+     *
+     * @param shareState the value for article_forward_track.SHARE_STATE
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setShareState(String shareState) {
+        this.shareState = shareState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.CREATE_DATE
+     *
+     * @return the value of article_forward_track.CREATE_DATE
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.CREATE_DATE
+     *
+     * @param createDate the value for article_forward_track.CREATE_DATE
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.CREATE_TIME
+     *
+     * @return the value of article_forward_track.CREATE_TIME
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.CREATE_TIME
+     *
+     * @param createTime the value for article_forward_track.CREATE_TIME
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.CREATE_USER
+     *
+     * @return the value of article_forward_track.CREATE_USER
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.CREATE_USER
+     *
+     * @param createUser the value for article_forward_track.CREATE_USER
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.UPDATE_USER
+     *
+     * @return the value of article_forward_track.UPDATE_USER
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.UPDATE_USER
+     *
+     * @param updateUser the value for article_forward_track.UPDATE_USER
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.UPDATE_DATE
+     *
+     * @return the value of article_forward_track.UPDATE_DATE
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.UPDATE_DATE
+     *
+     * @param updateDate the value for article_forward_track.UPDATE_DATE
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.UPDATE_TIME
+     *
+     * @return the value of article_forward_track.UPDATE_TIME
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.UPDATE_TIME
+     *
+     * @param updateTime the value for article_forward_track.UPDATE_TIME
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrackExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrackExample.java
new file mode 100644
index 000000000..eaa242e5d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrackExample.java
@@ -0,0 +1,1342 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArticleForwardTrackExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public ArticleForwardTrackExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andArticleIdIsNull() {
+            addCriterion("ARTICLE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNotNull() {
+            addCriterion("ARTICLE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdEqualTo(String value) {
+            addCriterion("ARTICLE_ID =", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotEqualTo(String value) {
+            addCriterion("ARTICLE_ID <>", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThan(String value) {
+            addCriterion("ARTICLE_ID >", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_ID >=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThan(String value) {
+            addCriterion("ARTICLE_ID <", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_ID <=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLike(String value) {
+            addCriterion("ARTICLE_ID like", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotLike(String value) {
+            addCriterion("ARTICLE_ID not like", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIn(List<String> values) {
+            addCriterion("ARTICLE_ID in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotIn(List<String> values) {
+            addCriterion("ARTICLE_ID not in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdBetween(String value1, String value2) {
+            addCriterion("ARTICLE_ID between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotBetween(String value1, String value2) {
+            addCriterion("ARTICLE_ID not between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampIsNull() {
+            addCriterion("FORWARD_TIMESTAMP is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampIsNotNull() {
+            addCriterion("FORWARD_TIMESTAMP is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampEqualTo(String value) {
+            addCriterion("FORWARD_TIMESTAMP =", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampNotEqualTo(String value) {
+            addCriterion("FORWARD_TIMESTAMP <>", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampGreaterThan(String value) {
+            addCriterion("FORWARD_TIMESTAMP >", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampGreaterThanOrEqualTo(String value) {
+            addCriterion("FORWARD_TIMESTAMP >=", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampLessThan(String value) {
+            addCriterion("FORWARD_TIMESTAMP <", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampLessThanOrEqualTo(String value) {
+            addCriterion("FORWARD_TIMESTAMP <=", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampLike(String value) {
+            addCriterion("FORWARD_TIMESTAMP like", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampNotLike(String value) {
+            addCriterion("FORWARD_TIMESTAMP not like", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampIn(List<String> values) {
+            addCriterion("FORWARD_TIMESTAMP in", values, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampNotIn(List<String> values) {
+            addCriterion("FORWARD_TIMESTAMP not in", values, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampBetween(String value1, String value2) {
+            addCriterion("FORWARD_TIMESTAMP between", value1, value2, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampNotBetween(String value1, String value2) {
+            addCriterion("FORWARD_TIMESTAMP not between", value1, value2, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("USER_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("USER_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("USER_ID =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("USER_ID <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("USER_ID >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("USER_ID >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("USER_ID <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("USER_ID <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLike(String value) {
+            addCriterion("USER_ID like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("USER_ID not like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("USER_ID in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("USER_ID not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("USER_ID between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("USER_ID not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdIsNull() {
+            addCriterion("FORWARD_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdIsNotNull() {
+            addCriterion("FORWARD_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdEqualTo(Integer value) {
+            addCriterion("FORWARD_ID =", value, "forwardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdNotEqualTo(Integer value) {
+            addCriterion("FORWARD_ID <>", value, "forwardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdGreaterThan(Integer value) {
+            addCriterion("FORWARD_ID >", value, "forwardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("FORWARD_ID >=", value, "forwardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdLessThan(Integer value) {
+            addCriterion("FORWARD_ID <", value, "forwardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdLessThanOrEqualTo(Integer value) {
+            addCriterion("FORWARD_ID <=", value, "forwardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdIn(List<Integer> values) {
+            addCriterion("FORWARD_ID in", values, "forwardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdNotIn(List<Integer> values) {
+            addCriterion("FORWARD_ID not in", values, "forwardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdBetween(Integer value1, Integer value2) {
+            addCriterion("FORWARD_ID between", value1, value2, "forwardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("FORWARD_ID not between", value1, value2, "forwardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdIsNull() {
+            addCriterion("CLICK_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdIsNotNull() {
+            addCriterion("CLICK_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdEqualTo(String value) {
+            addCriterion("CLICK_ID =", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdNotEqualTo(String value) {
+            addCriterion("CLICK_ID <>", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdGreaterThan(String value) {
+            addCriterion("CLICK_ID >", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdGreaterThanOrEqualTo(String value) {
+            addCriterion("CLICK_ID >=", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdLessThan(String value) {
+            addCriterion("CLICK_ID <", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdLessThanOrEqualTo(String value) {
+            addCriterion("CLICK_ID <=", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdLike(String value) {
+            addCriterion("CLICK_ID like", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdNotLike(String value) {
+            addCriterion("CLICK_ID not like", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdIn(List<String> values) {
+            addCriterion("CLICK_ID in", values, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdNotIn(List<String> values) {
+            addCriterion("CLICK_ID not in", values, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdBetween(String value1, String value2) {
+            addCriterion("CLICK_ID between", value1, value2, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdNotBetween(String value1, String value2) {
+            addCriterion("CLICK_ID not between", value1, value2, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdIsNull() {
+            addCriterion("PUBLISH_USER_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdIsNotNull() {
+            addCriterion("PUBLISH_USER_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdEqualTo(String value) {
+            addCriterion("PUBLISH_USER_ID =", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdNotEqualTo(String value) {
+            addCriterion("PUBLISH_USER_ID <>", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdGreaterThan(String value) {
+            addCriterion("PUBLISH_USER_ID >", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_USER_ID >=", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdLessThan(String value) {
+            addCriterion("PUBLISH_USER_ID <", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_USER_ID <=", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdLike(String value) {
+            addCriterion("PUBLISH_USER_ID like", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdNotLike(String value) {
+            addCriterion("PUBLISH_USER_ID not like", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdIn(List<String> values) {
+            addCriterion("PUBLISH_USER_ID in", values, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdNotIn(List<String> values) {
+            addCriterion("PUBLISH_USER_ID not in", values, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdBetween(String value1, String value2) {
+            addCriterion("PUBLISH_USER_ID between", value1, value2, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_USER_ID not between", value1, value2, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberIsNull() {
+            addCriterion("VERSION_NUMBER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberIsNotNull() {
+            addCriterion("VERSION_NUMBER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberEqualTo(String value) {
+            addCriterion("VERSION_NUMBER =", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberNotEqualTo(String value) {
+            addCriterion("VERSION_NUMBER <>", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberGreaterThan(String value) {
+            addCriterion("VERSION_NUMBER >", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("VERSION_NUMBER >=", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberLessThan(String value) {
+            addCriterion("VERSION_NUMBER <", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberLessThanOrEqualTo(String value) {
+            addCriterion("VERSION_NUMBER <=", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberLike(String value) {
+            addCriterion("VERSION_NUMBER like", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberNotLike(String value) {
+            addCriterion("VERSION_NUMBER not like", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberIn(List<String> values) {
+            addCriterion("VERSION_NUMBER in", values, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberNotIn(List<String> values) {
+            addCriterion("VERSION_NUMBER not in", values, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberBetween(String value1, String value2) {
+            addCriterion("VERSION_NUMBER between", value1, value2, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberNotBetween(String value1, String value2) {
+            addCriterion("VERSION_NUMBER not between", value1, value2, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateIsNull() {
+            addCriterion("SHARE_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateIsNotNull() {
+            addCriterion("SHARE_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateEqualTo(String value) {
+            addCriterion("SHARE_STATE =", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateNotEqualTo(String value) {
+            addCriterion("SHARE_STATE <>", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateGreaterThan(String value) {
+            addCriterion("SHARE_STATE >", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateGreaterThanOrEqualTo(String value) {
+            addCriterion("SHARE_STATE >=", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateLessThan(String value) {
+            addCriterion("SHARE_STATE <", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateLessThanOrEqualTo(String value) {
+            addCriterion("SHARE_STATE <=", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateLike(String value) {
+            addCriterion("SHARE_STATE like", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateNotLike(String value) {
+            addCriterion("SHARE_STATE not like", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateIn(List<String> values) {
+            addCriterion("SHARE_STATE in", values, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateNotIn(List<String> values) {
+            addCriterion("SHARE_STATE not in", values, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateBetween(String value1, String value2) {
+            addCriterion("SHARE_STATE between", value1, value2, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateNotBetween(String value1, String value2) {
+            addCriterion("SHARE_STATE not between", value1, value2, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_forward_track
+     *
+     * @mbggenerated do_not_delete_during_merge Fri Jul 06 14:53:46 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrackKey.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrackKey.java
new file mode 100644
index 000000000..e4ffd84a9
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleForwardTrackKey.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.domain;
+
+public class ArticleForwardTrackKey {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.ARTICLE_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String articleId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.FORWARD_TIMESTAMP
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String forwardTimestamp;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_forward_track.USER_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    private String userId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.ARTICLE_ID
+     *
+     * @return the value of article_forward_track.ARTICLE_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getArticleId() {
+        return articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.ARTICLE_ID
+     *
+     * @param articleId the value for article_forward_track.ARTICLE_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setArticleId(String articleId) {
+        this.articleId = articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.FORWARD_TIMESTAMP
+     *
+     * @return the value of article_forward_track.FORWARD_TIMESTAMP
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getForwardTimestamp() {
+        return forwardTimestamp;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.FORWARD_TIMESTAMP
+     *
+     * @param forwardTimestamp the value for article_forward_track.FORWARD_TIMESTAMP
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setForwardTimestamp(String forwardTimestamp) {
+        this.forwardTimestamp = forwardTimestamp;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_forward_track.USER_ID
+     *
+     * @return the value of article_forward_track.USER_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public String getUserId() {
+        return userId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_forward_track.USER_ID
+     *
+     * @param userId the value for article_forward_track.USER_ID
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleInfo.java
new file mode 100644
index 000000000..fe022ca00
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleInfo.java
@@ -0,0 +1,739 @@
+package com.ruoyi.content.domain;
+
+public class ArticleInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.ARTICLE_ID
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private Integer articleId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.ARTICLE_NAME
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String articleName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.PUSH_DATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String pushDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.ARTICLE_AUTHOR
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String articleAuthor;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.ARTICLE_EDIT_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String articleEditUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.ARTICLE_VIEW_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String articleViewUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.LIST_PIC_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String listPicUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.SPECIAL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String special;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.CHANNEL_ID
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String channelId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.COMPANY_ID
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.ORIGINAL_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String originalUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.SHARE_IMG_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String shareImgUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.SHARE_TITLE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String shareTitle;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.ARTICLE_STATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String articleState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.SHARE_DES
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String shareDes;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.CREATE_DATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.CREATE_TIME
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.CREATE_USER
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.UPDATE_DATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.UPDATE_TIME
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.MODIFIED_EDIT_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String modifiedEditUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.MODIFIED_VIEW_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String modifiedViewUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_info.ARTICLE_CONTENT
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    private String articleContent;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.ARTICLE_ID
+     *
+     * @return the value of article_info.ARTICLE_ID
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public Integer getArticleId() {
+        return articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.ARTICLE_ID
+     *
+     * @param articleId the value for article_info.ARTICLE_ID
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setArticleId(Integer articleId) {
+        this.articleId = articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.ARTICLE_NAME
+     *
+     * @return the value of article_info.ARTICLE_NAME
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getArticleName() {
+        return articleName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.ARTICLE_NAME
+     *
+     * @param articleName the value for article_info.ARTICLE_NAME
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setArticleName(String articleName) {
+        this.articleName = articleName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.PUSH_DATE
+     *
+     * @return the value of article_info.PUSH_DATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getPushDate() {
+        return pushDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.PUSH_DATE
+     *
+     * @param pushDate the value for article_info.PUSH_DATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setPushDate(String pushDate) {
+        this.pushDate = pushDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.ARTICLE_AUTHOR
+     *
+     * @return the value of article_info.ARTICLE_AUTHOR
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getArticleAuthor() {
+        return articleAuthor;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.ARTICLE_AUTHOR
+     *
+     * @param articleAuthor the value for article_info.ARTICLE_AUTHOR
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setArticleAuthor(String articleAuthor) {
+        this.articleAuthor = articleAuthor;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.ARTICLE_EDIT_URL
+     *
+     * @return the value of article_info.ARTICLE_EDIT_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getArticleEditUrl() {
+        return articleEditUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.ARTICLE_EDIT_URL
+     *
+     * @param articleEditUrl the value for article_info.ARTICLE_EDIT_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setArticleEditUrl(String articleEditUrl) {
+        this.articleEditUrl = articleEditUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.ARTICLE_VIEW_URL
+     *
+     * @return the value of article_info.ARTICLE_VIEW_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getArticleViewUrl() {
+        return articleViewUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.ARTICLE_VIEW_URL
+     *
+     * @param articleViewUrl the value for article_info.ARTICLE_VIEW_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setArticleViewUrl(String articleViewUrl) {
+        this.articleViewUrl = articleViewUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.LIST_PIC_URL
+     *
+     * @return the value of article_info.LIST_PIC_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getListPicUrl() {
+        return listPicUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.LIST_PIC_URL
+     *
+     * @param listPicUrl the value for article_info.LIST_PIC_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setListPicUrl(String listPicUrl) {
+        this.listPicUrl = listPicUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.SPECIAL
+     *
+     * @return the value of article_info.SPECIAL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getSpecial() {
+        return special;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.SPECIAL
+     *
+     * @param special the value for article_info.SPECIAL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setSpecial(String special) {
+        this.special = special;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.CHANNEL_ID
+     *
+     * @return the value of article_info.CHANNEL_ID
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getChannelId() {
+        return channelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.CHANNEL_ID
+     *
+     * @param channelId the value for article_info.CHANNEL_ID
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setChannelId(String channelId) {
+        this.channelId = channelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.COMPANY_ID
+     *
+     * @return the value of article_info.COMPANY_ID
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.COMPANY_ID
+     *
+     * @param companyId the value for article_info.COMPANY_ID
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.ORIGINAL_URL
+     *
+     * @return the value of article_info.ORIGINAL_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getOriginalUrl() {
+        return originalUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.ORIGINAL_URL
+     *
+     * @param originalUrl the value for article_info.ORIGINAL_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setOriginalUrl(String originalUrl) {
+        this.originalUrl = originalUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.SHARE_IMG_URL
+     *
+     * @return the value of article_info.SHARE_IMG_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getShareImgUrl() {
+        return shareImgUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.SHARE_IMG_URL
+     *
+     * @param shareImgUrl the value for article_info.SHARE_IMG_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setShareImgUrl(String shareImgUrl) {
+        this.shareImgUrl = shareImgUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.SHARE_TITLE
+     *
+     * @return the value of article_info.SHARE_TITLE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getShareTitle() {
+        return shareTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.SHARE_TITLE
+     *
+     * @param shareTitle the value for article_info.SHARE_TITLE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setShareTitle(String shareTitle) {
+        this.shareTitle = shareTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.ARTICLE_STATE
+     *
+     * @return the value of article_info.ARTICLE_STATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getArticleState() {
+        return articleState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.ARTICLE_STATE
+     *
+     * @param articleState the value for article_info.ARTICLE_STATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setArticleState(String articleState) {
+        this.articleState = articleState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.SHARE_DES
+     *
+     * @return the value of article_info.SHARE_DES
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getShareDes() {
+        return shareDes;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.SHARE_DES
+     *
+     * @param shareDes the value for article_info.SHARE_DES
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setShareDes(String shareDes) {
+        this.shareDes = shareDes;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.CREATE_DATE
+     *
+     * @return the value of article_info.CREATE_DATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.CREATE_DATE
+     *
+     * @param createDate the value for article_info.CREATE_DATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.CREATE_TIME
+     *
+     * @return the value of article_info.CREATE_TIME
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.CREATE_TIME
+     *
+     * @param createTime the value for article_info.CREATE_TIME
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.CREATE_USER
+     *
+     * @return the value of article_info.CREATE_USER
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.CREATE_USER
+     *
+     * @param createUser the value for article_info.CREATE_USER
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.UPDATE_DATE
+     *
+     * @return the value of article_info.UPDATE_DATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.UPDATE_DATE
+     *
+     * @param updateDate the value for article_info.UPDATE_DATE
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.UPDATE_TIME
+     *
+     * @return the value of article_info.UPDATE_TIME
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.UPDATE_TIME
+     *
+     * @param updateTime the value for article_info.UPDATE_TIME
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.MODIFIED_EDIT_URL
+     *
+     * @return the value of article_info.MODIFIED_EDIT_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getModifiedEditUrl() {
+        return modifiedEditUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.MODIFIED_EDIT_URL
+     *
+     * @param modifiedEditUrl the value for article_info.MODIFIED_EDIT_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setModifiedEditUrl(String modifiedEditUrl) {
+        this.modifiedEditUrl = modifiedEditUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.MODIFIED_VIEW_URL
+     *
+     * @return the value of article_info.MODIFIED_VIEW_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getModifiedViewUrl() {
+        return modifiedViewUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.MODIFIED_VIEW_URL
+     *
+     * @param modifiedViewUrl the value for article_info.MODIFIED_VIEW_URL
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setModifiedViewUrl(String modifiedViewUrl) {
+        this.modifiedViewUrl = modifiedViewUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_info.ARTICLE_CONTENT
+     *
+     * @return the value of article_info.ARTICLE_CONTENT
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getArticleContent() {
+        return articleContent;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_info.ARTICLE_CONTENT
+     *
+     * @param articleContent the value for article_info.ARTICLE_CONTENT
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setArticleContent(String articleContent) {
+        this.articleContent = articleContent;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleInfoExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleInfoExample.java
new file mode 100644
index 000000000..a63c01fd1
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleInfoExample.java
@@ -0,0 +1,1832 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArticleInfoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public ArticleInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andArticleIdIsNull() {
+            addCriterion("ARTICLE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNotNull() {
+            addCriterion("ARTICLE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID =", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID <>", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThan(Integer value) {
+            addCriterion("ARTICLE_ID >", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID >=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThan(Integer value) {
+            addCriterion("ARTICLE_ID <", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID <=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIn(List<Integer> values) {
+            addCriterion("ARTICLE_ID in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotIn(List<Integer> values) {
+            addCriterion("ARTICLE_ID not in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdBetween(Integer value1, Integer value2) {
+            addCriterion("ARTICLE_ID between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ARTICLE_ID not between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameIsNull() {
+            addCriterion("ARTICLE_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameIsNotNull() {
+            addCriterion("ARTICLE_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameEqualTo(String value) {
+            addCriterion("ARTICLE_NAME =", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameNotEqualTo(String value) {
+            addCriterion("ARTICLE_NAME <>", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameGreaterThan(String value) {
+            addCriterion("ARTICLE_NAME >", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameGreaterThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_NAME >=", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameLessThan(String value) {
+            addCriterion("ARTICLE_NAME <", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameLessThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_NAME <=", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameLike(String value) {
+            addCriterion("ARTICLE_NAME like", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameNotLike(String value) {
+            addCriterion("ARTICLE_NAME not like", value, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameIn(List<String> values) {
+            addCriterion("ARTICLE_NAME in", values, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameNotIn(List<String> values) {
+            addCriterion("ARTICLE_NAME not in", values, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameBetween(String value1, String value2) {
+            addCriterion("ARTICLE_NAME between", value1, value2, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleNameNotBetween(String value1, String value2) {
+            addCriterion("ARTICLE_NAME not between", value1, value2, "articleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateIsNull() {
+            addCriterion("PUSH_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateIsNotNull() {
+            addCriterion("PUSH_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateEqualTo(String value) {
+            addCriterion("PUSH_DATE =", value, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateNotEqualTo(String value) {
+            addCriterion("PUSH_DATE <>", value, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateGreaterThan(String value) {
+            addCriterion("PUSH_DATE >", value, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateGreaterThanOrEqualTo(String value) {
+            addCriterion("PUSH_DATE >=", value, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateLessThan(String value) {
+            addCriterion("PUSH_DATE <", value, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateLessThanOrEqualTo(String value) {
+            addCriterion("PUSH_DATE <=", value, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateLike(String value) {
+            addCriterion("PUSH_DATE like", value, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateNotLike(String value) {
+            addCriterion("PUSH_DATE not like", value, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateIn(List<String> values) {
+            addCriterion("PUSH_DATE in", values, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateNotIn(List<String> values) {
+            addCriterion("PUSH_DATE not in", values, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateBetween(String value1, String value2) {
+            addCriterion("PUSH_DATE between", value1, value2, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPushDateNotBetween(String value1, String value2) {
+            addCriterion("PUSH_DATE not between", value1, value2, "pushDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorIsNull() {
+            addCriterion("ARTICLE_AUTHOR is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorIsNotNull() {
+            addCriterion("ARTICLE_AUTHOR is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorEqualTo(String value) {
+            addCriterion("ARTICLE_AUTHOR =", value, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorNotEqualTo(String value) {
+            addCriterion("ARTICLE_AUTHOR <>", value, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorGreaterThan(String value) {
+            addCriterion("ARTICLE_AUTHOR >", value, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorGreaterThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_AUTHOR >=", value, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorLessThan(String value) {
+            addCriterion("ARTICLE_AUTHOR <", value, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorLessThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_AUTHOR <=", value, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorLike(String value) {
+            addCriterion("ARTICLE_AUTHOR like", value, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorNotLike(String value) {
+            addCriterion("ARTICLE_AUTHOR not like", value, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorIn(List<String> values) {
+            addCriterion("ARTICLE_AUTHOR in", values, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorNotIn(List<String> values) {
+            addCriterion("ARTICLE_AUTHOR not in", values, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorBetween(String value1, String value2) {
+            addCriterion("ARTICLE_AUTHOR between", value1, value2, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleAuthorNotBetween(String value1, String value2) {
+            addCriterion("ARTICLE_AUTHOR not between", value1, value2, "articleAuthor");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlIsNull() {
+            addCriterion("ARTICLE_EDIT_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlIsNotNull() {
+            addCriterion("ARTICLE_EDIT_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlEqualTo(String value) {
+            addCriterion("ARTICLE_EDIT_URL =", value, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlNotEqualTo(String value) {
+            addCriterion("ARTICLE_EDIT_URL <>", value, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlGreaterThan(String value) {
+            addCriterion("ARTICLE_EDIT_URL >", value, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_EDIT_URL >=", value, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlLessThan(String value) {
+            addCriterion("ARTICLE_EDIT_URL <", value, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlLessThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_EDIT_URL <=", value, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlLike(String value) {
+            addCriterion("ARTICLE_EDIT_URL like", value, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlNotLike(String value) {
+            addCriterion("ARTICLE_EDIT_URL not like", value, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlIn(List<String> values) {
+            addCriterion("ARTICLE_EDIT_URL in", values, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlNotIn(List<String> values) {
+            addCriterion("ARTICLE_EDIT_URL not in", values, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlBetween(String value1, String value2) {
+            addCriterion("ARTICLE_EDIT_URL between", value1, value2, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleEditUrlNotBetween(String value1, String value2) {
+            addCriterion("ARTICLE_EDIT_URL not between", value1, value2, "articleEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlIsNull() {
+            addCriterion("ARTICLE_VIEW_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlIsNotNull() {
+            addCriterion("ARTICLE_VIEW_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlEqualTo(String value) {
+            addCriterion("ARTICLE_VIEW_URL =", value, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlNotEqualTo(String value) {
+            addCriterion("ARTICLE_VIEW_URL <>", value, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlGreaterThan(String value) {
+            addCriterion("ARTICLE_VIEW_URL >", value, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_VIEW_URL >=", value, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlLessThan(String value) {
+            addCriterion("ARTICLE_VIEW_URL <", value, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlLessThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_VIEW_URL <=", value, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlLike(String value) {
+            addCriterion("ARTICLE_VIEW_URL like", value, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlNotLike(String value) {
+            addCriterion("ARTICLE_VIEW_URL not like", value, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlIn(List<String> values) {
+            addCriterion("ARTICLE_VIEW_URL in", values, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlNotIn(List<String> values) {
+            addCriterion("ARTICLE_VIEW_URL not in", values, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlBetween(String value1, String value2) {
+            addCriterion("ARTICLE_VIEW_URL between", value1, value2, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleViewUrlNotBetween(String value1, String value2) {
+            addCriterion("ARTICLE_VIEW_URL not between", value1, value2, "articleViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlIsNull() {
+            addCriterion("LIST_PIC_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlIsNotNull() {
+            addCriterion("LIST_PIC_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlEqualTo(String value) {
+            addCriterion("LIST_PIC_URL =", value, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlNotEqualTo(String value) {
+            addCriterion("LIST_PIC_URL <>", value, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlGreaterThan(String value) {
+            addCriterion("LIST_PIC_URL >", value, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("LIST_PIC_URL >=", value, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlLessThan(String value) {
+            addCriterion("LIST_PIC_URL <", value, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlLessThanOrEqualTo(String value) {
+            addCriterion("LIST_PIC_URL <=", value, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlLike(String value) {
+            addCriterion("LIST_PIC_URL like", value, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlNotLike(String value) {
+            addCriterion("LIST_PIC_URL not like", value, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlIn(List<String> values) {
+            addCriterion("LIST_PIC_URL in", values, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlNotIn(List<String> values) {
+            addCriterion("LIST_PIC_URL not in", values, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlBetween(String value1, String value2) {
+            addCriterion("LIST_PIC_URL between", value1, value2, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andListPicUrlNotBetween(String value1, String value2) {
+            addCriterion("LIST_PIC_URL not between", value1, value2, "listPicUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIsNull() {
+            addCriterion("SPECIAL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIsNotNull() {
+            addCriterion("SPECIAL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialEqualTo(String value) {
+            addCriterion("SPECIAL =", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotEqualTo(String value) {
+            addCriterion("SPECIAL <>", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialGreaterThan(String value) {
+            addCriterion("SPECIAL >", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialGreaterThanOrEqualTo(String value) {
+            addCriterion("SPECIAL >=", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLessThan(String value) {
+            addCriterion("SPECIAL <", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLessThanOrEqualTo(String value) {
+            addCriterion("SPECIAL <=", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialLike(String value) {
+            addCriterion("SPECIAL like", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotLike(String value) {
+            addCriterion("SPECIAL not like", value, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIn(List<String> values) {
+            addCriterion("SPECIAL in", values, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotIn(List<String> values) {
+            addCriterion("SPECIAL not in", values, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialBetween(String value1, String value2) {
+            addCriterion("SPECIAL between", value1, value2, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialNotBetween(String value1, String value2) {
+            addCriterion("SPECIAL not between", value1, value2, "special");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIsNull() {
+            addCriterion("CHANNEL_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIsNotNull() {
+            addCriterion("CHANNEL_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdEqualTo(String value) {
+            addCriterion("CHANNEL_ID =", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotEqualTo(String value) {
+            addCriterion("CHANNEL_ID <>", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThan(String value) {
+            addCriterion("CHANNEL_ID >", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThanOrEqualTo(String value) {
+            addCriterion("CHANNEL_ID >=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThan(String value) {
+            addCriterion("CHANNEL_ID <", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThanOrEqualTo(String value) {
+            addCriterion("CHANNEL_ID <=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLike(String value) {
+            addCriterion("CHANNEL_ID like", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotLike(String value) {
+            addCriterion("CHANNEL_ID not like", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIn(List<String> values) {
+            addCriterion("CHANNEL_ID in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotIn(List<String> values) {
+            addCriterion("CHANNEL_ID not in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdBetween(String value1, String value2) {
+            addCriterion("CHANNEL_ID between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotBetween(String value1, String value2) {
+            addCriterion("CHANNEL_ID not between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlIsNull() {
+            addCriterion("ORIGINAL_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlIsNotNull() {
+            addCriterion("ORIGINAL_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlEqualTo(String value) {
+            addCriterion("ORIGINAL_URL =", value, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlNotEqualTo(String value) {
+            addCriterion("ORIGINAL_URL <>", value, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlGreaterThan(String value) {
+            addCriterion("ORIGINAL_URL >", value, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("ORIGINAL_URL >=", value, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlLessThan(String value) {
+            addCriterion("ORIGINAL_URL <", value, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlLessThanOrEqualTo(String value) {
+            addCriterion("ORIGINAL_URL <=", value, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlLike(String value) {
+            addCriterion("ORIGINAL_URL like", value, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlNotLike(String value) {
+            addCriterion("ORIGINAL_URL not like", value, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlIn(List<String> values) {
+            addCriterion("ORIGINAL_URL in", values, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlNotIn(List<String> values) {
+            addCriterion("ORIGINAL_URL not in", values, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlBetween(String value1, String value2) {
+            addCriterion("ORIGINAL_URL between", value1, value2, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andOriginalUrlNotBetween(String value1, String value2) {
+            addCriterion("ORIGINAL_URL not between", value1, value2, "originalUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlIsNull() {
+            addCriterion("SHARE_IMG_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlIsNotNull() {
+            addCriterion("SHARE_IMG_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlEqualTo(String value) {
+            addCriterion("SHARE_IMG_URL =", value, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlNotEqualTo(String value) {
+            addCriterion("SHARE_IMG_URL <>", value, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlGreaterThan(String value) {
+            addCriterion("SHARE_IMG_URL >", value, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("SHARE_IMG_URL >=", value, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlLessThan(String value) {
+            addCriterion("SHARE_IMG_URL <", value, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlLessThanOrEqualTo(String value) {
+            addCriterion("SHARE_IMG_URL <=", value, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlLike(String value) {
+            addCriterion("SHARE_IMG_URL like", value, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlNotLike(String value) {
+            addCriterion("SHARE_IMG_URL not like", value, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlIn(List<String> values) {
+            addCriterion("SHARE_IMG_URL in", values, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlNotIn(List<String> values) {
+            addCriterion("SHARE_IMG_URL not in", values, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlBetween(String value1, String value2) {
+            addCriterion("SHARE_IMG_URL between", value1, value2, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareImgUrlNotBetween(String value1, String value2) {
+            addCriterion("SHARE_IMG_URL not between", value1, value2, "shareImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleIsNull() {
+            addCriterion("SHARE_TITLE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleIsNotNull() {
+            addCriterion("SHARE_TITLE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleEqualTo(String value) {
+            addCriterion("SHARE_TITLE =", value, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleNotEqualTo(String value) {
+            addCriterion("SHARE_TITLE <>", value, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleGreaterThan(String value) {
+            addCriterion("SHARE_TITLE >", value, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("SHARE_TITLE >=", value, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleLessThan(String value) {
+            addCriterion("SHARE_TITLE <", value, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleLessThanOrEqualTo(String value) {
+            addCriterion("SHARE_TITLE <=", value, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleLike(String value) {
+            addCriterion("SHARE_TITLE like", value, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleNotLike(String value) {
+            addCriterion("SHARE_TITLE not like", value, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleIn(List<String> values) {
+            addCriterion("SHARE_TITLE in", values, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleNotIn(List<String> values) {
+            addCriterion("SHARE_TITLE not in", values, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleBetween(String value1, String value2) {
+            addCriterion("SHARE_TITLE between", value1, value2, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareTitleNotBetween(String value1, String value2) {
+            addCriterion("SHARE_TITLE not between", value1, value2, "shareTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateIsNull() {
+            addCriterion("ARTICLE_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateIsNotNull() {
+            addCriterion("ARTICLE_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateEqualTo(String value) {
+            addCriterion("ARTICLE_STATE =", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateNotEqualTo(String value) {
+            addCriterion("ARTICLE_STATE <>", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateGreaterThan(String value) {
+            addCriterion("ARTICLE_STATE >", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateGreaterThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_STATE >=", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateLessThan(String value) {
+            addCriterion("ARTICLE_STATE <", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateLessThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_STATE <=", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateLike(String value) {
+            addCriterion("ARTICLE_STATE like", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateNotLike(String value) {
+            addCriterion("ARTICLE_STATE not like", value, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateIn(List<String> values) {
+            addCriterion("ARTICLE_STATE in", values, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateNotIn(List<String> values) {
+            addCriterion("ARTICLE_STATE not in", values, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateBetween(String value1, String value2) {
+            addCriterion("ARTICLE_STATE between", value1, value2, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleStateNotBetween(String value1, String value2) {
+            addCriterion("ARTICLE_STATE not between", value1, value2, "articleState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesIsNull() {
+            addCriterion("SHARE_DES is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesIsNotNull() {
+            addCriterion("SHARE_DES is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesEqualTo(String value) {
+            addCriterion("SHARE_DES =", value, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesNotEqualTo(String value) {
+            addCriterion("SHARE_DES <>", value, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesGreaterThan(String value) {
+            addCriterion("SHARE_DES >", value, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesGreaterThanOrEqualTo(String value) {
+            addCriterion("SHARE_DES >=", value, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesLessThan(String value) {
+            addCriterion("SHARE_DES <", value, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesLessThanOrEqualTo(String value) {
+            addCriterion("SHARE_DES <=", value, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesLike(String value) {
+            addCriterion("SHARE_DES like", value, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesNotLike(String value) {
+            addCriterion("SHARE_DES not like", value, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesIn(List<String> values) {
+            addCriterion("SHARE_DES in", values, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesNotIn(List<String> values) {
+            addCriterion("SHARE_DES not in", values, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesBetween(String value1, String value2) {
+            addCriterion("SHARE_DES between", value1, value2, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareDesNotBetween(String value1, String value2) {
+            addCriterion("SHARE_DES not between", value1, value2, "shareDes");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlIsNull() {
+            addCriterion("MODIFIED_EDIT_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlIsNotNull() {
+            addCriterion("MODIFIED_EDIT_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlEqualTo(String value) {
+            addCriterion("MODIFIED_EDIT_URL =", value, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlNotEqualTo(String value) {
+            addCriterion("MODIFIED_EDIT_URL <>", value, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlGreaterThan(String value) {
+            addCriterion("MODIFIED_EDIT_URL >", value, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("MODIFIED_EDIT_URL >=", value, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlLessThan(String value) {
+            addCriterion("MODIFIED_EDIT_URL <", value, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlLessThanOrEqualTo(String value) {
+            addCriterion("MODIFIED_EDIT_URL <=", value, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlLike(String value) {
+            addCriterion("MODIFIED_EDIT_URL like", value, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlNotLike(String value) {
+            addCriterion("MODIFIED_EDIT_URL not like", value, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlIn(List<String> values) {
+            addCriterion("MODIFIED_EDIT_URL in", values, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlNotIn(List<String> values) {
+            addCriterion("MODIFIED_EDIT_URL not in", values, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlBetween(String value1, String value2) {
+            addCriterion("MODIFIED_EDIT_URL between", value1, value2, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedEditUrlNotBetween(String value1, String value2) {
+            addCriterion("MODIFIED_EDIT_URL not between", value1, value2, "modifiedEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlIsNull() {
+            addCriterion("MODIFIED_VIEW_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlIsNotNull() {
+            addCriterion("MODIFIED_VIEW_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlEqualTo(String value) {
+            addCriterion("MODIFIED_VIEW_URL =", value, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlNotEqualTo(String value) {
+            addCriterion("MODIFIED_VIEW_URL <>", value, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlGreaterThan(String value) {
+            addCriterion("MODIFIED_VIEW_URL >", value, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("MODIFIED_VIEW_URL >=", value, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlLessThan(String value) {
+            addCriterion("MODIFIED_VIEW_URL <", value, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlLessThanOrEqualTo(String value) {
+            addCriterion("MODIFIED_VIEW_URL <=", value, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlLike(String value) {
+            addCriterion("MODIFIED_VIEW_URL like", value, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlNotLike(String value) {
+            addCriterion("MODIFIED_VIEW_URL not like", value, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlIn(List<String> values) {
+            addCriterion("MODIFIED_VIEW_URL in", values, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlNotIn(List<String> values) {
+            addCriterion("MODIFIED_VIEW_URL not in", values, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlBetween(String value1, String value2) {
+            addCriterion("MODIFIED_VIEW_URL between", value1, value2, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andModifiedViewUrlNotBetween(String value1, String value2) {
+            addCriterion("MODIFIED_VIEW_URL not between", value1, value2, "modifiedViewUrl");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_info
+     *
+     * @mbggenerated do_not_delete_during_merge Fri May 25 15:02:37 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabel.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabel.java
new file mode 100644
index 000000000..d265b298d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabel.java
@@ -0,0 +1,323 @@
+package com.ruoyi.content.domain;
+
+public class ArticleLabel {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label.LABEL_ID
+     *
+     * @mbggenerated
+     */
+    private Integer labelId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label.LABEL_NAME
+     *
+     * @mbggenerated
+     */
+    private String labelName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label.COMPANY_NAME
+     *
+     * @mbggenerated
+     */
+    private String companyName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label.CREATE_TIME
+     *
+     * @mbggenerated
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label.CREATE_DATE
+     *
+     * @mbggenerated
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label.UPDATE_TIME
+     *
+     * @mbggenerated
+     */
+    private String updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label.UPDATE_DATE
+     *
+     * @mbggenerated
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label.CREATE_USER
+     *
+     * @mbggenerated
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label.COMPANY_ID
+     *
+     * @mbggenerated
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label.BRANCH_ID
+     *
+     * @mbggenerated
+     */
+    private String branchId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label.LABEL_ID
+     *
+     * @return the value of article_label.LABEL_ID
+     *
+     * @mbggenerated
+     */
+    public Integer getLabelId() {
+        return labelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label.LABEL_ID
+     *
+     * @param labelId the value for article_label.LABEL_ID
+     *
+     * @mbggenerated
+     */
+    public void setLabelId(Integer labelId) {
+        this.labelId = labelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label.LABEL_NAME
+     *
+     * @return the value of article_label.LABEL_NAME
+     *
+     * @mbggenerated
+     */
+    public String getLabelName() {
+        return labelName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label.LABEL_NAME
+     *
+     * @param labelName the value for article_label.LABEL_NAME
+     *
+     * @mbggenerated
+     */
+    public void setLabelName(String labelName) {
+        this.labelName = labelName == null ? null : labelName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label.COMPANY_NAME
+     *
+     * @return the value of article_label.COMPANY_NAME
+     *
+     * @mbggenerated
+     */
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label.COMPANY_NAME
+     *
+     * @param companyName the value for article_label.COMPANY_NAME
+     *
+     * @mbggenerated
+     */
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName == null ? null : companyName.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label.CREATE_TIME
+     *
+     * @return the value of article_label.CREATE_TIME
+     *
+     * @mbggenerated
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label.CREATE_TIME
+     *
+     * @param createTime the value for article_label.CREATE_TIME
+     *
+     * @mbggenerated
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime == null ? null : createTime.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label.CREATE_DATE
+     *
+     * @return the value of article_label.CREATE_DATE
+     *
+     * @mbggenerated
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label.CREATE_DATE
+     *
+     * @param createDate the value for article_label.CREATE_DATE
+     *
+     * @mbggenerated
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate == null ? null : createDate.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label.UPDATE_TIME
+     *
+     * @return the value of article_label.UPDATE_TIME
+     *
+     * @mbggenerated
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label.UPDATE_TIME
+     *
+     * @param updateTime the value for article_label.UPDATE_TIME
+     *
+     * @mbggenerated
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime == null ? null : updateTime.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label.UPDATE_DATE
+     *
+     * @return the value of article_label.UPDATE_DATE
+     *
+     * @mbggenerated
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label.UPDATE_DATE
+     *
+     * @param updateDate the value for article_label.UPDATE_DATE
+     *
+     * @mbggenerated
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate == null ? null : updateDate.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label.CREATE_USER
+     *
+     * @return the value of article_label.CREATE_USER
+     *
+     * @mbggenerated
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label.CREATE_USER
+     *
+     * @param createUser the value for article_label.CREATE_USER
+     *
+     * @mbggenerated
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser == null ? null : createUser.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label.COMPANY_ID
+     *
+     * @return the value of article_label.COMPANY_ID
+     *
+     * @mbggenerated
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label.COMPANY_ID
+     *
+     * @param companyId the value for article_label.COMPANY_ID
+     *
+     * @mbggenerated
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId == null ? null : companyId.trim();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label.BRANCH_ID
+     *
+     * @return the value of article_label.BRANCH_ID
+     *
+     * @mbggenerated
+     */
+    public String getBranchId() {
+        return branchId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label.BRANCH_ID
+     *
+     * @param branchId the value for article_label.BRANCH_ID
+     *
+     * @mbggenerated
+     */
+    public void setBranchId(String branchId) {
+        this.branchId = branchId == null ? null : branchId.trim();
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelExample.java
new file mode 100644
index 000000000..609f9c6ad
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelExample.java
@@ -0,0 +1,992 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArticleLabelExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    public ArticleLabelExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andLabelIdIsNull() {
+            addCriterion("LABEL_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdIsNotNull() {
+            addCriterion("LABEL_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdEqualTo(Integer value) {
+            addCriterion("LABEL_ID =", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdNotEqualTo(Integer value) {
+            addCriterion("LABEL_ID <>", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdGreaterThan(Integer value) {
+            addCriterion("LABEL_ID >", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("LABEL_ID >=", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdLessThan(Integer value) {
+            addCriterion("LABEL_ID <", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdLessThanOrEqualTo(Integer value) {
+            addCriterion("LABEL_ID <=", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdIn(List<Integer> values) {
+            addCriterion("LABEL_ID in", values, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdNotIn(List<Integer> values) {
+            addCriterion("LABEL_ID not in", values, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdBetween(Integer value1, Integer value2) {
+            addCriterion("LABEL_ID between", value1, value2, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("LABEL_ID not between", value1, value2, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameIsNull() {
+            addCriterion("LABEL_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameIsNotNull() {
+            addCriterion("LABEL_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameEqualTo(String value) {
+            addCriterion("LABEL_NAME =", value, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameNotEqualTo(String value) {
+            addCriterion("LABEL_NAME <>", value, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameGreaterThan(String value) {
+            addCriterion("LABEL_NAME >", value, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameGreaterThanOrEqualTo(String value) {
+            addCriterion("LABEL_NAME >=", value, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameLessThan(String value) {
+            addCriterion("LABEL_NAME <", value, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameLessThanOrEqualTo(String value) {
+            addCriterion("LABEL_NAME <=", value, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameLike(String value) {
+            addCriterion("LABEL_NAME like", value, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameNotLike(String value) {
+            addCriterion("LABEL_NAME not like", value, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameIn(List<String> values) {
+            addCriterion("LABEL_NAME in", values, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameNotIn(List<String> values) {
+            addCriterion("LABEL_NAME not in", values, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameBetween(String value1, String value2) {
+            addCriterion("LABEL_NAME between", value1, value2, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelNameNotBetween(String value1, String value2) {
+            addCriterion("LABEL_NAME not between", value1, value2, "labelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIsNull() {
+            addCriterion("COMPANY_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIsNotNull() {
+            addCriterion("COMPANY_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameEqualTo(String value) {
+            addCriterion("COMPANY_NAME =", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotEqualTo(String value) {
+            addCriterion("COMPANY_NAME <>", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameGreaterThan(String value) {
+            addCriterion("COMPANY_NAME >", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_NAME >=", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLessThan(String value) {
+            addCriterion("COMPANY_NAME <", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_NAME <=", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLike(String value) {
+            addCriterion("COMPANY_NAME like", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotLike(String value) {
+            addCriterion("COMPANY_NAME not like", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIn(List<String> values) {
+            addCriterion("COMPANY_NAME in", values, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotIn(List<String> values) {
+            addCriterion("COMPANY_NAME not in", values, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameBetween(String value1, String value2) {
+            addCriterion("COMPANY_NAME between", value1, value2, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_NAME not between", value1, value2, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNull() {
+            addCriterion("BRANCH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNotNull() {
+            addCriterion("BRANCH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdEqualTo(String value) {
+            addCriterion("BRANCH_ID =", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotEqualTo(String value) {
+            addCriterion("BRANCH_ID <>", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThan(String value) {
+            addCriterion("BRANCH_ID >", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID >=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThan(String value) {
+            addCriterion("BRANCH_ID <", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID <=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLike(String value) {
+            addCriterion("BRANCH_ID like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotLike(String value) {
+            addCriterion("BRANCH_ID not like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIn(List<String> values) {
+            addCriterion("BRANCH_ID in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotIn(List<String> values) {
+            addCriterion("BRANCH_ID not in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID not between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_label
+     *
+     * @mbggenerated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelDTO.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelDTO.java
new file mode 100644
index 000000000..6dca05ae1
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelDTO.java
@@ -0,0 +1,31 @@
+package com.ruoyi.content.domain;
+/**
+ * 文章与标签关系dto
+ * @author Administrator
+ *
+ */
+public class ArticleLabelRelDTO {
+	private int articleId; // 文章id
+	private int labelId;   //标签id
+	private String labelName; //标签名称
+	
+	public int getArticleId() {
+		return articleId;
+	}
+	public void setArticleId(int articleId) {
+		this.articleId = articleId;
+	}
+	public int getLabelId() {
+		return labelId;
+	}
+	public void setLabelId(int labelId) {
+		this.labelId = labelId;
+	}
+	public String getLabelName() {
+		return labelName;
+	}
+	public void setLabelName(String labelName) {
+		this.labelName = labelName;
+	}
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelationship.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelationship.java
new file mode 100644
index 000000000..8c810d602
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelationship.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.domain;
+
+public class ArticleLabelRelationship {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label_relationship.ID
+     *
+     * @mbggenerated
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label_relationship.ARTICLE_ID
+     *
+     * @mbggenerated
+     */
+    private Integer articleId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_label_relationship.LABEL_ID
+     *
+     * @mbggenerated
+     */
+    private Integer labelId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label_relationship.ID
+     *
+     * @return the value of article_label_relationship.ID
+     *
+     * @mbggenerated
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label_relationship.ID
+     *
+     * @param id the value for article_label_relationship.ID
+     *
+     * @mbggenerated
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label_relationship.ARTICLE_ID
+     *
+     * @return the value of article_label_relationship.ARTICLE_ID
+     *
+     * @mbggenerated
+     */
+    public Integer getArticleId() {
+        return articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label_relationship.ARTICLE_ID
+     *
+     * @param articleId the value for article_label_relationship.ARTICLE_ID
+     *
+     * @mbggenerated
+     */
+    public void setArticleId(Integer articleId) {
+        this.articleId = articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_label_relationship.LABEL_ID
+     *
+     * @return the value of article_label_relationship.LABEL_ID
+     *
+     * @mbggenerated
+     */
+    public Integer getLabelId() {
+        return labelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_label_relationship.LABEL_ID
+     *
+     * @param labelId the value for article_label_relationship.LABEL_ID
+     *
+     * @mbggenerated
+     */
+    public void setLabelId(Integer labelId) {
+        this.labelId = labelId;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelationshipExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelationshipExample.java
new file mode 100644
index 000000000..41a962698
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleLabelRelationshipExample.java
@@ -0,0 +1,482 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArticleLabelRelationshipExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    public ArticleLabelRelationshipExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNull() {
+            addCriterion("ARTICLE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNotNull() {
+            addCriterion("ARTICLE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID =", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID <>", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThan(Integer value) {
+            addCriterion("ARTICLE_ID >", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID >=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThan(Integer value) {
+            addCriterion("ARTICLE_ID <", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID <=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIn(List<Integer> values) {
+            addCriterion("ARTICLE_ID in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotIn(List<Integer> values) {
+            addCriterion("ARTICLE_ID not in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdBetween(Integer value1, Integer value2) {
+            addCriterion("ARTICLE_ID between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ARTICLE_ID not between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdIsNull() {
+            addCriterion("LABEL_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdIsNotNull() {
+            addCriterion("LABEL_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdEqualTo(Integer value) {
+            addCriterion("LABEL_ID =", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdNotEqualTo(Integer value) {
+            addCriterion("LABEL_ID <>", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdGreaterThan(Integer value) {
+            addCriterion("LABEL_ID >", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("LABEL_ID >=", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdLessThan(Integer value) {
+            addCriterion("LABEL_ID <", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdLessThanOrEqualTo(Integer value) {
+            addCriterion("LABEL_ID <=", value, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdIn(List<Integer> values) {
+            addCriterion("LABEL_ID in", values, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdNotIn(List<Integer> values) {
+            addCriterion("LABEL_ID not in", values, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdBetween(Integer value1, Integer value2) {
+            addCriterion("LABEL_ID between", value1, value2, "labelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andLabelIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("LABEL_ID not between", value1, value2, "labelId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated do_not_delete_during_merge
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePersonalConfig.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePersonalConfig.java
new file mode 100644
index 000000000..149a4e67e
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePersonalConfig.java
@@ -0,0 +1,227 @@
+package com.ruoyi.content.domain;
+
+public class ArticlePersonalConfig {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_personal_config.ID
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_personal_config.PUBLISH_ID
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    private String publishId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_personal_config.CONFIG_ARTICLE
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    private String configArticle;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_personal_config.CONFIG_PRODUCT
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    private String configProduct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_personal_config.CONFIG_CARD
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    private String configCard;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_personal_config.CONFIG_RECRUIT
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    private String configRecruit;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_personal_config.SHOW_AD
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    private String showAd;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_personal_config.ID
+     *
+     * @return the value of article_personal_config.ID
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_personal_config.ID
+     *
+     * @param id the value for article_personal_config.ID
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_personal_config.PUBLISH_ID
+     *
+     * @return the value of article_personal_config.PUBLISH_ID
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public String getPublishId() {
+        return publishId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_personal_config.PUBLISH_ID
+     *
+     * @param publishId the value for article_personal_config.PUBLISH_ID
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public void setPublishId(String publishId) {
+        this.publishId = publishId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_personal_config.CONFIG_ARTICLE
+     *
+     * @return the value of article_personal_config.CONFIG_ARTICLE
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public String getConfigArticle() {
+        return configArticle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_personal_config.CONFIG_ARTICLE
+     *
+     * @param configArticle the value for article_personal_config.CONFIG_ARTICLE
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public void setConfigArticle(String configArticle) {
+        this.configArticle = configArticle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_personal_config.CONFIG_PRODUCT
+     *
+     * @return the value of article_personal_config.CONFIG_PRODUCT
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public String getConfigProduct() {
+        return configProduct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_personal_config.CONFIG_PRODUCT
+     *
+     * @param configProduct the value for article_personal_config.CONFIG_PRODUCT
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public void setConfigProduct(String configProduct) {
+        this.configProduct = configProduct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_personal_config.CONFIG_CARD
+     *
+     * @return the value of article_personal_config.CONFIG_CARD
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public String getConfigCard() {
+        return configCard;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_personal_config.CONFIG_CARD
+     *
+     * @param configCard the value for article_personal_config.CONFIG_CARD
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public void setConfigCard(String configCard) {
+        this.configCard = configCard;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_personal_config.CONFIG_RECRUIT
+     *
+     * @return the value of article_personal_config.CONFIG_RECRUIT
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public String getConfigRecruit() {
+        return configRecruit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_personal_config.CONFIG_RECRUIT
+     *
+     * @param configRecruit the value for article_personal_config.CONFIG_RECRUIT
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public void setConfigRecruit(String configRecruit) {
+        this.configRecruit = configRecruit;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_personal_config.SHOW_AD
+     *
+     * @return the value of article_personal_config.SHOW_AD
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public String getShowAd() {
+        return showAd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_personal_config.SHOW_AD
+     *
+     * @param showAd the value for article_personal_config.SHOW_AD
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public void setShowAd(String showAd) {
+        this.showAd = showAd;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePersonalConfigExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePersonalConfigExample.java
new file mode 100644
index 000000000..380e05e51
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePersonalConfigExample.java
@@ -0,0 +1,782 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArticlePersonalConfigExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public ArticlePersonalConfigExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIsNull() {
+            addCriterion("PUBLISH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIsNotNull() {
+            addCriterion("PUBLISH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdEqualTo(String value) {
+            addCriterion("PUBLISH_ID =", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotEqualTo(String value) {
+            addCriterion("PUBLISH_ID <>", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdGreaterThan(String value) {
+            addCriterion("PUBLISH_ID >", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_ID >=", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLessThan(String value) {
+            addCriterion("PUBLISH_ID <", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_ID <=", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLike(String value) {
+            addCriterion("PUBLISH_ID like", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotLike(String value) {
+            addCriterion("PUBLISH_ID not like", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIn(List<String> values) {
+            addCriterion("PUBLISH_ID in", values, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotIn(List<String> values) {
+            addCriterion("PUBLISH_ID not in", values, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdBetween(String value1, String value2) {
+            addCriterion("PUBLISH_ID between", value1, value2, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_ID not between", value1, value2, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleIsNull() {
+            addCriterion("CONFIG_ARTICLE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleIsNotNull() {
+            addCriterion("CONFIG_ARTICLE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleEqualTo(String value) {
+            addCriterion("CONFIG_ARTICLE =", value, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleNotEqualTo(String value) {
+            addCriterion("CONFIG_ARTICLE <>", value, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleGreaterThan(String value) {
+            addCriterion("CONFIG_ARTICLE >", value, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleGreaterThanOrEqualTo(String value) {
+            addCriterion("CONFIG_ARTICLE >=", value, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleLessThan(String value) {
+            addCriterion("CONFIG_ARTICLE <", value, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleLessThanOrEqualTo(String value) {
+            addCriterion("CONFIG_ARTICLE <=", value, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleLike(String value) {
+            addCriterion("CONFIG_ARTICLE like", value, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleNotLike(String value) {
+            addCriterion("CONFIG_ARTICLE not like", value, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleIn(List<String> values) {
+            addCriterion("CONFIG_ARTICLE in", values, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleNotIn(List<String> values) {
+            addCriterion("CONFIG_ARTICLE not in", values, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleBetween(String value1, String value2) {
+            addCriterion("CONFIG_ARTICLE between", value1, value2, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigArticleNotBetween(String value1, String value2) {
+            addCriterion("CONFIG_ARTICLE not between", value1, value2, "configArticle");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductIsNull() {
+            addCriterion("CONFIG_PRODUCT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductIsNotNull() {
+            addCriterion("CONFIG_PRODUCT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductEqualTo(String value) {
+            addCriterion("CONFIG_PRODUCT =", value, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductNotEqualTo(String value) {
+            addCriterion("CONFIG_PRODUCT <>", value, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductGreaterThan(String value) {
+            addCriterion("CONFIG_PRODUCT >", value, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductGreaterThanOrEqualTo(String value) {
+            addCriterion("CONFIG_PRODUCT >=", value, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductLessThan(String value) {
+            addCriterion("CONFIG_PRODUCT <", value, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductLessThanOrEqualTo(String value) {
+            addCriterion("CONFIG_PRODUCT <=", value, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductLike(String value) {
+            addCriterion("CONFIG_PRODUCT like", value, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductNotLike(String value) {
+            addCriterion("CONFIG_PRODUCT not like", value, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductIn(List<String> values) {
+            addCriterion("CONFIG_PRODUCT in", values, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductNotIn(List<String> values) {
+            addCriterion("CONFIG_PRODUCT not in", values, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductBetween(String value1, String value2) {
+            addCriterion("CONFIG_PRODUCT between", value1, value2, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigProductNotBetween(String value1, String value2) {
+            addCriterion("CONFIG_PRODUCT not between", value1, value2, "configProduct");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardIsNull() {
+            addCriterion("CONFIG_CARD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardIsNotNull() {
+            addCriterion("CONFIG_CARD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardEqualTo(String value) {
+            addCriterion("CONFIG_CARD =", value, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardNotEqualTo(String value) {
+            addCriterion("CONFIG_CARD <>", value, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardGreaterThan(String value) {
+            addCriterion("CONFIG_CARD >", value, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardGreaterThanOrEqualTo(String value) {
+            addCriterion("CONFIG_CARD >=", value, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardLessThan(String value) {
+            addCriterion("CONFIG_CARD <", value, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardLessThanOrEqualTo(String value) {
+            addCriterion("CONFIG_CARD <=", value, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardLike(String value) {
+            addCriterion("CONFIG_CARD like", value, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardNotLike(String value) {
+            addCriterion("CONFIG_CARD not like", value, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardIn(List<String> values) {
+            addCriterion("CONFIG_CARD in", values, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardNotIn(List<String> values) {
+            addCriterion("CONFIG_CARD not in", values, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardBetween(String value1, String value2) {
+            addCriterion("CONFIG_CARD between", value1, value2, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigCardNotBetween(String value1, String value2) {
+            addCriterion("CONFIG_CARD not between", value1, value2, "configCard");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitIsNull() {
+            addCriterion("CONFIG_RECRUIT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitIsNotNull() {
+            addCriterion("CONFIG_RECRUIT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitEqualTo(String value) {
+            addCriterion("CONFIG_RECRUIT =", value, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitNotEqualTo(String value) {
+            addCriterion("CONFIG_RECRUIT <>", value, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitGreaterThan(String value) {
+            addCriterion("CONFIG_RECRUIT >", value, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitGreaterThanOrEqualTo(String value) {
+            addCriterion("CONFIG_RECRUIT >=", value, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitLessThan(String value) {
+            addCriterion("CONFIG_RECRUIT <", value, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitLessThanOrEqualTo(String value) {
+            addCriterion("CONFIG_RECRUIT <=", value, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitLike(String value) {
+            addCriterion("CONFIG_RECRUIT like", value, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitNotLike(String value) {
+            addCriterion("CONFIG_RECRUIT not like", value, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitIn(List<String> values) {
+            addCriterion("CONFIG_RECRUIT in", values, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitNotIn(List<String> values) {
+            addCriterion("CONFIG_RECRUIT not in", values, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitBetween(String value1, String value2) {
+            addCriterion("CONFIG_RECRUIT between", value1, value2, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andConfigRecruitNotBetween(String value1, String value2) {
+            addCriterion("CONFIG_RECRUIT not between", value1, value2, "configRecruit");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdIsNull() {
+            addCriterion("SHOW_AD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdIsNotNull() {
+            addCriterion("SHOW_AD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdEqualTo(String value) {
+            addCriterion("SHOW_AD =", value, "showAd");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdNotEqualTo(String value) {
+            addCriterion("SHOW_AD <>", value, "showAd");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdGreaterThan(String value) {
+            addCriterion("SHOW_AD >", value, "showAd");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdGreaterThanOrEqualTo(String value) {
+            addCriterion("SHOW_AD >=", value, "showAd");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdLessThan(String value) {
+            addCriterion("SHOW_AD <", value, "showAd");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdLessThanOrEqualTo(String value) {
+            addCriterion("SHOW_AD <=", value, "showAd");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdLike(String value) {
+            addCriterion("SHOW_AD like", value, "showAd");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdNotLike(String value) {
+            addCriterion("SHOW_AD not like", value, "showAd");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdIn(List<String> values) {
+            addCriterion("SHOW_AD in", values, "showAd");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdNotIn(List<String> values) {
+            addCriterion("SHOW_AD not in", values, "showAd");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdBetween(String value1, String value2) {
+            addCriterion("SHOW_AD between", value1, value2, "showAd");
+            return (Criteria) this;
+        }
+
+        public Criteria andShowAdNotBetween(String value1, String value2) {
+            addCriterion("SHOW_AD not between", value1, value2, "showAd");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_personal_config
+     *
+     * @mbggenerated do_not_delete_during_merge Wed May 20 09:55:58 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSend.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSend.java
new file mode 100644
index 000000000..1515ff693
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSend.java
@@ -0,0 +1,419 @@
+package com.ruoyi.content.domain;
+
+public class ArticlePublishSend {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.ARTICLE_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private Integer articleId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.PUBLISH_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private String publishId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.SEND_TYPE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private String sendType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.GROUP_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private String groupId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.GROUP_NAME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private String groupName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.OPERATE_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private String operateId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.OPERATE_NAME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private String operateName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.PUBLISH_DATE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private String publishDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.PUBLISH_TIME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private String publishTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.OPERATE_DATE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private String operateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.OPERATE_TIME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private String operateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_send.SEND_STATE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    private String sendState;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.ID
+     *
+     * @return the value of article_publish_send.ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.ID
+     *
+     * @param id the value for article_publish_send.ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.ARTICLE_ID
+     *
+     * @return the value of article_publish_send.ARTICLE_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public Integer getArticleId() {
+        return articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.ARTICLE_ID
+     *
+     * @param articleId the value for article_publish_send.ARTICLE_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setArticleId(Integer articleId) {
+        this.articleId = articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.PUBLISH_ID
+     *
+     * @return the value of article_publish_send.PUBLISH_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getPublishId() {
+        return publishId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.PUBLISH_ID
+     *
+     * @param publishId the value for article_publish_send.PUBLISH_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setPublishId(String publishId) {
+        this.publishId = publishId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.SEND_TYPE
+     *
+     * @return the value of article_publish_send.SEND_TYPE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getSendType() {
+        return sendType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.SEND_TYPE
+     *
+     * @param sendType the value for article_publish_send.SEND_TYPE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setSendType(String sendType) {
+        this.sendType = sendType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.GROUP_ID
+     *
+     * @return the value of article_publish_send.GROUP_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getGroupId() {
+        return groupId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.GROUP_ID
+     *
+     * @param groupId the value for article_publish_send.GROUP_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.GROUP_NAME
+     *
+     * @return the value of article_publish_send.GROUP_NAME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getGroupName() {
+        return groupName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.GROUP_NAME
+     *
+     * @param groupName the value for article_publish_send.GROUP_NAME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.OPERATE_ID
+     *
+     * @return the value of article_publish_send.OPERATE_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getOperateId() {
+        return operateId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.OPERATE_ID
+     *
+     * @param operateId the value for article_publish_send.OPERATE_ID
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setOperateId(String operateId) {
+        this.operateId = operateId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.OPERATE_NAME
+     *
+     * @return the value of article_publish_send.OPERATE_NAME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getOperateName() {
+        return operateName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.OPERATE_NAME
+     *
+     * @param operateName the value for article_publish_send.OPERATE_NAME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setOperateName(String operateName) {
+        this.operateName = operateName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.PUBLISH_DATE
+     *
+     * @return the value of article_publish_send.PUBLISH_DATE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getPublishDate() {
+        return publishDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.PUBLISH_DATE
+     *
+     * @param publishDate the value for article_publish_send.PUBLISH_DATE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setPublishDate(String publishDate) {
+        this.publishDate = publishDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.PUBLISH_TIME
+     *
+     * @return the value of article_publish_send.PUBLISH_TIME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getPublishTime() {
+        return publishTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.PUBLISH_TIME
+     *
+     * @param publishTime the value for article_publish_send.PUBLISH_TIME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setPublishTime(String publishTime) {
+        this.publishTime = publishTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.OPERATE_DATE
+     *
+     * @return the value of article_publish_send.OPERATE_DATE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getOperateDate() {
+        return operateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.OPERATE_DATE
+     *
+     * @param operateDate the value for article_publish_send.OPERATE_DATE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setOperateDate(String operateDate) {
+        this.operateDate = operateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.OPERATE_TIME
+     *
+     * @return the value of article_publish_send.OPERATE_TIME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getOperateTime() {
+        return operateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.OPERATE_TIME
+     *
+     * @param operateTime the value for article_publish_send.OPERATE_TIME
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setOperateTime(String operateTime) {
+        this.operateTime = operateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_send.SEND_STATE
+     *
+     * @return the value of article_publish_send.SEND_STATE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getSendState() {
+        return sendState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_send.SEND_STATE
+     *
+     * @param sendState the value for article_publish_send.SEND_STATE
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setSendState(String sendState) {
+        this.sendState = sendState;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSendDTO.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSendDTO.java
new file mode 100644
index 000000000..392d1a5d7
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSendDTO.java
@@ -0,0 +1,68 @@
+package com.ruoyi.content.domain;
+
+import java.io.Serializable;
+
+public class ArticlePublishSendDTO implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	//推送id
+	private Integer id;
+	//推送对象类型
+	private String sendType;
+	//推送的员工工号或分公司编码
+	private String groupId;
+	//操作人姓名
+	private String operateName;
+	//操作时间
+	private String operateTime;
+	//推送时间
+	private String publishTime;
+	//推送状态
+	private String sendState;
+	
+	public String getSendState() {
+		return sendState;
+	}
+	public void setSendState(String sendState) {
+		this.sendState = sendState;
+	}
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getSendType() {
+		return sendType;
+	}
+	public void setSendType(String sendType) {
+		this.sendType = sendType;
+	}
+	public String getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
+	public String getOperateName() {
+		return operateName;
+	}
+	public void setOperateName(String operateName) {
+		this.operateName = operateName;
+	}
+	public String getOperateTime() {
+		return operateTime;
+	}
+	public void setOperateTime(String operateTime) {
+		this.operateTime = operateTime;
+	}
+	public String getPublishTime() {
+		return publishTime;
+	}
+	public void setPublishTime(String publishTime) {
+		this.publishTime = publishTime;
+	}
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSendExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSendExample.java
new file mode 100644
index 000000000..76224918b
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishSendExample.java
@@ -0,0 +1,1192 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArticlePublishSendExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public ArticlePublishSendExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNull() {
+            addCriterion("ARTICLE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNotNull() {
+            addCriterion("ARTICLE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID =", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID <>", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThan(Integer value) {
+            addCriterion("ARTICLE_ID >", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID >=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThan(Integer value) {
+            addCriterion("ARTICLE_ID <", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ARTICLE_ID <=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIn(List<Integer> values) {
+            addCriterion("ARTICLE_ID in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotIn(List<Integer> values) {
+            addCriterion("ARTICLE_ID not in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdBetween(Integer value1, Integer value2) {
+            addCriterion("ARTICLE_ID between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ARTICLE_ID not between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIsNull() {
+            addCriterion("PUBLISH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIsNotNull() {
+            addCriterion("PUBLISH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdEqualTo(String value) {
+            addCriterion("PUBLISH_ID =", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotEqualTo(String value) {
+            addCriterion("PUBLISH_ID <>", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdGreaterThan(String value) {
+            addCriterion("PUBLISH_ID >", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_ID >=", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLessThan(String value) {
+            addCriterion("PUBLISH_ID <", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_ID <=", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLike(String value) {
+            addCriterion("PUBLISH_ID like", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotLike(String value) {
+            addCriterion("PUBLISH_ID not like", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIn(List<String> values) {
+            addCriterion("PUBLISH_ID in", values, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotIn(List<String> values) {
+            addCriterion("PUBLISH_ID not in", values, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdBetween(String value1, String value2) {
+            addCriterion("PUBLISH_ID between", value1, value2, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_ID not between", value1, value2, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeIsNull() {
+            addCriterion("SEND_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeIsNotNull() {
+            addCriterion("SEND_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeEqualTo(String value) {
+            addCriterion("SEND_TYPE =", value, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeNotEqualTo(String value) {
+            addCriterion("SEND_TYPE <>", value, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeGreaterThan(String value) {
+            addCriterion("SEND_TYPE >", value, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("SEND_TYPE >=", value, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeLessThan(String value) {
+            addCriterion("SEND_TYPE <", value, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeLessThanOrEqualTo(String value) {
+            addCriterion("SEND_TYPE <=", value, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeLike(String value) {
+            addCriterion("SEND_TYPE like", value, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeNotLike(String value) {
+            addCriterion("SEND_TYPE not like", value, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeIn(List<String> values) {
+            addCriterion("SEND_TYPE in", values, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeNotIn(List<String> values) {
+            addCriterion("SEND_TYPE not in", values, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeBetween(String value1, String value2) {
+            addCriterion("SEND_TYPE between", value1, value2, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendTypeNotBetween(String value1, String value2) {
+            addCriterion("SEND_TYPE not between", value1, value2, "sendType");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdIsNull() {
+            addCriterion("GROUP_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdIsNotNull() {
+            addCriterion("GROUP_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdEqualTo(String value) {
+            addCriterion("GROUP_ID =", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotEqualTo(String value) {
+            addCriterion("GROUP_ID <>", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdGreaterThan(String value) {
+            addCriterion("GROUP_ID >", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdGreaterThanOrEqualTo(String value) {
+            addCriterion("GROUP_ID >=", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdLessThan(String value) {
+            addCriterion("GROUP_ID <", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdLessThanOrEqualTo(String value) {
+            addCriterion("GROUP_ID <=", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdLike(String value) {
+            addCriterion("GROUP_ID like", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotLike(String value) {
+            addCriterion("GROUP_ID not like", value, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdIn(List<String> values) {
+            addCriterion("GROUP_ID in", values, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotIn(List<String> values) {
+            addCriterion("GROUP_ID not in", values, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdBetween(String value1, String value2) {
+            addCriterion("GROUP_ID between", value1, value2, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupIdNotBetween(String value1, String value2) {
+            addCriterion("GROUP_ID not between", value1, value2, "groupId");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameIsNull() {
+            addCriterion("GROUP_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameIsNotNull() {
+            addCriterion("GROUP_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameEqualTo(String value) {
+            addCriterion("GROUP_NAME =", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameNotEqualTo(String value) {
+            addCriterion("GROUP_NAME <>", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameGreaterThan(String value) {
+            addCriterion("GROUP_NAME >", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameGreaterThanOrEqualTo(String value) {
+            addCriterion("GROUP_NAME >=", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameLessThan(String value) {
+            addCriterion("GROUP_NAME <", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameLessThanOrEqualTo(String value) {
+            addCriterion("GROUP_NAME <=", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameLike(String value) {
+            addCriterion("GROUP_NAME like", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameNotLike(String value) {
+            addCriterion("GROUP_NAME not like", value, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameIn(List<String> values) {
+            addCriterion("GROUP_NAME in", values, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameNotIn(List<String> values) {
+            addCriterion("GROUP_NAME not in", values, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameBetween(String value1, String value2) {
+            addCriterion("GROUP_NAME between", value1, value2, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andGroupNameNotBetween(String value1, String value2) {
+            addCriterion("GROUP_NAME not between", value1, value2, "groupName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdIsNull() {
+            addCriterion("OPERATE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdIsNotNull() {
+            addCriterion("OPERATE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdEqualTo(String value) {
+            addCriterion("OPERATE_ID =", value, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdNotEqualTo(String value) {
+            addCriterion("OPERATE_ID <>", value, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdGreaterThan(String value) {
+            addCriterion("OPERATE_ID >", value, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdGreaterThanOrEqualTo(String value) {
+            addCriterion("OPERATE_ID >=", value, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdLessThan(String value) {
+            addCriterion("OPERATE_ID <", value, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdLessThanOrEqualTo(String value) {
+            addCriterion("OPERATE_ID <=", value, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdLike(String value) {
+            addCriterion("OPERATE_ID like", value, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdNotLike(String value) {
+            addCriterion("OPERATE_ID not like", value, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdIn(List<String> values) {
+            addCriterion("OPERATE_ID in", values, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdNotIn(List<String> values) {
+            addCriterion("OPERATE_ID not in", values, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdBetween(String value1, String value2) {
+            addCriterion("OPERATE_ID between", value1, value2, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateIdNotBetween(String value1, String value2) {
+            addCriterion("OPERATE_ID not between", value1, value2, "operateId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameIsNull() {
+            addCriterion("OPERATE_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameIsNotNull() {
+            addCriterion("OPERATE_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameEqualTo(String value) {
+            addCriterion("OPERATE_NAME =", value, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameNotEqualTo(String value) {
+            addCriterion("OPERATE_NAME <>", value, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameGreaterThan(String value) {
+            addCriterion("OPERATE_NAME >", value, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameGreaterThanOrEqualTo(String value) {
+            addCriterion("OPERATE_NAME >=", value, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameLessThan(String value) {
+            addCriterion("OPERATE_NAME <", value, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameLessThanOrEqualTo(String value) {
+            addCriterion("OPERATE_NAME <=", value, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameLike(String value) {
+            addCriterion("OPERATE_NAME like", value, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameNotLike(String value) {
+            addCriterion("OPERATE_NAME not like", value, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameIn(List<String> values) {
+            addCriterion("OPERATE_NAME in", values, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameNotIn(List<String> values) {
+            addCriterion("OPERATE_NAME not in", values, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameBetween(String value1, String value2) {
+            addCriterion("OPERATE_NAME between", value1, value2, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateNameNotBetween(String value1, String value2) {
+            addCriterion("OPERATE_NAME not between", value1, value2, "operateName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateIsNull() {
+            addCriterion("PUBLISH_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateIsNotNull() {
+            addCriterion("PUBLISH_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateEqualTo(String value) {
+            addCriterion("PUBLISH_DATE =", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotEqualTo(String value) {
+            addCriterion("PUBLISH_DATE <>", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateGreaterThan(String value) {
+            addCriterion("PUBLISH_DATE >", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_DATE >=", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateLessThan(String value) {
+            addCriterion("PUBLISH_DATE <", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_DATE <=", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateLike(String value) {
+            addCriterion("PUBLISH_DATE like", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotLike(String value) {
+            addCriterion("PUBLISH_DATE not like", value, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateIn(List<String> values) {
+            addCriterion("PUBLISH_DATE in", values, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotIn(List<String> values) {
+            addCriterion("PUBLISH_DATE not in", values, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateBetween(String value1, String value2) {
+            addCriterion("PUBLISH_DATE between", value1, value2, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishDateNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_DATE not between", value1, value2, "publishDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIsNull() {
+            addCriterion("PUBLISH_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIsNotNull() {
+            addCriterion("PUBLISH_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeEqualTo(String value) {
+            addCriterion("PUBLISH_TIME =", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeNotEqualTo(String value) {
+            addCriterion("PUBLISH_TIME <>", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeGreaterThan(String value) {
+            addCriterion("PUBLISH_TIME >", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_TIME >=", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeLessThan(String value) {
+            addCriterion("PUBLISH_TIME <", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_TIME <=", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeLike(String value) {
+            addCriterion("PUBLISH_TIME like", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeNotLike(String value) {
+            addCriterion("PUBLISH_TIME not like", value, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeIn(List<String> values) {
+            addCriterion("PUBLISH_TIME in", values, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeNotIn(List<String> values) {
+            addCriterion("PUBLISH_TIME not in", values, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeBetween(String value1, String value2) {
+            addCriterion("PUBLISH_TIME between", value1, value2, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishTimeNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_TIME not between", value1, value2, "publishTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateIsNull() {
+            addCriterion("OPERATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateIsNotNull() {
+            addCriterion("OPERATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateEqualTo(String value) {
+            addCriterion("OPERATE_DATE =", value, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateNotEqualTo(String value) {
+            addCriterion("OPERATE_DATE <>", value, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateGreaterThan(String value) {
+            addCriterion("OPERATE_DATE >", value, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("OPERATE_DATE >=", value, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateLessThan(String value) {
+            addCriterion("OPERATE_DATE <", value, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateLessThanOrEqualTo(String value) {
+            addCriterion("OPERATE_DATE <=", value, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateLike(String value) {
+            addCriterion("OPERATE_DATE like", value, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateNotLike(String value) {
+            addCriterion("OPERATE_DATE not like", value, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateIn(List<String> values) {
+            addCriterion("OPERATE_DATE in", values, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateNotIn(List<String> values) {
+            addCriterion("OPERATE_DATE not in", values, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateBetween(String value1, String value2) {
+            addCriterion("OPERATE_DATE between", value1, value2, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateDateNotBetween(String value1, String value2) {
+            addCriterion("OPERATE_DATE not between", value1, value2, "operateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeIsNull() {
+            addCriterion("OPERATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeIsNotNull() {
+            addCriterion("OPERATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeEqualTo(String value) {
+            addCriterion("OPERATE_TIME =", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeNotEqualTo(String value) {
+            addCriterion("OPERATE_TIME <>", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeGreaterThan(String value) {
+            addCriterion("OPERATE_TIME >", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("OPERATE_TIME >=", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeLessThan(String value) {
+            addCriterion("OPERATE_TIME <", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeLessThanOrEqualTo(String value) {
+            addCriterion("OPERATE_TIME <=", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeLike(String value) {
+            addCriterion("OPERATE_TIME like", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeNotLike(String value) {
+            addCriterion("OPERATE_TIME not like", value, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeIn(List<String> values) {
+            addCriterion("OPERATE_TIME in", values, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeNotIn(List<String> values) {
+            addCriterion("OPERATE_TIME not in", values, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeBetween(String value1, String value2) {
+            addCriterion("OPERATE_TIME between", value1, value2, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperateTimeNotBetween(String value1, String value2) {
+            addCriterion("OPERATE_TIME not between", value1, value2, "operateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateIsNull() {
+            addCriterion("SEND_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateIsNotNull() {
+            addCriterion("SEND_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateEqualTo(String value) {
+            addCriterion("SEND_STATE =", value, "sendState");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateNotEqualTo(String value) {
+            addCriterion("SEND_STATE <>", value, "sendState");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateGreaterThan(String value) {
+            addCriterion("SEND_STATE >", value, "sendState");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateGreaterThanOrEqualTo(String value) {
+            addCriterion("SEND_STATE >=", value, "sendState");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateLessThan(String value) {
+            addCriterion("SEND_STATE <", value, "sendState");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateLessThanOrEqualTo(String value) {
+            addCriterion("SEND_STATE <=", value, "sendState");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateLike(String value) {
+            addCriterion("SEND_STATE like", value, "sendState");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateNotLike(String value) {
+            addCriterion("SEND_STATE not like", value, "sendState");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateIn(List<String> values) {
+            addCriterion("SEND_STATE in", values, "sendState");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateNotIn(List<String> values) {
+            addCriterion("SEND_STATE not in", values, "sendState");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateBetween(String value1, String value2) {
+            addCriterion("SEND_STATE between", value1, value2, "sendState");
+            return (Criteria) this;
+        }
+
+        public Criteria andSendStateNotBetween(String value1, String value2) {
+            addCriterion("SEND_STATE not between", value1, value2, "sendState");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_publish_send
+     *
+     * @mbggenerated do_not_delete_during_merge Thu Jun 04 15:03:08 CST 2020
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishTrack.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishTrack.java
new file mode 100644
index 000000000..1c5e8e74a
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishTrack.java
@@ -0,0 +1,578 @@
+package com.ruoyi.content.domain;
+
+import java.util.Date;
+
+public class ArticlePublishTrack {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.PUBLISH_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String publishId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.COMPANY_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.USER_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String userId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.ARTICLE_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String articleId;
+    
+    private String articleVersion;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.AD_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String adId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.CARD_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String cardId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.PUBLISH_VIEW_URL
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String publishViewUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.PUBLISH_EDIT_URL
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String publishEditUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.PUBLISH_STATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String publishState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.CREATE_DATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.CREATE_TIME
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.CREATE_USER
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.UPDATE_USER
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.UPDATE_DATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.UPDATE_TIME
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.BACKGROUND_EDIT_URL
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String backgroundEditUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_publish_track.LIBRARY_STATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    private String libraryState;
+    
+    private Date timestamp;
+    private String agentCode;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.PUBLISH_ID
+     *
+     * @return the value of article_publish_track.PUBLISH_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getPublishId() {
+        return publishId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.PUBLISH_ID
+     *
+     * @param publishId the value for article_publish_track.PUBLISH_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setPublishId(String publishId) {
+        this.publishId = publishId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.COMPANY_ID
+     *
+     * @return the value of article_publish_track.COMPANY_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.COMPANY_ID
+     *
+     * @param companyId the value for article_publish_track.COMPANY_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.USER_ID
+     *
+     * @return the value of article_publish_track.USER_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getUserId() {
+        return userId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.USER_ID
+     *
+     * @param userId the value for article_publish_track.USER_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.ARTICLE_ID
+     *
+     * @return the value of article_publish_track.ARTICLE_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getArticleId() {
+        return articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.ARTICLE_ID
+     *
+     * @param articleId the value for article_publish_track.ARTICLE_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setArticleId(String articleId) {
+        this.articleId = articleId;
+    }
+    
+	public String getArticleVersion() {
+		return this.articleVersion;
+	}
+
+	public void setArticleVersion(String articleVersion) {
+		this.articleVersion = articleVersion;
+	}
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.AD_ID
+     *
+     * @return the value of article_publish_track.AD_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getAdId() {
+        return adId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.AD_ID
+     *
+     * @param adId the value for article_publish_track.AD_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setAdId(String adId) {
+        this.adId = adId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.CARD_ID
+     *
+     * @return the value of article_publish_track.CARD_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getCardId() {
+        return cardId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.CARD_ID
+     *
+     * @param cardId the value for article_publish_track.CARD_ID
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.PUBLISH_VIEW_URL
+     *
+     * @return the value of article_publish_track.PUBLISH_VIEW_URL
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getPublishViewUrl() {
+        return publishViewUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.PUBLISH_VIEW_URL
+     *
+     * @param publishViewUrl the value for article_publish_track.PUBLISH_VIEW_URL
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setPublishViewUrl(String publishViewUrl) {
+        this.publishViewUrl = publishViewUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.PUBLISH_EDIT_URL
+     *
+     * @return the value of article_publish_track.PUBLISH_EDIT_URL
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getPublishEditUrl() {
+        return publishEditUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.PUBLISH_EDIT_URL
+     *
+     * @param publishEditUrl the value for article_publish_track.PUBLISH_EDIT_URL
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setPublishEditUrl(String publishEditUrl) {
+        this.publishEditUrl = publishEditUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.PUBLISH_STATE
+     *
+     * @return the value of article_publish_track.PUBLISH_STATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getPublishState() {
+        return publishState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.PUBLISH_STATE
+     *
+     * @param publishState the value for article_publish_track.PUBLISH_STATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setPublishState(String publishState) {
+        this.publishState = publishState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.CREATE_DATE
+     *
+     * @return the value of article_publish_track.CREATE_DATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.CREATE_DATE
+     *
+     * @param createDate the value for article_publish_track.CREATE_DATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.CREATE_TIME
+     *
+     * @return the value of article_publish_track.CREATE_TIME
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.CREATE_TIME
+     *
+     * @param createTime the value for article_publish_track.CREATE_TIME
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.CREATE_USER
+     *
+     * @return the value of article_publish_track.CREATE_USER
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.CREATE_USER
+     *
+     * @param createUser the value for article_publish_track.CREATE_USER
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.UPDATE_USER
+     *
+     * @return the value of article_publish_track.UPDATE_USER
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.UPDATE_USER
+     *
+     * @param updateUser the value for article_publish_track.UPDATE_USER
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.UPDATE_DATE
+     *
+     * @return the value of article_publish_track.UPDATE_DATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.UPDATE_DATE
+     *
+     * @param updateDate the value for article_publish_track.UPDATE_DATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.UPDATE_TIME
+     *
+     * @return the value of article_publish_track.UPDATE_TIME
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.UPDATE_TIME
+     *
+     * @param updateTime the value for article_publish_track.UPDATE_TIME
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.BACKGROUND_EDIT_URL
+     *
+     * @return the value of article_publish_track.BACKGROUND_EDIT_URL
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getBackgroundEditUrl() {
+        return backgroundEditUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.BACKGROUND_EDIT_URL
+     *
+     * @param backgroundEditUrl the value for article_publish_track.BACKGROUND_EDIT_URL
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setBackgroundEditUrl(String backgroundEditUrl) {
+        this.backgroundEditUrl = backgroundEditUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_publish_track.LIBRARY_STATE
+     *
+     * @return the value of article_publish_track.LIBRARY_STATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getLibraryState() {
+        return libraryState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_publish_track.LIBRARY_STATE
+     *
+     * @param libraryState the value for article_publish_track.LIBRARY_STATE
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setLibraryState(String libraryState) {
+        this.libraryState = libraryState;
+    }
+    
+	public Date getTimestamp() {
+		return this.timestamp;
+	}
+
+	public void setTimestamp(Date timestamp) {
+		this.timestamp = timestamp;
+	}
+
+	public String getAgentCode() {
+		return this.agentCode;
+	}
+
+	public void setAgentCode(String agentCode) {
+		this.agentCode = agentCode;
+	}
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishTrackExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishTrackExample.java
new file mode 100644
index 000000000..f0d9bbbb1
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticlePublishTrackExample.java
@@ -0,0 +1,1694 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class ArticlePublishTrackExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public ArticlePublishTrackExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andPublishIdIsNull() {
+            addCriterion("PUBLISH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIsNotNull() {
+            addCriterion("PUBLISH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdEqualTo(String value) {
+            addCriterion("PUBLISH_ID =", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotEqualTo(String value) {
+            addCriterion("PUBLISH_ID <>", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdGreaterThan(String value) {
+            addCriterion("PUBLISH_ID >", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_ID >=", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLessThan(String value) {
+            addCriterion("PUBLISH_ID <", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_ID <=", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLike(String value) {
+            addCriterion("PUBLISH_ID like", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotLike(String value) {
+            addCriterion("PUBLISH_ID not like", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIn(List<String> values) {
+            addCriterion("PUBLISH_ID in", values, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotIn(List<String> values) {
+            addCriterion("PUBLISH_ID not in", values, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdBetween(String value1, String value2) {
+            addCriterion("PUBLISH_ID between", value1, value2, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_ID not between", value1, value2, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("USER_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("USER_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("USER_ID =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("USER_ID <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("USER_ID >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("USER_ID >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("USER_ID <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("USER_ID <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLike(String value) {
+            addCriterion("USER_ID like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("USER_ID not like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("USER_ID in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("USER_ID not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("USER_ID between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("USER_ID not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNull() {
+            addCriterion("ARTICLE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNotNull() {
+            addCriterion("ARTICLE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdEqualTo(String value) {
+            addCriterion("ARTICLE_ID =", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotEqualTo(String value) {
+            addCriterion("ARTICLE_ID <>", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThan(String value) {
+            addCriterion("ARTICLE_ID >", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_ID >=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThan(String value) {
+            addCriterion("ARTICLE_ID <", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_ID <=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLike(String value) {
+            addCriterion("ARTICLE_ID like", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotLike(String value) {
+            addCriterion("ARTICLE_ID not like", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIn(List<String> values) {
+            addCriterion("ARTICLE_ID in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotIn(List<String> values) {
+            addCriterion("ARTICLE_ID not in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdBetween(String value1, String value2) {
+            addCriterion("ARTICLE_ID between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotBetween(String value1, String value2) {
+            addCriterion("ARTICLE_ID not between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+        
+		public Criteria andArticleVersionIsNull() {
+			addCriterion("ARTICLE_VERSION is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionIsNotNull() {
+			addCriterion("ARTICLE_VERSION is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionEqualTo(String value) {
+			addCriterion("ARTICLE_VERSION =", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionNotEqualTo(String value) {
+			addCriterion("ARTICLE_VERSION <>", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionGreaterThan(String value) {
+			addCriterion("ARTICLE_VERSION >", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionGreaterThanOrEqualTo(String value) {
+			addCriterion("ARTICLE_VERSION >=", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionLessThan(String value) {
+			addCriterion("ARTICLE_VERSION <", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionLessThanOrEqualTo(String value) {
+			addCriterion("ARTICLE_VERSION <=", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionLike(String value) {
+			addCriterion("ARTICLE_VERSION like", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionNotLike(String value) {
+			addCriterion("ARTICLE_VERSION not like", value, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionIn(List<String> values) {
+			addCriterion("ARTICLE_VERSION in", values, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionNotIn(List<String> values) {
+			addCriterion("ARTICLE_VERSION not in", values, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionBetween(String value1, String value2) {
+			addCriterion("ARTICLE_VERSION between", value1, value2, "articleVersion");
+			return (Criteria) this;
+		}
+
+		public Criteria andArticleVersionNotBetween(String value1, String value2) {
+			addCriterion("ARTICLE_VERSION not between", value1, value2, "articleVersion");
+			return (Criteria) this;
+		}
+        
+        public Criteria andAdIdIsNull() {
+            addCriterion("AD_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdIsNotNull() {
+            addCriterion("AD_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdEqualTo(String value) {
+            addCriterion("AD_ID =", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotEqualTo(String value) {
+            addCriterion("AD_ID <>", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdGreaterThan(String value) {
+            addCriterion("AD_ID >", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_ID >=", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdLessThan(String value) {
+            addCriterion("AD_ID <", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdLessThanOrEqualTo(String value) {
+            addCriterion("AD_ID <=", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdLike(String value) {
+            addCriterion("AD_ID like", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotLike(String value) {
+            addCriterion("AD_ID not like", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdIn(List<String> values) {
+            addCriterion("AD_ID in", values, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotIn(List<String> values) {
+            addCriterion("AD_ID not in", values, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdBetween(String value1, String value2) {
+            addCriterion("AD_ID between", value1, value2, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotBetween(String value1, String value2) {
+            addCriterion("AD_ID not between", value1, value2, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdIsNull() {
+            addCriterion("CARD_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdIsNotNull() {
+            addCriterion("CARD_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdEqualTo(String value) {
+            addCriterion("CARD_ID =", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdNotEqualTo(String value) {
+            addCriterion("CARD_ID <>", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdGreaterThan(String value) {
+            addCriterion("CARD_ID >", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdGreaterThanOrEqualTo(String value) {
+            addCriterion("CARD_ID >=", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdLessThan(String value) {
+            addCriterion("CARD_ID <", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdLessThanOrEqualTo(String value) {
+            addCriterion("CARD_ID <=", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdLike(String value) {
+            addCriterion("CARD_ID like", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdNotLike(String value) {
+            addCriterion("CARD_ID not like", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdIn(List<String> values) {
+            addCriterion("CARD_ID in", values, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdNotIn(List<String> values) {
+            addCriterion("CARD_ID not in", values, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdBetween(String value1, String value2) {
+            addCriterion("CARD_ID between", value1, value2, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdNotBetween(String value1, String value2) {
+            addCriterion("CARD_ID not between", value1, value2, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlIsNull() {
+            addCriterion("PUBLISH_VIEW_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlIsNotNull() {
+            addCriterion("PUBLISH_VIEW_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlEqualTo(String value) {
+            addCriterion("PUBLISH_VIEW_URL =", value, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlNotEqualTo(String value) {
+            addCriterion("PUBLISH_VIEW_URL <>", value, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlGreaterThan(String value) {
+            addCriterion("PUBLISH_VIEW_URL >", value, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_VIEW_URL >=", value, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlLessThan(String value) {
+            addCriterion("PUBLISH_VIEW_URL <", value, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_VIEW_URL <=", value, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlLike(String value) {
+            addCriterion("PUBLISH_VIEW_URL like", value, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlNotLike(String value) {
+            addCriterion("PUBLISH_VIEW_URL not like", value, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlIn(List<String> values) {
+            addCriterion("PUBLISH_VIEW_URL in", values, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlNotIn(List<String> values) {
+            addCriterion("PUBLISH_VIEW_URL not in", values, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlBetween(String value1, String value2) {
+            addCriterion("PUBLISH_VIEW_URL between", value1, value2, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishViewUrlNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_VIEW_URL not between", value1, value2, "publishViewUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlIsNull() {
+            addCriterion("PUBLISH_EDIT_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlIsNotNull() {
+            addCriterion("PUBLISH_EDIT_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlEqualTo(String value) {
+            addCriterion("PUBLISH_EDIT_URL =", value, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlNotEqualTo(String value) {
+            addCriterion("PUBLISH_EDIT_URL <>", value, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlGreaterThan(String value) {
+            addCriterion("PUBLISH_EDIT_URL >", value, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_EDIT_URL >=", value, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlLessThan(String value) {
+            addCriterion("PUBLISH_EDIT_URL <", value, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_EDIT_URL <=", value, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlLike(String value) {
+            addCriterion("PUBLISH_EDIT_URL like", value, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlNotLike(String value) {
+            addCriterion("PUBLISH_EDIT_URL not like", value, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlIn(List<String> values) {
+            addCriterion("PUBLISH_EDIT_URL in", values, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlNotIn(List<String> values) {
+            addCriterion("PUBLISH_EDIT_URL not in", values, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlBetween(String value1, String value2) {
+            addCriterion("PUBLISH_EDIT_URL between", value1, value2, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishEditUrlNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_EDIT_URL not between", value1, value2, "publishEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateIsNull() {
+            addCriterion("PUBLISH_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateIsNotNull() {
+            addCriterion("PUBLISH_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateEqualTo(String value) {
+            addCriterion("PUBLISH_STATE =", value, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateNotEqualTo(String value) {
+            addCriterion("PUBLISH_STATE <>", value, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateGreaterThan(String value) {
+            addCriterion("PUBLISH_STATE >", value, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_STATE >=", value, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateLessThan(String value) {
+            addCriterion("PUBLISH_STATE <", value, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_STATE <=", value, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateLike(String value) {
+            addCriterion("PUBLISH_STATE like", value, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateNotLike(String value) {
+            addCriterion("PUBLISH_STATE not like", value, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateIn(List<String> values) {
+            addCriterion("PUBLISH_STATE in", values, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateNotIn(List<String> values) {
+            addCriterion("PUBLISH_STATE not in", values, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateBetween(String value1, String value2) {
+            addCriterion("PUBLISH_STATE between", value1, value2, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishStateNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_STATE not between", value1, value2, "publishState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlIsNull() {
+            addCriterion("BACKGROUND_EDIT_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlIsNotNull() {
+            addCriterion("BACKGROUND_EDIT_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlEqualTo(String value) {
+            addCriterion("BACKGROUND_EDIT_URL =", value, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlNotEqualTo(String value) {
+            addCriterion("BACKGROUND_EDIT_URL <>", value, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlGreaterThan(String value) {
+            addCriterion("BACKGROUND_EDIT_URL >", value, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("BACKGROUND_EDIT_URL >=", value, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlLessThan(String value) {
+            addCriterion("BACKGROUND_EDIT_URL <", value, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlLessThanOrEqualTo(String value) {
+            addCriterion("BACKGROUND_EDIT_URL <=", value, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlLike(String value) {
+            addCriterion("BACKGROUND_EDIT_URL like", value, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlNotLike(String value) {
+            addCriterion("BACKGROUND_EDIT_URL not like", value, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlIn(List<String> values) {
+            addCriterion("BACKGROUND_EDIT_URL in", values, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlNotIn(List<String> values) {
+            addCriterion("BACKGROUND_EDIT_URL not in", values, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlBetween(String value1, String value2) {
+            addCriterion("BACKGROUND_EDIT_URL between", value1, value2, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andBackgroundEditUrlNotBetween(String value1, String value2) {
+            addCriterion("BACKGROUND_EDIT_URL not between", value1, value2, "backgroundEditUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateIsNull() {
+            addCriterion("LIBRARY_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateIsNotNull() {
+            addCriterion("LIBRARY_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateEqualTo(String value) {
+            addCriterion("LIBRARY_STATE =", value, "libraryState");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateNotEqualTo(String value) {
+            addCriterion("LIBRARY_STATE <>", value, "libraryState");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateGreaterThan(String value) {
+            addCriterion("LIBRARY_STATE >", value, "libraryState");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateGreaterThanOrEqualTo(String value) {
+            addCriterion("LIBRARY_STATE >=", value, "libraryState");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateLessThan(String value) {
+            addCriterion("LIBRARY_STATE <", value, "libraryState");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateLessThanOrEqualTo(String value) {
+            addCriterion("LIBRARY_STATE <=", value, "libraryState");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateLike(String value) {
+            addCriterion("LIBRARY_STATE like", value, "libraryState");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateNotLike(String value) {
+            addCriterion("LIBRARY_STATE not like", value, "libraryState");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateIn(List<String> values) {
+            addCriterion("LIBRARY_STATE in", values, "libraryState");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateNotIn(List<String> values) {
+            addCriterion("LIBRARY_STATE not in", values, "libraryState");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateBetween(String value1, String value2) {
+            addCriterion("LIBRARY_STATE between", value1, value2, "libraryState");
+            return (Criteria) this;
+        }
+
+        public Criteria andLibraryStateNotBetween(String value1, String value2) {
+            addCriterion("LIBRARY_STATE not between", value1, value2, "libraryState");
+            return (Criteria) this;
+        }
+        
+		public Criteria andTimestampIsNull() {
+			addCriterion("TIMESTAMP is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimestampIsNotNull() {
+			addCriterion("TIMESTAMP is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimestampEqualTo(Date value) {
+			addCriterion("TIMESTAMP =", value, "timestamp");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimestampNotEqualTo(Date value) {
+			addCriterion("TIMESTAMP <>", value, "timestamp");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimestampGreaterThan(Date value) {
+			addCriterion("TIMESTAMP >", value, "timestamp");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimestampGreaterThanOrEqualTo(Date value) {
+			addCriterion("TIMESTAMP >=", value, "timestamp");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimestampLessThan(Date value) {
+			addCriterion("TIMESTAMP <", value, "timestamp");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimestampLessThanOrEqualTo(Date value) {
+			addCriterion("TIMESTAMP <=", value, "timestamp");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimestampIn(List<Date> values) {
+			addCriterion("TIMESTAMP in", values, "timestamp");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimestampNotIn(List<Date> values) {
+			addCriterion("TIMESTAMP not in", values, "timestamp");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimestampBetween(Date value1, Date value2) {
+			addCriterion("TIMESTAMP between", value1, value2, "timestamp");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimestampNotBetween(Date value1, Date value2) {
+			addCriterion("TIMESTAMP not between", value1, value2, "timestamp");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeIsNull() {
+			addCriterion("AGENT_CODE is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeIsNotNull() {
+			addCriterion("AGENT_CODE is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeEqualTo(String value) {
+			addCriterion("AGENT_CODE =", value, "agentCode");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeNotEqualTo(String value) {
+			addCriterion("AGENT_CODE <>", value, "agentCode");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeGreaterThan(String value) {
+			addCriterion("AGENT_CODE >", value, "agentCode");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeGreaterThanOrEqualTo(String value) {
+			addCriterion("AGENT_CODE >=", value, "agentCode");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeLessThan(String value) {
+			addCriterion("AGENT_CODE <", value, "agentCode");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeLessThanOrEqualTo(String value) {
+			addCriterion("AGENT_CODE <=", value, "agentCode");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeLike(String value) {
+			addCriterion("AGENT_CODE like", value, "agentCode");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeNotLike(String value) {
+			addCriterion("AGENT_CODE not like", value, "agentCode");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeIn(List<String> values) {
+			addCriterion("AGENT_CODE in", values, "agentCode");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeNotIn(List<String> values) {
+			addCriterion("AGENT_CODE not in", values, "agentCode");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeBetween(String value1, String value2) {
+			addCriterion("AGENT_CODE between", value1, value2, "agentCode");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentCodeNotBetween(String value1, String value2) {
+			addCriterion("AGENT_CODE not between", value1, value2, "agentCode");
+			return (Criteria) this;
+		}
+        
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_publish_track
+     *
+     * @mbggenerated do_not_delete_during_merge Fri Jul 27 10:31:00 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrl.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrl.java
new file mode 100644
index 000000000..b62d559dc
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrl.java
@@ -0,0 +1,291 @@
+package com.ruoyi.content.domain;
+
+public class ArticleSendUrl {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_send_url.PUBLISH_ID
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    private String publishId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_send_url.VERSION_NUMBER
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    private String versionNumber;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_send_url.QYH_ARTICLE_URL
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    private String qyhArticleUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_send_url.CREATE_DATE
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_send_url.CREATE_TIME
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_send_url.CREATE_USER
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_send_url.UPDATE_USER
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_send_url.UPDATE_DATE
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column article_send_url.UPDATE_TIME
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_send_url.PUBLISH_ID
+     *
+     * @return the value of article_send_url.PUBLISH_ID
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public String getPublishId() {
+        return publishId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_send_url.PUBLISH_ID
+     *
+     * @param publishId the value for article_send_url.PUBLISH_ID
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void setPublishId(String publishId) {
+        this.publishId = publishId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_send_url.VERSION_NUMBER
+     *
+     * @return the value of article_send_url.VERSION_NUMBER
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public String getVersionNumber() {
+        return versionNumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_send_url.VERSION_NUMBER
+     *
+     * @param versionNumber the value for article_send_url.VERSION_NUMBER
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void setVersionNumber(String versionNumber) {
+        this.versionNumber = versionNumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_send_url.QYH_ARTICLE_URL
+     *
+     * @return the value of article_send_url.QYH_ARTICLE_URL
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public String getQyhArticleUrl() {
+        return qyhArticleUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_send_url.QYH_ARTICLE_URL
+     *
+     * @param qyhArticleUrl the value for article_send_url.QYH_ARTICLE_URL
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void setQyhArticleUrl(String qyhArticleUrl) {
+        this.qyhArticleUrl = qyhArticleUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_send_url.CREATE_DATE
+     *
+     * @return the value of article_send_url.CREATE_DATE
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_send_url.CREATE_DATE
+     *
+     * @param createDate the value for article_send_url.CREATE_DATE
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_send_url.CREATE_TIME
+     *
+     * @return the value of article_send_url.CREATE_TIME
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_send_url.CREATE_TIME
+     *
+     * @param createTime the value for article_send_url.CREATE_TIME
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_send_url.CREATE_USER
+     *
+     * @return the value of article_send_url.CREATE_USER
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_send_url.CREATE_USER
+     *
+     * @param createUser the value for article_send_url.CREATE_USER
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_send_url.UPDATE_USER
+     *
+     * @return the value of article_send_url.UPDATE_USER
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_send_url.UPDATE_USER
+     *
+     * @param updateUser the value for article_send_url.UPDATE_USER
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_send_url.UPDATE_DATE
+     *
+     * @return the value of article_send_url.UPDATE_DATE
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_send_url.UPDATE_DATE
+     *
+     * @param updateDate the value for article_send_url.UPDATE_DATE
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column article_send_url.UPDATE_TIME
+     *
+     * @return the value of article_send_url.UPDATE_TIME
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column article_send_url.UPDATE_TIME
+     *
+     * @param updateTime the value for article_send_url.UPDATE_TIME
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrlExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrlExample.java
new file mode 100644
index 000000000..7c3b5a455
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrlExample.java
@@ -0,0 +1,932 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ArticleSendUrlExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public ArticleSendUrlExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andPublishIdIsNull() {
+            addCriterion("PUBLISH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIsNotNull() {
+            addCriterion("PUBLISH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdEqualTo(String value) {
+            addCriterion("PUBLISH_ID =", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotEqualTo(String value) {
+            addCriterion("PUBLISH_ID <>", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdGreaterThan(String value) {
+            addCriterion("PUBLISH_ID >", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_ID >=", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLessThan(String value) {
+            addCriterion("PUBLISH_ID <", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_ID <=", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdLike(String value) {
+            addCriterion("PUBLISH_ID like", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotLike(String value) {
+            addCriterion("PUBLISH_ID not like", value, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdIn(List<String> values) {
+            addCriterion("PUBLISH_ID in", values, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotIn(List<String> values) {
+            addCriterion("PUBLISH_ID not in", values, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdBetween(String value1, String value2) {
+            addCriterion("PUBLISH_ID between", value1, value2, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishIdNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_ID not between", value1, value2, "publishId");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberIsNull() {
+            addCriterion("VERSION_NUMBER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberIsNotNull() {
+            addCriterion("VERSION_NUMBER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberEqualTo(String value) {
+            addCriterion("VERSION_NUMBER =", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberNotEqualTo(String value) {
+            addCriterion("VERSION_NUMBER <>", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberGreaterThan(String value) {
+            addCriterion("VERSION_NUMBER >", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("VERSION_NUMBER >=", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberLessThan(String value) {
+            addCriterion("VERSION_NUMBER <", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberLessThanOrEqualTo(String value) {
+            addCriterion("VERSION_NUMBER <=", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberLike(String value) {
+            addCriterion("VERSION_NUMBER like", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberNotLike(String value) {
+            addCriterion("VERSION_NUMBER not like", value, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberIn(List<String> values) {
+            addCriterion("VERSION_NUMBER in", values, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberNotIn(List<String> values) {
+            addCriterion("VERSION_NUMBER not in", values, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberBetween(String value1, String value2) {
+            addCriterion("VERSION_NUMBER between", value1, value2, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andVersionNumberNotBetween(String value1, String value2) {
+            addCriterion("VERSION_NUMBER not between", value1, value2, "versionNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlIsNull() {
+            addCriterion("QYH_ARTICLE_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlIsNotNull() {
+            addCriterion("QYH_ARTICLE_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlEqualTo(String value) {
+            addCriterion("QYH_ARTICLE_URL =", value, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlNotEqualTo(String value) {
+            addCriterion("QYH_ARTICLE_URL <>", value, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlGreaterThan(String value) {
+            addCriterion("QYH_ARTICLE_URL >", value, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("QYH_ARTICLE_URL >=", value, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlLessThan(String value) {
+            addCriterion("QYH_ARTICLE_URL <", value, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlLessThanOrEqualTo(String value) {
+            addCriterion("QYH_ARTICLE_URL <=", value, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlLike(String value) {
+            addCriterion("QYH_ARTICLE_URL like", value, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlNotLike(String value) {
+            addCriterion("QYH_ARTICLE_URL not like", value, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlIn(List<String> values) {
+            addCriterion("QYH_ARTICLE_URL in", values, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlNotIn(List<String> values) {
+            addCriterion("QYH_ARTICLE_URL not in", values, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlBetween(String value1, String value2) {
+            addCriterion("QYH_ARTICLE_URL between", value1, value2, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQyhArticleUrlNotBetween(String value1, String value2) {
+            addCriterion("QYH_ARTICLE_URL not between", value1, value2, "qyhArticleUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_send_url
+     *
+     * @mbggenerated do_not_delete_during_merge Tue Sep 04 17:49:40 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleinfoExDTO.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleinfoExDTO.java
new file mode 100644
index 000000000..9bf4fd8a9
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleinfoExDTO.java
@@ -0,0 +1,238 @@
+package com.ruoyi.content.domain;
+
+public class ArticleinfoExDTO {
+
+    private Integer articleId;
+
+    private String articleName;
+
+    private String pushDate;
+
+    private String articleAuthor;
+
+    private String listPicUrl;
+
+    private String special;
+
+    private String channelId;
+
+    private String companyId;
+
+    private String originalUrl;
+
+    private String shareImgUrl;
+
+    private String shareTitle;
+
+    private String articleState;
+
+    private String shareDes;
+
+    private String createDate;
+
+    private String createTime;
+
+    private String createUser;
+
+    private String updateDate;
+
+    private String updateTime;
+
+    private String articleContent;
+
+    private String shareCount;//分享次数
+    
+    private String visitors;		//文章浏览人数
+    
+    private String publishViewUrl;
+    
+    private String publishEditUrl;
+
+
+	public Integer getArticleId() {
+		return articleId;
+	}
+
+	public void setArticleId(Integer articleId) {
+		this.articleId = articleId;
+	}
+
+	public String getArticleName() {
+		return articleName;
+	}
+
+	public void setArticleName(String articleName) {
+		this.articleName = articleName;
+	}
+
+	public String getPushDate() {
+		return pushDate;
+	}
+
+	public void setPushDate(String pushDate) {
+		this.pushDate = pushDate;
+	}
+
+	public String getArticleAuthor() {
+		return articleAuthor;
+	}
+
+	public void setArticleAuthor(String articleAuthor) {
+		this.articleAuthor = articleAuthor;
+	}
+
+	public String getListPicUrl() {
+		return listPicUrl;
+	}
+
+	public void setListPicUrl(String listPicUrl) {
+		this.listPicUrl = listPicUrl;
+	}
+
+	public String getSpecial() {
+		return special;
+	}
+
+	public void setSpecial(String special) {
+		this.special = special;
+	}
+
+	public String getChannelId() {
+		return channelId;
+	}
+
+	public void setChannelId(String channelId) {
+		this.channelId = channelId;
+	}
+
+	public String getCompanyId() {
+		return companyId;
+	}
+
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+
+	public String getOriginalUrl() {
+		return originalUrl;
+	}
+
+	public void setOriginalUrl(String originalUrl) {
+		this.originalUrl = originalUrl;
+	}
+
+	public String getShareImgUrl() {
+		return shareImgUrl;
+	}
+
+	public void setShareImgUrl(String shareImgUrl) {
+		this.shareImgUrl = shareImgUrl;
+	}
+
+	public String getShareTitle() {
+		return shareTitle;
+	}
+
+	public void setShareTitle(String shareTitle) {
+		this.shareTitle = shareTitle;
+	}
+
+	public String getArticleState() {
+		return articleState;
+	}
+
+	public void setArticleState(String articleState) {
+		this.articleState = articleState;
+	}
+
+	public String getShareDes() {
+		return shareDes;
+	}
+
+	public void setShareDes(String shareDes) {
+		this.shareDes = shareDes;
+	}
+
+	public String getCreateDate() {
+		return createDate;
+	}
+
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getCreateUser() {
+		return createUser;
+	}
+
+	public void setCreateUser(String createUser) {
+		this.createUser = createUser;
+	}
+
+	public String getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(String updateDate) {
+		this.updateDate = updateDate;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getArticleContent() {
+		return articleContent;
+	}
+
+	public void setArticleContent(String articleContent) {
+		this.articleContent = articleContent;
+	}
+
+	public String getShareCount() {
+		return shareCount;
+	}
+
+	public void setShareCount(String shareCount) {
+		this.shareCount = shareCount;
+	}
+
+	public String getVisitors() {
+		return visitors;
+	}
+
+	public void setVisitors(String visitors) {
+		this.visitors = visitors;
+	}
+
+	public String getPublishViewUrl() {
+		return publishViewUrl;
+	}
+
+	public void setPublishViewUrl(String publishViewUrl) {
+		this.publishViewUrl = publishViewUrl;
+	}
+
+	public String getPublishEditUrl() {
+		return publishEditUrl;
+	}
+
+	public void setPublishEditUrl(String publishEditUrl) {
+		this.publishEditUrl = publishEditUrl;
+	}
+   
+    
+    
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/AttachmentInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AttachmentInfo.java
new file mode 100644
index 000000000..1299980e9
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AttachmentInfo.java
@@ -0,0 +1,451 @@
+package com.ruoyi.content.domain;
+
+public class AttachmentInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.FILE_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private Integer fileId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.ARTICLE_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String articleId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.FILE_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String fileName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.FILE_OSSID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String fileOssid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.FILE_PATH
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String filePath;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.FILE_URL
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String fileUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.FILE_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String fileType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.RELATION_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String relationType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column attachment_info.REMARK
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String remark;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.FILE_ID
+     *
+     * @return the value of attachment_info.FILE_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Integer getFileId() {
+        return fileId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.FILE_ID
+     *
+     * @param fileId the value for attachment_info.FILE_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setFileId(Integer fileId) {
+        this.fileId = fileId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.ARTICLE_ID
+     *
+     * @return the value of attachment_info.ARTICLE_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getArticleId() {
+        return articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.ARTICLE_ID
+     *
+     * @param articleId the value for attachment_info.ARTICLE_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setArticleId(String articleId) {
+        this.articleId = articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.FILE_NAME
+     *
+     * @return the value of attachment_info.FILE_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getFileName() {
+        return fileName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.FILE_NAME
+     *
+     * @param fileName the value for attachment_info.FILE_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.FILE_OSSID
+     *
+     * @return the value of attachment_info.FILE_OSSID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getFileOssid() {
+        return fileOssid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.FILE_OSSID
+     *
+     * @param fileOssid the value for attachment_info.FILE_OSSID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setFileOssid(String fileOssid) {
+        this.fileOssid = fileOssid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.FILE_PATH
+     *
+     * @return the value of attachment_info.FILE_PATH
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getFilePath() {
+        return filePath;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.FILE_PATH
+     *
+     * @param filePath the value for attachment_info.FILE_PATH
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.FILE_URL
+     *
+     * @return the value of attachment_info.FILE_URL
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getFileUrl() {
+        return fileUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.FILE_URL
+     *
+     * @param fileUrl the value for attachment_info.FILE_URL
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setFileUrl(String fileUrl) {
+        this.fileUrl = fileUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.FILE_TYPE
+     *
+     * @return the value of attachment_info.FILE_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getFileType() {
+        return fileType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.FILE_TYPE
+     *
+     * @param fileType the value for attachment_info.FILE_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setFileType(String fileType) {
+        this.fileType = fileType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.RELATION_TYPE
+     *
+     * @return the value of attachment_info.RELATION_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getRelationType() {
+        return relationType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.RELATION_TYPE
+     *
+     * @param relationType the value for attachment_info.RELATION_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setRelationType(String relationType) {
+        this.relationType = relationType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.CREATE_DATE
+     *
+     * @return the value of attachment_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.CREATE_DATE
+     *
+     * @param createDate the value for attachment_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.CREATE_TIME
+     *
+     * @return the value of attachment_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.CREATE_TIME
+     *
+     * @param createTime the value for attachment_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.CREATE_USER
+     *
+     * @return the value of attachment_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.CREATE_USER
+     *
+     * @param createUser the value for attachment_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.UPDATE_DATE
+     *
+     * @return the value of attachment_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.UPDATE_DATE
+     *
+     * @param updateDate the value for attachment_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.UPDATE_TIME
+     *
+     * @return the value of attachment_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.UPDATE_TIME
+     *
+     * @param updateTime the value for attachment_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column attachment_info.REMARK
+     *
+     * @return the value of attachment_info.REMARK
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column attachment_info.REMARK
+     *
+     * @param remark the value for attachment_info.REMARK
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/AttachmentInfoExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AttachmentInfoExample.java
new file mode 100644
index 000000000..e0b13f3f6
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AttachmentInfoExample.java
@@ -0,0 +1,1272 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class AttachmentInfoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public AttachmentInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andFileIdIsNull() {
+            addCriterion("FILE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileIdIsNotNull() {
+            addCriterion("FILE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileIdEqualTo(Integer value) {
+            addCriterion("FILE_ID =", value, "fileId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileIdNotEqualTo(Integer value) {
+            addCriterion("FILE_ID <>", value, "fileId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileIdGreaterThan(Integer value) {
+            addCriterion("FILE_ID >", value, "fileId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("FILE_ID >=", value, "fileId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileIdLessThan(Integer value) {
+            addCriterion("FILE_ID <", value, "fileId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileIdLessThanOrEqualTo(Integer value) {
+            addCriterion("FILE_ID <=", value, "fileId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileIdIn(List<Integer> values) {
+            addCriterion("FILE_ID in", values, "fileId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileIdNotIn(List<Integer> values) {
+            addCriterion("FILE_ID not in", values, "fileId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileIdBetween(Integer value1, Integer value2) {
+            addCriterion("FILE_ID between", value1, value2, "fileId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("FILE_ID not between", value1, value2, "fileId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNull() {
+            addCriterion("ARTICLE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNotNull() {
+            addCriterion("ARTICLE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdEqualTo(String value) {
+            addCriterion("ARTICLE_ID =", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotEqualTo(String value) {
+            addCriterion("ARTICLE_ID <>", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThan(String value) {
+            addCriterion("ARTICLE_ID >", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_ID >=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThan(String value) {
+            addCriterion("ARTICLE_ID <", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_ID <=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLike(String value) {
+            addCriterion("ARTICLE_ID like", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotLike(String value) {
+            addCriterion("ARTICLE_ID not like", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIn(List<String> values) {
+            addCriterion("ARTICLE_ID in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotIn(List<String> values) {
+            addCriterion("ARTICLE_ID not in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdBetween(String value1, String value2) {
+            addCriterion("ARTICLE_ID between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotBetween(String value1, String value2) {
+            addCriterion("ARTICLE_ID not between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameIsNull() {
+            addCriterion("FILE_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameIsNotNull() {
+            addCriterion("FILE_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameEqualTo(String value) {
+            addCriterion("FILE_NAME =", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotEqualTo(String value) {
+            addCriterion("FILE_NAME <>", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameGreaterThan(String value) {
+            addCriterion("FILE_NAME >", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameGreaterThanOrEqualTo(String value) {
+            addCriterion("FILE_NAME >=", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameLessThan(String value) {
+            addCriterion("FILE_NAME <", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameLessThanOrEqualTo(String value) {
+            addCriterion("FILE_NAME <=", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameLike(String value) {
+            addCriterion("FILE_NAME like", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotLike(String value) {
+            addCriterion("FILE_NAME not like", value, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameIn(List<String> values) {
+            addCriterion("FILE_NAME in", values, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotIn(List<String> values) {
+            addCriterion("FILE_NAME not in", values, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameBetween(String value1, String value2) {
+            addCriterion("FILE_NAME between", value1, value2, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileNameNotBetween(String value1, String value2) {
+            addCriterion("FILE_NAME not between", value1, value2, "fileName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidIsNull() {
+            addCriterion("FILE_OSSID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidIsNotNull() {
+            addCriterion("FILE_OSSID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidEqualTo(String value) {
+            addCriterion("FILE_OSSID =", value, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidNotEqualTo(String value) {
+            addCriterion("FILE_OSSID <>", value, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidGreaterThan(String value) {
+            addCriterion("FILE_OSSID >", value, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidGreaterThanOrEqualTo(String value) {
+            addCriterion("FILE_OSSID >=", value, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidLessThan(String value) {
+            addCriterion("FILE_OSSID <", value, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidLessThanOrEqualTo(String value) {
+            addCriterion("FILE_OSSID <=", value, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidLike(String value) {
+            addCriterion("FILE_OSSID like", value, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidNotLike(String value) {
+            addCriterion("FILE_OSSID not like", value, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidIn(List<String> values) {
+            addCriterion("FILE_OSSID in", values, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidNotIn(List<String> values) {
+            addCriterion("FILE_OSSID not in", values, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidBetween(String value1, String value2) {
+            addCriterion("FILE_OSSID between", value1, value2, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileOssidNotBetween(String value1, String value2) {
+            addCriterion("FILE_OSSID not between", value1, value2, "fileOssid");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathIsNull() {
+            addCriterion("FILE_PATH is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathIsNotNull() {
+            addCriterion("FILE_PATH is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathEqualTo(String value) {
+            addCriterion("FILE_PATH =", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathNotEqualTo(String value) {
+            addCriterion("FILE_PATH <>", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathGreaterThan(String value) {
+            addCriterion("FILE_PATH >", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathGreaterThanOrEqualTo(String value) {
+            addCriterion("FILE_PATH >=", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathLessThan(String value) {
+            addCriterion("FILE_PATH <", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathLessThanOrEqualTo(String value) {
+            addCriterion("FILE_PATH <=", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathLike(String value) {
+            addCriterion("FILE_PATH like", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathNotLike(String value) {
+            addCriterion("FILE_PATH not like", value, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathIn(List<String> values) {
+            addCriterion("FILE_PATH in", values, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathNotIn(List<String> values) {
+            addCriterion("FILE_PATH not in", values, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathBetween(String value1, String value2) {
+            addCriterion("FILE_PATH between", value1, value2, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFilePathNotBetween(String value1, String value2) {
+            addCriterion("FILE_PATH not between", value1, value2, "filePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlIsNull() {
+            addCriterion("FILE_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlIsNotNull() {
+            addCriterion("FILE_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlEqualTo(String value) {
+            addCriterion("FILE_URL =", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlNotEqualTo(String value) {
+            addCriterion("FILE_URL <>", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlGreaterThan(String value) {
+            addCriterion("FILE_URL >", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("FILE_URL >=", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlLessThan(String value) {
+            addCriterion("FILE_URL <", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlLessThanOrEqualTo(String value) {
+            addCriterion("FILE_URL <=", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlLike(String value) {
+            addCriterion("FILE_URL like", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlNotLike(String value) {
+            addCriterion("FILE_URL not like", value, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlIn(List<String> values) {
+            addCriterion("FILE_URL in", values, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlNotIn(List<String> values) {
+            addCriterion("FILE_URL not in", values, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlBetween(String value1, String value2) {
+            addCriterion("FILE_URL between", value1, value2, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileUrlNotBetween(String value1, String value2) {
+            addCriterion("FILE_URL not between", value1, value2, "fileUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeIsNull() {
+            addCriterion("FILE_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeIsNotNull() {
+            addCriterion("FILE_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeEqualTo(String value) {
+            addCriterion("FILE_TYPE =", value, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeNotEqualTo(String value) {
+            addCriterion("FILE_TYPE <>", value, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeGreaterThan(String value) {
+            addCriterion("FILE_TYPE >", value, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("FILE_TYPE >=", value, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeLessThan(String value) {
+            addCriterion("FILE_TYPE <", value, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeLessThanOrEqualTo(String value) {
+            addCriterion("FILE_TYPE <=", value, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeLike(String value) {
+            addCriterion("FILE_TYPE like", value, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeNotLike(String value) {
+            addCriterion("FILE_TYPE not like", value, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeIn(List<String> values) {
+            addCriterion("FILE_TYPE in", values, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeNotIn(List<String> values) {
+            addCriterion("FILE_TYPE not in", values, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeBetween(String value1, String value2) {
+            addCriterion("FILE_TYPE between", value1, value2, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andFileTypeNotBetween(String value1, String value2) {
+            addCriterion("FILE_TYPE not between", value1, value2, "fileType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeIsNull() {
+            addCriterion("RELATION_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeIsNotNull() {
+            addCriterion("RELATION_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeEqualTo(String value) {
+            addCriterion("RELATION_TYPE =", value, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeNotEqualTo(String value) {
+            addCriterion("RELATION_TYPE <>", value, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeGreaterThan(String value) {
+            addCriterion("RELATION_TYPE >", value, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("RELATION_TYPE >=", value, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeLessThan(String value) {
+            addCriterion("RELATION_TYPE <", value, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeLessThanOrEqualTo(String value) {
+            addCriterion("RELATION_TYPE <=", value, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeLike(String value) {
+            addCriterion("RELATION_TYPE like", value, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeNotLike(String value) {
+            addCriterion("RELATION_TYPE not like", value, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeIn(List<String> values) {
+            addCriterion("RELATION_TYPE in", values, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeNotIn(List<String> values) {
+            addCriterion("RELATION_TYPE not in", values, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeBetween(String value1, String value2) {
+            addCriterion("RELATION_TYPE between", value1, value2, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andRelationTypeNotBetween(String value1, String value2) {
+            addCriterion("RELATION_TYPE not between", value1, value2, "relationType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("REMARK is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("REMARK is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("REMARK =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("REMARK <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("REMARK >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("REMARK >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("REMARK <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("REMARK <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("REMARK like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("REMARK not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("REMARK in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("REMARK not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("REMARK between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("REMARK not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table attachment_info
+     *
+     * @mbggenerated do_not_delete_during_merge Mon Mar 26 15:46:22 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/AuthorityExDto.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AuthorityExDto.java
new file mode 100644
index 000000000..de4ea0ab0
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/AuthorityExDto.java
@@ -0,0 +1,40 @@
+package com.ruoyi.content.domain;
+
+public class AuthorityExDto {
+
+	private String id;
+	private String level;
+	private String type;
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	private String  operatorRoleName;
+	private String  operatorRolePath;
+	public String getId() {
+		return id;
+	}
+	public void setId(String id) {
+		this.id = id;
+	}
+	public String getLevel() {
+		return level;
+	}
+	public void setLevel(String level) {
+		this.level = level;
+	}
+	public String getOperatorRoleName() {
+		return operatorRoleName;
+	}
+	public void setOperatorRoleName(String operatorRoleName) {
+		this.operatorRoleName = operatorRoleName;
+	}
+	public String getOperatorRolePath() {
+		return operatorRolePath;
+	}
+	public void setOperatorRolePath(String operatorRolePath) {
+		this.operatorRolePath = operatorRolePath;
+	}
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCodeTree.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCodeTree.java
new file mode 100644
index 000000000..5ba2e0ffe
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseCodeTree.java
@@ -0,0 +1,130 @@
+package com.ruoyi.content.domain;
+
+import java.util.Date;
+import java.util.List;
+
+public class BaseCodeTree {
+
+    private Integer id;
+    private String codeCode;
+    private String codeType;
+    private String orderNo;
+    private String codeCname;
+    private String codeEname;
+    private String codeTname;
+    private String state;
+    private String createUser;
+    private Date createTime;
+    private String updateUser;
+    private Date updateTime;
+    private String updateRemark;
+    private String businessArea;
+    private String companyId;
+    private String branchId;
+    private List<BaseCodeTree> child;
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getCodeCode() {
+		return codeCode;
+	}
+	public void setCodeCode(String codeCode) {
+		this.codeCode = codeCode;
+	}
+	public String getCodeType() {
+		return codeType;
+	}
+	public void setCodeType(String codeType) {
+		this.codeType = codeType;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getCodeCname() {
+		return codeCname;
+	}
+	public void setCodeCname(String codeCname) {
+		this.codeCname = codeCname;
+	}
+	public String getCodeEname() {
+		return codeEname;
+	}
+	public void setCodeEname(String codeEname) {
+		this.codeEname = codeEname;
+	}
+	public String getCodeTname() {
+		return codeTname;
+	}
+	public void setCodeTname(String codeTname) {
+		this.codeTname = codeTname;
+	}
+	public String getState() {
+		return state;
+	}
+	public void setState(String state) {
+		this.state = state;
+	}
+	public String getCreateUser() {
+		return createUser;
+	}
+	public void setCreateUser(String createUser) {
+		this.createUser = createUser;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public String getUpdateUser() {
+		return updateUser;
+	}
+	public void setUpdateUser(String updateUser) {
+		this.updateUser = updateUser;
+	}
+	public Date getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(Date updateTime) {
+		this.updateTime = updateTime;
+	}
+	public String getUpdateRemark() {
+		return updateRemark;
+	}
+	public void setUpdateRemark(String updateRemark) {
+		this.updateRemark = updateRemark;
+	}
+	public String getBusinessArea() {
+		return businessArea;
+	}
+	public void setBusinessArea(String businessArea) {
+		this.businessArea = businessArea;
+	}
+	public String getCompanyId() {
+		return companyId;
+	}
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+	public String getBranchId() {
+		return branchId;
+	}
+	public void setBranchId(String branchId) {
+		this.branchId = branchId;
+	}
+	public List<BaseCodeTree> getChild() {
+		return child;
+	}
+	public void setChild(List<BaseCodeTree> child) {
+		this.child = child;
+	}
+    
+    
+    
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseDTO.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseDTO.java
new file mode 100644
index 000000000..6ecb53db0
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/BaseDTO.java
@@ -0,0 +1,10 @@
+package com.ruoyi.content.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class BaseDTO {
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/BranchIdArticle.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/BranchIdArticle.java
new file mode 100644
index 000000000..f769970e5
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/BranchIdArticle.java
@@ -0,0 +1,65 @@
+package com.ruoyi.content.domain;
+
+import java.io.Serializable;
+
+public class BranchIdArticle implements Serializable{
+
+	private static final long serialVersionUID = -4566641360099978631L;
+
+	private String articleId;		
+	private String articleName;		
+	private String createDate;		
+	private String updateDate;
+	private String libraryState;
+	private String publishId;
+	private String name;
+	private String articleVersion;
+	public String getArticleId() {
+		return articleId;
+	}
+	public void setArticleId(String articleId) {
+		this.articleId = articleId;
+	}
+	public String getArticleName() {
+		return articleName;
+	}
+	public void setArticleName(String articleName) {
+		this.articleName = articleName;
+	}
+	public String getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+	public String getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(String updateDate) {
+		this.updateDate = updateDate;
+	}
+	public String getLibraryState() {
+		return libraryState;
+	}
+	public void setLibraryState(String libraryState) {
+		this.libraryState = libraryState;
+	}
+	public String getPublishId() {
+		return publishId;
+	}
+	public void setPublishId(String publishId) {
+		this.publishId = publishId;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getArticleVersion() {
+		return this.articleVersion;
+	}
+	public void setArticleVersion(String articleVersion) {
+		this.articleVersion = articleVersion;
+	}
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CardInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CardInfo.java
new file mode 100644
index 000000000..24782c2fe
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CardInfo.java
@@ -0,0 +1,515 @@
+package com.ruoyi.content.domain;
+
+public class CardInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CARD_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private Integer cardId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CARD_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String cardType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CARD_IMAGE_URL
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String cardImageUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CARD_TITLE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String cardTitle;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CARD_NAME1
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String cardName1;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CARD_NAME2
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String cardName2;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CARD_LINK1
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String cardLink1;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CARD_LINK2
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String cardLink2;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CARD_STATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String cardState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column card_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CARD_ID
+     *
+     * @return the value of card_info.CARD_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Integer getCardId() {
+        return cardId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CARD_ID
+     *
+     * @param cardId the value for card_info.CARD_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCardId(Integer cardId) {
+        this.cardId = cardId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.COMPANY_ID
+     *
+     * @return the value of card_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.COMPANY_ID
+     *
+     * @param companyId the value for card_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CARD_TYPE
+     *
+     * @return the value of card_info.CARD_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCardType() {
+        return cardType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CARD_TYPE
+     *
+     * @param cardType the value for card_info.CARD_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCardType(String cardType) {
+        this.cardType = cardType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CARD_IMAGE_URL
+     *
+     * @return the value of card_info.CARD_IMAGE_URL
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCardImageUrl() {
+        return cardImageUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CARD_IMAGE_URL
+     *
+     * @param cardImageUrl the value for card_info.CARD_IMAGE_URL
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCardImageUrl(String cardImageUrl) {
+        this.cardImageUrl = cardImageUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CARD_TITLE
+     *
+     * @return the value of card_info.CARD_TITLE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCardTitle() {
+        return cardTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CARD_TITLE
+     *
+     * @param cardTitle the value for card_info.CARD_TITLE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCardTitle(String cardTitle) {
+        this.cardTitle = cardTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CARD_NAME1
+     *
+     * @return the value of card_info.CARD_NAME1
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCardName1() {
+        return cardName1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CARD_NAME1
+     *
+     * @param cardName1 the value for card_info.CARD_NAME1
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCardName1(String cardName1) {
+        this.cardName1 = cardName1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CARD_NAME2
+     *
+     * @return the value of card_info.CARD_NAME2
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCardName2() {
+        return cardName2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CARD_NAME2
+     *
+     * @param cardName2 the value for card_info.CARD_NAME2
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCardName2(String cardName2) {
+        this.cardName2 = cardName2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CARD_LINK1
+     *
+     * @return the value of card_info.CARD_LINK1
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCardLink1() {
+        return cardLink1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CARD_LINK1
+     *
+     * @param cardLink1 the value for card_info.CARD_LINK1
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCardLink1(String cardLink1) {
+        this.cardLink1 = cardLink1;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CARD_LINK2
+     *
+     * @return the value of card_info.CARD_LINK2
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCardLink2() {
+        return cardLink2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CARD_LINK2
+     *
+     * @param cardLink2 the value for card_info.CARD_LINK2
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCardLink2(String cardLink2) {
+        this.cardLink2 = cardLink2;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CARD_STATE
+     *
+     * @return the value of card_info.CARD_STATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCardState() {
+        return cardState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CARD_STATE
+     *
+     * @param cardState the value for card_info.CARD_STATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCardState(String cardState) {
+        this.cardState = cardState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CREATE_DATE
+     *
+     * @return the value of card_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CREATE_DATE
+     *
+     * @param createDate the value for card_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CREATE_TIME
+     *
+     * @return the value of card_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CREATE_TIME
+     *
+     * @param createTime the value for card_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.CREATE_USER
+     *
+     * @return the value of card_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.CREATE_USER
+     *
+     * @param createUser the value for card_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.UPDATE_USER
+     *
+     * @return the value of card_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.UPDATE_USER
+     *
+     * @param updateUser the value for card_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.UPDATE_DATE
+     *
+     * @return the value of card_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.UPDATE_DATE
+     *
+     * @param updateDate the value for card_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column card_info.UPDATE_TIME
+     *
+     * @return the value of card_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column card_info.UPDATE_TIME
+     *
+     * @param updateTime the value for card_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CardInfoExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CardInfoExample.java
new file mode 100644
index 000000000..690a57d4e
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CardInfoExample.java
@@ -0,0 +1,1412 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CardInfoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public CardInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andCardIdIsNull() {
+            addCriterion("CARD_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdIsNotNull() {
+            addCriterion("CARD_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdEqualTo(Integer value) {
+            addCriterion("CARD_ID =", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdNotEqualTo(Integer value) {
+            addCriterion("CARD_ID <>", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdGreaterThan(Integer value) {
+            addCriterion("CARD_ID >", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("CARD_ID >=", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdLessThan(Integer value) {
+            addCriterion("CARD_ID <", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdLessThanOrEqualTo(Integer value) {
+            addCriterion("CARD_ID <=", value, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdIn(List<Integer> values) {
+            addCriterion("CARD_ID in", values, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdNotIn(List<Integer> values) {
+            addCriterion("CARD_ID not in", values, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdBetween(Integer value1, Integer value2) {
+            addCriterion("CARD_ID between", value1, value2, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("CARD_ID not between", value1, value2, "cardId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeIsNull() {
+            addCriterion("CARD_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeIsNotNull() {
+            addCriterion("CARD_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeEqualTo(String value) {
+            addCriterion("CARD_TYPE =", value, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeNotEqualTo(String value) {
+            addCriterion("CARD_TYPE <>", value, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeGreaterThan(String value) {
+            addCriterion("CARD_TYPE >", value, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("CARD_TYPE >=", value, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeLessThan(String value) {
+            addCriterion("CARD_TYPE <", value, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeLessThanOrEqualTo(String value) {
+            addCriterion("CARD_TYPE <=", value, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeLike(String value) {
+            addCriterion("CARD_TYPE like", value, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeNotLike(String value) {
+            addCriterion("CARD_TYPE not like", value, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeIn(List<String> values) {
+            addCriterion("CARD_TYPE in", values, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeNotIn(List<String> values) {
+            addCriterion("CARD_TYPE not in", values, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeBetween(String value1, String value2) {
+            addCriterion("CARD_TYPE between", value1, value2, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTypeNotBetween(String value1, String value2) {
+            addCriterion("CARD_TYPE not between", value1, value2, "cardType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlIsNull() {
+            addCriterion("CARD_IMAGE_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlIsNotNull() {
+            addCriterion("CARD_IMAGE_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlEqualTo(String value) {
+            addCriterion("CARD_IMAGE_URL =", value, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlNotEqualTo(String value) {
+            addCriterion("CARD_IMAGE_URL <>", value, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlGreaterThan(String value) {
+            addCriterion("CARD_IMAGE_URL >", value, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("CARD_IMAGE_URL >=", value, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlLessThan(String value) {
+            addCriterion("CARD_IMAGE_URL <", value, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlLessThanOrEqualTo(String value) {
+            addCriterion("CARD_IMAGE_URL <=", value, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlLike(String value) {
+            addCriterion("CARD_IMAGE_URL like", value, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlNotLike(String value) {
+            addCriterion("CARD_IMAGE_URL not like", value, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlIn(List<String> values) {
+            addCriterion("CARD_IMAGE_URL in", values, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlNotIn(List<String> values) {
+            addCriterion("CARD_IMAGE_URL not in", values, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlBetween(String value1, String value2) {
+            addCriterion("CARD_IMAGE_URL between", value1, value2, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImageUrlNotBetween(String value1, String value2) {
+            addCriterion("CARD_IMAGE_URL not between", value1, value2, "cardImageUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleIsNull() {
+            addCriterion("CARD_TITLE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleIsNotNull() {
+            addCriterion("CARD_TITLE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleEqualTo(String value) {
+            addCriterion("CARD_TITLE =", value, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleNotEqualTo(String value) {
+            addCriterion("CARD_TITLE <>", value, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleGreaterThan(String value) {
+            addCriterion("CARD_TITLE >", value, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("CARD_TITLE >=", value, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleLessThan(String value) {
+            addCriterion("CARD_TITLE <", value, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleLessThanOrEqualTo(String value) {
+            addCriterion("CARD_TITLE <=", value, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleLike(String value) {
+            addCriterion("CARD_TITLE like", value, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleNotLike(String value) {
+            addCriterion("CARD_TITLE not like", value, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleIn(List<String> values) {
+            addCriterion("CARD_TITLE in", values, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleNotIn(List<String> values) {
+            addCriterion("CARD_TITLE not in", values, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleBetween(String value1, String value2) {
+            addCriterion("CARD_TITLE between", value1, value2, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardTitleNotBetween(String value1, String value2) {
+            addCriterion("CARD_TITLE not between", value1, value2, "cardTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1IsNull() {
+            addCriterion("CARD_NAME1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1IsNotNull() {
+            addCriterion("CARD_NAME1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1EqualTo(String value) {
+            addCriterion("CARD_NAME1 =", value, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1NotEqualTo(String value) {
+            addCriterion("CARD_NAME1 <>", value, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1GreaterThan(String value) {
+            addCriterion("CARD_NAME1 >", value, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1GreaterThanOrEqualTo(String value) {
+            addCriterion("CARD_NAME1 >=", value, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1LessThan(String value) {
+            addCriterion("CARD_NAME1 <", value, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1LessThanOrEqualTo(String value) {
+            addCriterion("CARD_NAME1 <=", value, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1Like(String value) {
+            addCriterion("CARD_NAME1 like", value, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1NotLike(String value) {
+            addCriterion("CARD_NAME1 not like", value, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1In(List<String> values) {
+            addCriterion("CARD_NAME1 in", values, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1NotIn(List<String> values) {
+            addCriterion("CARD_NAME1 not in", values, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1Between(String value1, String value2) {
+            addCriterion("CARD_NAME1 between", value1, value2, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName1NotBetween(String value1, String value2) {
+            addCriterion("CARD_NAME1 not between", value1, value2, "cardName1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2IsNull() {
+            addCriterion("CARD_NAME2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2IsNotNull() {
+            addCriterion("CARD_NAME2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2EqualTo(String value) {
+            addCriterion("CARD_NAME2 =", value, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2NotEqualTo(String value) {
+            addCriterion("CARD_NAME2 <>", value, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2GreaterThan(String value) {
+            addCriterion("CARD_NAME2 >", value, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2GreaterThanOrEqualTo(String value) {
+            addCriterion("CARD_NAME2 >=", value, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2LessThan(String value) {
+            addCriterion("CARD_NAME2 <", value, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2LessThanOrEqualTo(String value) {
+            addCriterion("CARD_NAME2 <=", value, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2Like(String value) {
+            addCriterion("CARD_NAME2 like", value, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2NotLike(String value) {
+            addCriterion("CARD_NAME2 not like", value, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2In(List<String> values) {
+            addCriterion("CARD_NAME2 in", values, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2NotIn(List<String> values) {
+            addCriterion("CARD_NAME2 not in", values, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2Between(String value1, String value2) {
+            addCriterion("CARD_NAME2 between", value1, value2, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardName2NotBetween(String value1, String value2) {
+            addCriterion("CARD_NAME2 not between", value1, value2, "cardName2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1IsNull() {
+            addCriterion("CARD_LINK1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1IsNotNull() {
+            addCriterion("CARD_LINK1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1EqualTo(String value) {
+            addCriterion("CARD_LINK1 =", value, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1NotEqualTo(String value) {
+            addCriterion("CARD_LINK1 <>", value, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1GreaterThan(String value) {
+            addCriterion("CARD_LINK1 >", value, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1GreaterThanOrEqualTo(String value) {
+            addCriterion("CARD_LINK1 >=", value, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1LessThan(String value) {
+            addCriterion("CARD_LINK1 <", value, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1LessThanOrEqualTo(String value) {
+            addCriterion("CARD_LINK1 <=", value, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1Like(String value) {
+            addCriterion("CARD_LINK1 like", value, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1NotLike(String value) {
+            addCriterion("CARD_LINK1 not like", value, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1In(List<String> values) {
+            addCriterion("CARD_LINK1 in", values, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1NotIn(List<String> values) {
+            addCriterion("CARD_LINK1 not in", values, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1Between(String value1, String value2) {
+            addCriterion("CARD_LINK1 between", value1, value2, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink1NotBetween(String value1, String value2) {
+            addCriterion("CARD_LINK1 not between", value1, value2, "cardLink1");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2IsNull() {
+            addCriterion("CARD_LINK2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2IsNotNull() {
+            addCriterion("CARD_LINK2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2EqualTo(String value) {
+            addCriterion("CARD_LINK2 =", value, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2NotEqualTo(String value) {
+            addCriterion("CARD_LINK2 <>", value, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2GreaterThan(String value) {
+            addCriterion("CARD_LINK2 >", value, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2GreaterThanOrEqualTo(String value) {
+            addCriterion("CARD_LINK2 >=", value, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2LessThan(String value) {
+            addCriterion("CARD_LINK2 <", value, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2LessThanOrEqualTo(String value) {
+            addCriterion("CARD_LINK2 <=", value, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2Like(String value) {
+            addCriterion("CARD_LINK2 like", value, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2NotLike(String value) {
+            addCriterion("CARD_LINK2 not like", value, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2In(List<String> values) {
+            addCriterion("CARD_LINK2 in", values, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2NotIn(List<String> values) {
+            addCriterion("CARD_LINK2 not in", values, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2Between(String value1, String value2) {
+            addCriterion("CARD_LINK2 between", value1, value2, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardLink2NotBetween(String value1, String value2) {
+            addCriterion("CARD_LINK2 not between", value1, value2, "cardLink2");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateIsNull() {
+            addCriterion("CARD_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateIsNotNull() {
+            addCriterion("CARD_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateEqualTo(String value) {
+            addCriterion("CARD_STATE =", value, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateNotEqualTo(String value) {
+            addCriterion("CARD_STATE <>", value, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateGreaterThan(String value) {
+            addCriterion("CARD_STATE >", value, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateGreaterThanOrEqualTo(String value) {
+            addCriterion("CARD_STATE >=", value, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateLessThan(String value) {
+            addCriterion("CARD_STATE <", value, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateLessThanOrEqualTo(String value) {
+            addCriterion("CARD_STATE <=", value, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateLike(String value) {
+            addCriterion("CARD_STATE like", value, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateNotLike(String value) {
+            addCriterion("CARD_STATE not like", value, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateIn(List<String> values) {
+            addCriterion("CARD_STATE in", values, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateNotIn(List<String> values) {
+            addCriterion("CARD_STATE not in", values, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateBetween(String value1, String value2) {
+            addCriterion("CARD_STATE between", value1, value2, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardStateNotBetween(String value1, String value2) {
+            addCriterion("CARD_STATE not between", value1, value2, "cardState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table card_info
+     *
+     * @mbggenerated do_not_delete_during_merge Mon Mar 26 15:46:22 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ChannelInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ChannelInfo.java
new file mode 100644
index 000000000..a83edf13c
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ChannelInfo.java
@@ -0,0 +1,355 @@
+package com.ruoyi.content.domain;
+
+public class ChannelInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_info.CHANNEL_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private Integer channelId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_info.PARENT_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String parentId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_info.CHANNEL_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String channelName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_info.CHANNEL_STATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String channelState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column channel_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_info.CHANNEL_ID
+     *
+     * @return the value of channel_info.CHANNEL_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Integer getChannelId() {
+        return channelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_info.CHANNEL_ID
+     *
+     * @param channelId the value for channel_info.CHANNEL_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setChannelId(Integer channelId) {
+        this.channelId = channelId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_info.PARENT_ID
+     *
+     * @return the value of channel_info.PARENT_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getParentId() {
+        return parentId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_info.PARENT_ID
+     *
+     * @param parentId the value for channel_info.PARENT_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_info.COMPANY_ID
+     *
+     * @return the value of channel_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_info.COMPANY_ID
+     *
+     * @param companyId the value for channel_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_info.CHANNEL_NAME
+     *
+     * @return the value of channel_info.CHANNEL_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getChannelName() {
+        return channelName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_info.CHANNEL_NAME
+     *
+     * @param channelName the value for channel_info.CHANNEL_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_info.CHANNEL_STATE
+     *
+     * @return the value of channel_info.CHANNEL_STATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getChannelState() {
+        return channelState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_info.CHANNEL_STATE
+     *
+     * @param channelState the value for channel_info.CHANNEL_STATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setChannelState(String channelState) {
+        this.channelState = channelState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_info.CREATE_DATE
+     *
+     * @return the value of channel_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_info.CREATE_DATE
+     *
+     * @param createDate the value for channel_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_info.CREATE_TIME
+     *
+     * @return the value of channel_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_info.CREATE_TIME
+     *
+     * @param createTime the value for channel_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_info.CREATE_USER
+     *
+     * @return the value of channel_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_info.CREATE_USER
+     *
+     * @param createUser the value for channel_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_info.UPDATE_USER
+     *
+     * @return the value of channel_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_info.UPDATE_USER
+     *
+     * @param updateUser the value for channel_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_info.UPDATE_DATE
+     *
+     * @return the value of channel_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_info.UPDATE_DATE
+     *
+     * @param updateDate the value for channel_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column channel_info.UPDATE_TIME
+     *
+     * @return the value of channel_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column channel_info.UPDATE_TIME
+     *
+     * @param updateTime the value for channel_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ChannelInfoExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ChannelInfoExample.java
new file mode 100644
index 000000000..adc99f5d6
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ChannelInfoExample.java
@@ -0,0 +1,1062 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChannelInfoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public ChannelInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andChannelIdIsNull() {
+            addCriterion("CHANNEL_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIsNotNull() {
+            addCriterion("CHANNEL_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdEqualTo(Integer value) {
+            addCriterion("CHANNEL_ID =", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotEqualTo(Integer value) {
+            addCriterion("CHANNEL_ID <>", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThan(Integer value) {
+            addCriterion("CHANNEL_ID >", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("CHANNEL_ID >=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThan(Integer value) {
+            addCriterion("CHANNEL_ID <", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdLessThanOrEqualTo(Integer value) {
+            addCriterion("CHANNEL_ID <=", value, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdIn(List<Integer> values) {
+            addCriterion("CHANNEL_ID in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotIn(List<Integer> values) {
+            addCriterion("CHANNEL_ID not in", values, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdBetween(Integer value1, Integer value2) {
+            addCriterion("CHANNEL_ID between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("CHANNEL_ID not between", value1, value2, "channelId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIsNull() {
+            addCriterion("PARENT_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIsNotNull() {
+            addCriterion("PARENT_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdEqualTo(String value) {
+            addCriterion("PARENT_ID =", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotEqualTo(String value) {
+            addCriterion("PARENT_ID <>", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdGreaterThan(String value) {
+            addCriterion("PARENT_ID >", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PARENT_ID >=", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLessThan(String value) {
+            addCriterion("PARENT_ID <", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLessThanOrEqualTo(String value) {
+            addCriterion("PARENT_ID <=", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLike(String value) {
+            addCriterion("PARENT_ID like", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotLike(String value) {
+            addCriterion("PARENT_ID not like", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIn(List<String> values) {
+            addCriterion("PARENT_ID in", values, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotIn(List<String> values) {
+            addCriterion("PARENT_ID not in", values, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdBetween(String value1, String value2) {
+            addCriterion("PARENT_ID between", value1, value2, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotBetween(String value1, String value2) {
+            addCriterion("PARENT_ID not between", value1, value2, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameIsNull() {
+            addCriterion("CHANNEL_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameIsNotNull() {
+            addCriterion("CHANNEL_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameEqualTo(String value) {
+            addCriterion("CHANNEL_NAME =", value, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameNotEqualTo(String value) {
+            addCriterion("CHANNEL_NAME <>", value, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameGreaterThan(String value) {
+            addCriterion("CHANNEL_NAME >", value, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameGreaterThanOrEqualTo(String value) {
+            addCriterion("CHANNEL_NAME >=", value, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameLessThan(String value) {
+            addCriterion("CHANNEL_NAME <", value, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameLessThanOrEqualTo(String value) {
+            addCriterion("CHANNEL_NAME <=", value, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameLike(String value) {
+            addCriterion("CHANNEL_NAME like", value, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameNotLike(String value) {
+            addCriterion("CHANNEL_NAME not like", value, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameIn(List<String> values) {
+            addCriterion("CHANNEL_NAME in", values, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameNotIn(List<String> values) {
+            addCriterion("CHANNEL_NAME not in", values, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameBetween(String value1, String value2) {
+            addCriterion("CHANNEL_NAME between", value1, value2, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelNameNotBetween(String value1, String value2) {
+            addCriterion("CHANNEL_NAME not between", value1, value2, "channelName");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateIsNull() {
+            addCriterion("CHANNEL_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateIsNotNull() {
+            addCriterion("CHANNEL_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateEqualTo(String value) {
+            addCriterion("CHANNEL_STATE =", value, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateNotEqualTo(String value) {
+            addCriterion("CHANNEL_STATE <>", value, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateGreaterThan(String value) {
+            addCriterion("CHANNEL_STATE >", value, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateGreaterThanOrEqualTo(String value) {
+            addCriterion("CHANNEL_STATE >=", value, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateLessThan(String value) {
+            addCriterion("CHANNEL_STATE <", value, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateLessThanOrEqualTo(String value) {
+            addCriterion("CHANNEL_STATE <=", value, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateLike(String value) {
+            addCriterion("CHANNEL_STATE like", value, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateNotLike(String value) {
+            addCriterion("CHANNEL_STATE not like", value, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateIn(List<String> values) {
+            addCriterion("CHANNEL_STATE in", values, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateNotIn(List<String> values) {
+            addCriterion("CHANNEL_STATE not in", values, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateBetween(String value1, String value2) {
+            addCriterion("CHANNEL_STATE between", value1, value2, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andChannelStateNotBetween(String value1, String value2) {
+            addCriterion("CHANNEL_STATE not between", value1, value2, "channelState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table channel_info
+     *
+     * @mbggenerated do_not_delete_during_merge Mon Mar 26 15:46:22 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickTrackInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickTrackInfo.java
new file mode 100644
index 000000000..708b9bcef
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickTrackInfo.java
@@ -0,0 +1,643 @@
+package com.ruoyi.content.domain;
+
+public class ClickTrackInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.CLICK_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String clickId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.FORWARD_TIMESTAMP
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String forwardTimestamp;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.PARENT_CLICK_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String parentClickId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.CLICK_OPEN_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String clickOpenId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.CLICK_USER_NICKNAME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String clickUserNickname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.CLICK_USER_HEADIMGURL
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String clickUserHeadimgurl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.PUBLISH_USER_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String publishUserId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.ARTICLE_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String articleId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.CLICK_USER_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String clickUserId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.AD_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String adId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.FROM_SHARE_STATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String fromShareState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.SHARE_STATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String shareState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.WATCH_TIME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String watchTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.CREATE_DATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.CREATE_TIME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.CREATE_USER
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.UPDATE_USER
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.UPDATE_DATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.UPDATE_TIME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column click_track_info.CLICK_USER_INFO
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    private String clickUserInfo;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.CLICK_ID
+     *
+     * @return the value of click_track_info.CLICK_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getClickId() {
+        return clickId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.CLICK_ID
+     *
+     * @param clickId the value for click_track_info.CLICK_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setClickId(String clickId) {
+        this.clickId = clickId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.FORWARD_TIMESTAMP
+     *
+     * @return the value of click_track_info.FORWARD_TIMESTAMP
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getForwardTimestamp() {
+        return forwardTimestamp;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.FORWARD_TIMESTAMP
+     *
+     * @param forwardTimestamp the value for click_track_info.FORWARD_TIMESTAMP
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setForwardTimestamp(String forwardTimestamp) {
+        this.forwardTimestamp = forwardTimestamp;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.PARENT_CLICK_ID
+     *
+     * @return the value of click_track_info.PARENT_CLICK_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getParentClickId() {
+        return parentClickId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.PARENT_CLICK_ID
+     *
+     * @param parentClickId the value for click_track_info.PARENT_CLICK_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setParentClickId(String parentClickId) {
+        this.parentClickId = parentClickId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.CLICK_OPEN_ID
+     *
+     * @return the value of click_track_info.CLICK_OPEN_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getClickOpenId() {
+        return clickOpenId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.CLICK_OPEN_ID
+     *
+     * @param clickOpenId the value for click_track_info.CLICK_OPEN_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setClickOpenId(String clickOpenId) {
+        this.clickOpenId = clickOpenId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.CLICK_USER_NICKNAME
+     *
+     * @return the value of click_track_info.CLICK_USER_NICKNAME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getClickUserNickname() {
+        return clickUserNickname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.CLICK_USER_NICKNAME
+     *
+     * @param clickUserNickname the value for click_track_info.CLICK_USER_NICKNAME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setClickUserNickname(String clickUserNickname) {
+        this.clickUserNickname = clickUserNickname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.CLICK_USER_HEADIMGURL
+     *
+     * @return the value of click_track_info.CLICK_USER_HEADIMGURL
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getClickUserHeadimgurl() {
+        return clickUserHeadimgurl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.CLICK_USER_HEADIMGURL
+     *
+     * @param clickUserHeadimgurl the value for click_track_info.CLICK_USER_HEADIMGURL
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setClickUserHeadimgurl(String clickUserHeadimgurl) {
+        this.clickUserHeadimgurl = clickUserHeadimgurl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.PUBLISH_USER_ID
+     *
+     * @return the value of click_track_info.PUBLISH_USER_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getPublishUserId() {
+        return publishUserId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.PUBLISH_USER_ID
+     *
+     * @param publishUserId the value for click_track_info.PUBLISH_USER_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setPublishUserId(String publishUserId) {
+        this.publishUserId = publishUserId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.ARTICLE_ID
+     *
+     * @return the value of click_track_info.ARTICLE_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getArticleId() {
+        return articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.ARTICLE_ID
+     *
+     * @param articleId the value for click_track_info.ARTICLE_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setArticleId(String articleId) {
+        this.articleId = articleId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.CLICK_USER_ID
+     *
+     * @return the value of click_track_info.CLICK_USER_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getClickUserId() {
+        return clickUserId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.CLICK_USER_ID
+     *
+     * @param clickUserId the value for click_track_info.CLICK_USER_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setClickUserId(String clickUserId) {
+        this.clickUserId = clickUserId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.AD_ID
+     *
+     * @return the value of click_track_info.AD_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getAdId() {
+        return adId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.AD_ID
+     *
+     * @param adId the value for click_track_info.AD_ID
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setAdId(String adId) {
+        this.adId = adId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.FROM_SHARE_STATE
+     *
+     * @return the value of click_track_info.FROM_SHARE_STATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getFromShareState() {
+        return fromShareState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.FROM_SHARE_STATE
+     *
+     * @param fromShareState the value for click_track_info.FROM_SHARE_STATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setFromShareState(String fromShareState) {
+        this.fromShareState = fromShareState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.SHARE_STATE
+     *
+     * @return the value of click_track_info.SHARE_STATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getShareState() {
+        return shareState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.SHARE_STATE
+     *
+     * @param shareState the value for click_track_info.SHARE_STATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setShareState(String shareState) {
+        this.shareState = shareState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.WATCH_TIME
+     *
+     * @return the value of click_track_info.WATCH_TIME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getWatchTime() {
+        return watchTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.WATCH_TIME
+     *
+     * @param watchTime the value for click_track_info.WATCH_TIME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setWatchTime(String watchTime) {
+        this.watchTime = watchTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.CREATE_DATE
+     *
+     * @return the value of click_track_info.CREATE_DATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.CREATE_DATE
+     *
+     * @param createDate the value for click_track_info.CREATE_DATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.CREATE_TIME
+     *
+     * @return the value of click_track_info.CREATE_TIME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.CREATE_TIME
+     *
+     * @param createTime the value for click_track_info.CREATE_TIME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.CREATE_USER
+     *
+     * @return the value of click_track_info.CREATE_USER
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.CREATE_USER
+     *
+     * @param createUser the value for click_track_info.CREATE_USER
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.UPDATE_USER
+     *
+     * @return the value of click_track_info.UPDATE_USER
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.UPDATE_USER
+     *
+     * @param updateUser the value for click_track_info.UPDATE_USER
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.UPDATE_DATE
+     *
+     * @return the value of click_track_info.UPDATE_DATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.UPDATE_DATE
+     *
+     * @param updateDate the value for click_track_info.UPDATE_DATE
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.UPDATE_TIME
+     *
+     * @return the value of click_track_info.UPDATE_TIME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.UPDATE_TIME
+     *
+     * @param updateTime the value for click_track_info.UPDATE_TIME
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column click_track_info.CLICK_USER_INFO
+     *
+     * @return the value of click_track_info.CLICK_USER_INFO
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getClickUserInfo() {
+        return clickUserInfo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column click_track_info.CLICK_USER_INFO
+     *
+     * @param clickUserInfo the value for click_track_info.CLICK_USER_INFO
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setClickUserInfo(String clickUserInfo) {
+        this.clickUserInfo = clickUserInfo;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickTrackInfoExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickTrackInfoExample.java
new file mode 100644
index 000000000..34201d9a6
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickTrackInfoExample.java
@@ -0,0 +1,1632 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ClickTrackInfoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public ClickTrackInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andClickIdIsNull() {
+            addCriterion("CLICK_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdIsNotNull() {
+            addCriterion("CLICK_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdEqualTo(String value) {
+            addCriterion("CLICK_ID =", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdNotEqualTo(String value) {
+            addCriterion("CLICK_ID <>", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdGreaterThan(String value) {
+            addCriterion("CLICK_ID >", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdGreaterThanOrEqualTo(String value) {
+            addCriterion("CLICK_ID >=", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdLessThan(String value) {
+            addCriterion("CLICK_ID <", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdLessThanOrEqualTo(String value) {
+            addCriterion("CLICK_ID <=", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdLike(String value) {
+            addCriterion("CLICK_ID like", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdNotLike(String value) {
+            addCriterion("CLICK_ID not like", value, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdIn(List<String> values) {
+            addCriterion("CLICK_ID in", values, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdNotIn(List<String> values) {
+            addCriterion("CLICK_ID not in", values, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdBetween(String value1, String value2) {
+            addCriterion("CLICK_ID between", value1, value2, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickIdNotBetween(String value1, String value2) {
+            addCriterion("CLICK_ID not between", value1, value2, "clickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampIsNull() {
+            addCriterion("FORWARD_TIMESTAMP is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampIsNotNull() {
+            addCriterion("FORWARD_TIMESTAMP is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampEqualTo(String value) {
+            addCriterion("FORWARD_TIMESTAMP =", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampNotEqualTo(String value) {
+            addCriterion("FORWARD_TIMESTAMP <>", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampGreaterThan(String value) {
+            addCriterion("FORWARD_TIMESTAMP >", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampGreaterThanOrEqualTo(String value) {
+            addCriterion("FORWARD_TIMESTAMP >=", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampLessThan(String value) {
+            addCriterion("FORWARD_TIMESTAMP <", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampLessThanOrEqualTo(String value) {
+            addCriterion("FORWARD_TIMESTAMP <=", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampLike(String value) {
+            addCriterion("FORWARD_TIMESTAMP like", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampNotLike(String value) {
+            addCriterion("FORWARD_TIMESTAMP not like", value, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampIn(List<String> values) {
+            addCriterion("FORWARD_TIMESTAMP in", values, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampNotIn(List<String> values) {
+            addCriterion("FORWARD_TIMESTAMP not in", values, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampBetween(String value1, String value2) {
+            addCriterion("FORWARD_TIMESTAMP between", value1, value2, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andForwardTimestampNotBetween(String value1, String value2) {
+            addCriterion("FORWARD_TIMESTAMP not between", value1, value2, "forwardTimestamp");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdIsNull() {
+            addCriterion("PARENT_CLICK_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdIsNotNull() {
+            addCriterion("PARENT_CLICK_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdEqualTo(String value) {
+            addCriterion("PARENT_CLICK_ID =", value, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdNotEqualTo(String value) {
+            addCriterion("PARENT_CLICK_ID <>", value, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdGreaterThan(String value) {
+            addCriterion("PARENT_CLICK_ID >", value, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PARENT_CLICK_ID >=", value, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdLessThan(String value) {
+            addCriterion("PARENT_CLICK_ID <", value, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdLessThanOrEqualTo(String value) {
+            addCriterion("PARENT_CLICK_ID <=", value, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdLike(String value) {
+            addCriterion("PARENT_CLICK_ID like", value, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdNotLike(String value) {
+            addCriterion("PARENT_CLICK_ID not like", value, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdIn(List<String> values) {
+            addCriterion("PARENT_CLICK_ID in", values, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdNotIn(List<String> values) {
+            addCriterion("PARENT_CLICK_ID not in", values, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdBetween(String value1, String value2) {
+            addCriterion("PARENT_CLICK_ID between", value1, value2, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentClickIdNotBetween(String value1, String value2) {
+            addCriterion("PARENT_CLICK_ID not between", value1, value2, "parentClickId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdIsNull() {
+            addCriterion("CLICK_OPEN_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdIsNotNull() {
+            addCriterion("CLICK_OPEN_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdEqualTo(String value) {
+            addCriterion("CLICK_OPEN_ID =", value, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdNotEqualTo(String value) {
+            addCriterion("CLICK_OPEN_ID <>", value, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdGreaterThan(String value) {
+            addCriterion("CLICK_OPEN_ID >", value, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdGreaterThanOrEqualTo(String value) {
+            addCriterion("CLICK_OPEN_ID >=", value, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdLessThan(String value) {
+            addCriterion("CLICK_OPEN_ID <", value, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdLessThanOrEqualTo(String value) {
+            addCriterion("CLICK_OPEN_ID <=", value, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdLike(String value) {
+            addCriterion("CLICK_OPEN_ID like", value, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdNotLike(String value) {
+            addCriterion("CLICK_OPEN_ID not like", value, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdIn(List<String> values) {
+            addCriterion("CLICK_OPEN_ID in", values, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdNotIn(List<String> values) {
+            addCriterion("CLICK_OPEN_ID not in", values, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdBetween(String value1, String value2) {
+            addCriterion("CLICK_OPEN_ID between", value1, value2, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickOpenIdNotBetween(String value1, String value2) {
+            addCriterion("CLICK_OPEN_ID not between", value1, value2, "clickOpenId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameIsNull() {
+            addCriterion("CLICK_USER_NICKNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameIsNotNull() {
+            addCriterion("CLICK_USER_NICKNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameEqualTo(String value) {
+            addCriterion("CLICK_USER_NICKNAME =", value, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameNotEqualTo(String value) {
+            addCriterion("CLICK_USER_NICKNAME <>", value, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameGreaterThan(String value) {
+            addCriterion("CLICK_USER_NICKNAME >", value, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameGreaterThanOrEqualTo(String value) {
+            addCriterion("CLICK_USER_NICKNAME >=", value, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameLessThan(String value) {
+            addCriterion("CLICK_USER_NICKNAME <", value, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameLessThanOrEqualTo(String value) {
+            addCriterion("CLICK_USER_NICKNAME <=", value, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameLike(String value) {
+            addCriterion("CLICK_USER_NICKNAME like", value, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameNotLike(String value) {
+            addCriterion("CLICK_USER_NICKNAME not like", value, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameIn(List<String> values) {
+            addCriterion("CLICK_USER_NICKNAME in", values, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameNotIn(List<String> values) {
+            addCriterion("CLICK_USER_NICKNAME not in", values, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameBetween(String value1, String value2) {
+            addCriterion("CLICK_USER_NICKNAME between", value1, value2, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserNicknameNotBetween(String value1, String value2) {
+            addCriterion("CLICK_USER_NICKNAME not between", value1, value2, "clickUserNickname");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlIsNull() {
+            addCriterion("CLICK_USER_HEADIMGURL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlIsNotNull() {
+            addCriterion("CLICK_USER_HEADIMGURL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlEqualTo(String value) {
+            addCriterion("CLICK_USER_HEADIMGURL =", value, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlNotEqualTo(String value) {
+            addCriterion("CLICK_USER_HEADIMGURL <>", value, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlGreaterThan(String value) {
+            addCriterion("CLICK_USER_HEADIMGURL >", value, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlGreaterThanOrEqualTo(String value) {
+            addCriterion("CLICK_USER_HEADIMGURL >=", value, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlLessThan(String value) {
+            addCriterion("CLICK_USER_HEADIMGURL <", value, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlLessThanOrEqualTo(String value) {
+            addCriterion("CLICK_USER_HEADIMGURL <=", value, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlLike(String value) {
+            addCriterion("CLICK_USER_HEADIMGURL like", value, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlNotLike(String value) {
+            addCriterion("CLICK_USER_HEADIMGURL not like", value, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlIn(List<String> values) {
+            addCriterion("CLICK_USER_HEADIMGURL in", values, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlNotIn(List<String> values) {
+            addCriterion("CLICK_USER_HEADIMGURL not in", values, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlBetween(String value1, String value2) {
+            addCriterion("CLICK_USER_HEADIMGURL between", value1, value2, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserHeadimgurlNotBetween(String value1, String value2) {
+            addCriterion("CLICK_USER_HEADIMGURL not between", value1, value2, "clickUserHeadimgurl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdIsNull() {
+            addCriterion("PUBLISH_USER_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdIsNotNull() {
+            addCriterion("PUBLISH_USER_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdEqualTo(String value) {
+            addCriterion("PUBLISH_USER_ID =", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdNotEqualTo(String value) {
+            addCriterion("PUBLISH_USER_ID <>", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdGreaterThan(String value) {
+            addCriterion("PUBLISH_USER_ID >", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_USER_ID >=", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdLessThan(String value) {
+            addCriterion("PUBLISH_USER_ID <", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdLessThanOrEqualTo(String value) {
+            addCriterion("PUBLISH_USER_ID <=", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdLike(String value) {
+            addCriterion("PUBLISH_USER_ID like", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdNotLike(String value) {
+            addCriterion("PUBLISH_USER_ID not like", value, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdIn(List<String> values) {
+            addCriterion("PUBLISH_USER_ID in", values, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdNotIn(List<String> values) {
+            addCriterion("PUBLISH_USER_ID not in", values, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdBetween(String value1, String value2) {
+            addCriterion("PUBLISH_USER_ID between", value1, value2, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPublishUserIdNotBetween(String value1, String value2) {
+            addCriterion("PUBLISH_USER_ID not between", value1, value2, "publishUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNull() {
+            addCriterion("ARTICLE_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIsNotNull() {
+            addCriterion("ARTICLE_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdEqualTo(String value) {
+            addCriterion("ARTICLE_ID =", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotEqualTo(String value) {
+            addCriterion("ARTICLE_ID <>", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThan(String value) {
+            addCriterion("ARTICLE_ID >", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_ID >=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThan(String value) {
+            addCriterion("ARTICLE_ID <", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLessThanOrEqualTo(String value) {
+            addCriterion("ARTICLE_ID <=", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdLike(String value) {
+            addCriterion("ARTICLE_ID like", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotLike(String value) {
+            addCriterion("ARTICLE_ID not like", value, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdIn(List<String> values) {
+            addCriterion("ARTICLE_ID in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotIn(List<String> values) {
+            addCriterion("ARTICLE_ID not in", values, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdBetween(String value1, String value2) {
+            addCriterion("ARTICLE_ID between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andArticleIdNotBetween(String value1, String value2) {
+            addCriterion("ARTICLE_ID not between", value1, value2, "articleId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdIsNull() {
+            addCriterion("CLICK_USER_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdIsNotNull() {
+            addCriterion("CLICK_USER_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdEqualTo(String value) {
+            addCriterion("CLICK_USER_ID =", value, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdNotEqualTo(String value) {
+            addCriterion("CLICK_USER_ID <>", value, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdGreaterThan(String value) {
+            addCriterion("CLICK_USER_ID >", value, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("CLICK_USER_ID >=", value, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdLessThan(String value) {
+            addCriterion("CLICK_USER_ID <", value, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdLessThanOrEqualTo(String value) {
+            addCriterion("CLICK_USER_ID <=", value, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdLike(String value) {
+            addCriterion("CLICK_USER_ID like", value, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdNotLike(String value) {
+            addCriterion("CLICK_USER_ID not like", value, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdIn(List<String> values) {
+            addCriterion("CLICK_USER_ID in", values, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdNotIn(List<String> values) {
+            addCriterion("CLICK_USER_ID not in", values, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdBetween(String value1, String value2) {
+            addCriterion("CLICK_USER_ID between", value1, value2, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andClickUserIdNotBetween(String value1, String value2) {
+            addCriterion("CLICK_USER_ID not between", value1, value2, "clickUserId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdIsNull() {
+            addCriterion("AD_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdIsNotNull() {
+            addCriterion("AD_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdEqualTo(String value) {
+            addCriterion("AD_ID =", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotEqualTo(String value) {
+            addCriterion("AD_ID <>", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdGreaterThan(String value) {
+            addCriterion("AD_ID >", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdGreaterThanOrEqualTo(String value) {
+            addCriterion("AD_ID >=", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdLessThan(String value) {
+            addCriterion("AD_ID <", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdLessThanOrEqualTo(String value) {
+            addCriterion("AD_ID <=", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdLike(String value) {
+            addCriterion("AD_ID like", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotLike(String value) {
+            addCriterion("AD_ID not like", value, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdIn(List<String> values) {
+            addCriterion("AD_ID in", values, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotIn(List<String> values) {
+            addCriterion("AD_ID not in", values, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdBetween(String value1, String value2) {
+            addCriterion("AD_ID between", value1, value2, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAdIdNotBetween(String value1, String value2) {
+            addCriterion("AD_ID not between", value1, value2, "adId");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateIsNull() {
+            addCriterion("FROM_SHARE_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateIsNotNull() {
+            addCriterion("FROM_SHARE_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateEqualTo(String value) {
+            addCriterion("FROM_SHARE_STATE =", value, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateNotEqualTo(String value) {
+            addCriterion("FROM_SHARE_STATE <>", value, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateGreaterThan(String value) {
+            addCriterion("FROM_SHARE_STATE >", value, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateGreaterThanOrEqualTo(String value) {
+            addCriterion("FROM_SHARE_STATE >=", value, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateLessThan(String value) {
+            addCriterion("FROM_SHARE_STATE <", value, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateLessThanOrEqualTo(String value) {
+            addCriterion("FROM_SHARE_STATE <=", value, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateLike(String value) {
+            addCriterion("FROM_SHARE_STATE like", value, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateNotLike(String value) {
+            addCriterion("FROM_SHARE_STATE not like", value, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateIn(List<String> values) {
+            addCriterion("FROM_SHARE_STATE in", values, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateNotIn(List<String> values) {
+            addCriterion("FROM_SHARE_STATE not in", values, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateBetween(String value1, String value2) {
+            addCriterion("FROM_SHARE_STATE between", value1, value2, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andFromShareStateNotBetween(String value1, String value2) {
+            addCriterion("FROM_SHARE_STATE not between", value1, value2, "fromShareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateIsNull() {
+            addCriterion("SHARE_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateIsNotNull() {
+            addCriterion("SHARE_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateEqualTo(String value) {
+            addCriterion("SHARE_STATE =", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateNotEqualTo(String value) {
+            addCriterion("SHARE_STATE <>", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateGreaterThan(String value) {
+            addCriterion("SHARE_STATE >", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateGreaterThanOrEqualTo(String value) {
+            addCriterion("SHARE_STATE >=", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateLessThan(String value) {
+            addCriterion("SHARE_STATE <", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateLessThanOrEqualTo(String value) {
+            addCriterion("SHARE_STATE <=", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateLike(String value) {
+            addCriterion("SHARE_STATE like", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateNotLike(String value) {
+            addCriterion("SHARE_STATE not like", value, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateIn(List<String> values) {
+            addCriterion("SHARE_STATE in", values, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateNotIn(List<String> values) {
+            addCriterion("SHARE_STATE not in", values, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateBetween(String value1, String value2) {
+            addCriterion("SHARE_STATE between", value1, value2, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andShareStateNotBetween(String value1, String value2) {
+            addCriterion("SHARE_STATE not between", value1, value2, "shareState");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeIsNull() {
+            addCriterion("WATCH_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeIsNotNull() {
+            addCriterion("WATCH_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeEqualTo(String value) {
+            addCriterion("WATCH_TIME =", value, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeNotEqualTo(String value) {
+            addCriterion("WATCH_TIME <>", value, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeGreaterThan(String value) {
+            addCriterion("WATCH_TIME >", value, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("WATCH_TIME >=", value, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeLessThan(String value) {
+            addCriterion("WATCH_TIME <", value, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeLessThanOrEqualTo(String value) {
+            addCriterion("WATCH_TIME <=", value, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeLike(String value) {
+            addCriterion("WATCH_TIME like", value, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeNotLike(String value) {
+            addCriterion("WATCH_TIME not like", value, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeIn(List<String> values) {
+            addCriterion("WATCH_TIME in", values, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeNotIn(List<String> values) {
+            addCriterion("WATCH_TIME not in", values, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeBetween(String value1, String value2) {
+            addCriterion("WATCH_TIME between", value1, value2, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andWatchTimeNotBetween(String value1, String value2) {
+            addCriterion("WATCH_TIME not between", value1, value2, "watchTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table click_track_info
+     *
+     * @mbggenerated do_not_delete_during_merge Wed Jun 20 16:32:59 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickUserInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickUserInfo.java
new file mode 100644
index 000000000..dc6f26837
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ClickUserInfo.java
@@ -0,0 +1,46 @@
+package com.ruoyi.content.domain;
+
+import java.io.Serializable;
+
+/**
+ * 文章查看记录信息数据
+*
+* @author  
+* @date 2018年4月16日  
+*
+ */
+public class ClickUserInfo implements Serializable{
+
+	private static final long serialVersionUID = 3152100900712336169L;
+	
+	private String openId;
+	private String headImgUrl;
+	private String nickName;
+	private String toShareState;
+	public String getOpenId() {
+		return openId;
+	}
+	public void setOpenId(String openId) {
+		this.openId = openId;
+	}
+	public String getHeadImgUrl() {
+		return headImgUrl;
+	}
+	public void setHeadImgUrl(String headImgUrl) {
+		this.headImgUrl = headImgUrl;
+	}
+	public String getNickName() {
+		return nickName;
+	}
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+	public String getToShareState() {
+		return toShareState;
+	}
+	public void setToShareState(String toShareState) {
+		this.toShareState = toShareState;
+	}	
+	
+	
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsRoleAuthority.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsRoleAuthority.java
new file mode 100644
index 000000000..d47f48c48
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsRoleAuthority.java
@@ -0,0 +1,259 @@
+package com.ruoyi.content.domain;
+
+public class CmsRoleAuthority {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_role_authority.SELF_CHILD
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    private String selfChild;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_role_authority.PARENT_CHILD
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    private String parentChild;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_role_authority.CREATE_DATE
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_role_authority.CREATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_role_authority.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_role_authority.UPDATE_USER
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_role_authority.UPDATE_DATE
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_role_authority.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_role_authority.SELF_CHILD
+     *
+     * @return the value of cms_role_authority.SELF_CHILD
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public String getSelfChild() {
+        return selfChild;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_role_authority.SELF_CHILD
+     *
+     * @param selfChild the value for cms_role_authority.SELF_CHILD
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void setSelfChild(String selfChild) {
+        this.selfChild = selfChild;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_role_authority.PARENT_CHILD
+     *
+     * @return the value of cms_role_authority.PARENT_CHILD
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public String getParentChild() {
+        return parentChild;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_role_authority.PARENT_CHILD
+     *
+     * @param parentChild the value for cms_role_authority.PARENT_CHILD
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void setParentChild(String parentChild) {
+        this.parentChild = parentChild;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_role_authority.CREATE_DATE
+     *
+     * @return the value of cms_role_authority.CREATE_DATE
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_role_authority.CREATE_DATE
+     *
+     * @param createDate the value for cms_role_authority.CREATE_DATE
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_role_authority.CREATE_TIME
+     *
+     * @return the value of cms_role_authority.CREATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_role_authority.CREATE_TIME
+     *
+     * @param createTime the value for cms_role_authority.CREATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_role_authority.CREATE_USER
+     *
+     * @return the value of cms_role_authority.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_role_authority.CREATE_USER
+     *
+     * @param createUser the value for cms_role_authority.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_role_authority.UPDATE_USER
+     *
+     * @return the value of cms_role_authority.UPDATE_USER
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_role_authority.UPDATE_USER
+     *
+     * @param updateUser the value for cms_role_authority.UPDATE_USER
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_role_authority.UPDATE_DATE
+     *
+     * @return the value of cms_role_authority.UPDATE_DATE
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_role_authority.UPDATE_DATE
+     *
+     * @param updateDate the value for cms_role_authority.UPDATE_DATE
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_role_authority.UPDATE_TIME
+     *
+     * @return the value of cms_role_authority.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_role_authority.UPDATE_TIME
+     *
+     * @param updateTime the value for cms_role_authority.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsRoleAuthorityExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsRoleAuthorityExample.java
new file mode 100644
index 000000000..652ad37c8
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsRoleAuthorityExample.java
@@ -0,0 +1,862 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CmsRoleAuthorityExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public CmsRoleAuthorityExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andSelfChildIsNull() {
+            addCriterion("SELF_CHILD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildIsNotNull() {
+            addCriterion("SELF_CHILD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildEqualTo(String value) {
+            addCriterion("SELF_CHILD =", value, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildNotEqualTo(String value) {
+            addCriterion("SELF_CHILD <>", value, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildGreaterThan(String value) {
+            addCriterion("SELF_CHILD >", value, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildGreaterThanOrEqualTo(String value) {
+            addCriterion("SELF_CHILD >=", value, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildLessThan(String value) {
+            addCriterion("SELF_CHILD <", value, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildLessThanOrEqualTo(String value) {
+            addCriterion("SELF_CHILD <=", value, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildLike(String value) {
+            addCriterion("SELF_CHILD like", value, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildNotLike(String value) {
+            addCriterion("SELF_CHILD not like", value, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildIn(List<String> values) {
+            addCriterion("SELF_CHILD in", values, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildNotIn(List<String> values) {
+            addCriterion("SELF_CHILD not in", values, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildBetween(String value1, String value2) {
+            addCriterion("SELF_CHILD between", value1, value2, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andSelfChildNotBetween(String value1, String value2) {
+            addCriterion("SELF_CHILD not between", value1, value2, "selfChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildIsNull() {
+            addCriterion("PARENT_CHILD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildIsNotNull() {
+            addCriterion("PARENT_CHILD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildEqualTo(String value) {
+            addCriterion("PARENT_CHILD =", value, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildNotEqualTo(String value) {
+            addCriterion("PARENT_CHILD <>", value, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildGreaterThan(String value) {
+            addCriterion("PARENT_CHILD >", value, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildGreaterThanOrEqualTo(String value) {
+            addCriterion("PARENT_CHILD >=", value, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildLessThan(String value) {
+            addCriterion("PARENT_CHILD <", value, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildLessThanOrEqualTo(String value) {
+            addCriterion("PARENT_CHILD <=", value, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildLike(String value) {
+            addCriterion("PARENT_CHILD like", value, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildNotLike(String value) {
+            addCriterion("PARENT_CHILD not like", value, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildIn(List<String> values) {
+            addCriterion("PARENT_CHILD in", values, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildNotIn(List<String> values) {
+            addCriterion("PARENT_CHILD not in", values, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildBetween(String value1, String value2) {
+            addCriterion("PARENT_CHILD between", value1, value2, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentChildNotBetween(String value1, String value2) {
+            addCriterion("PARENT_CHILD not between", value1, value2, "parentChild");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated do_not_delete_during_merge Tue Jul 24 18:17:00 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Tue Jul 24 18:17:00 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysAuthority.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysAuthority.java
new file mode 100644
index 000000000..4facb6883
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysAuthority.java
@@ -0,0 +1,387 @@
+package com.ruoyi.content.domain;
+
+public class CmsSysAuthority {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.NUM
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private Integer num;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.ID
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.LEVEL
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String level;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.TYPE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String type;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.OPERATOR_ROLE_NAME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String operatorRoleName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.OPERATOR_ROLE_PATH
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String operatorRolePath;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.CREATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.CREATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.CREATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.UPDATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.UPDATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_authority.UPDATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String updateUser;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.NUM
+     *
+     * @return the value of cms_sys_authority.NUM
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public Integer getNum() {
+        return num;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.NUM
+     *
+     * @param num the value for cms_sys_authority.NUM
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.ID
+     *
+     * @return the value of cms_sys_authority.ID
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.ID
+     *
+     * @param id the value for cms_sys_authority.ID
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.LEVEL
+     *
+     * @return the value of cms_sys_authority.LEVEL
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getLevel() {
+        return level;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.LEVEL
+     *
+     * @param level the value for cms_sys_authority.LEVEL
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.TYPE
+     *
+     * @return the value of cms_sys_authority.TYPE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.TYPE
+     *
+     * @param type the value for cms_sys_authority.TYPE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.OPERATOR_ROLE_NAME
+     *
+     * @return the value of cms_sys_authority.OPERATOR_ROLE_NAME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getOperatorRoleName() {
+        return operatorRoleName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.OPERATOR_ROLE_NAME
+     *
+     * @param operatorRoleName the value for cms_sys_authority.OPERATOR_ROLE_NAME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setOperatorRoleName(String operatorRoleName) {
+        this.operatorRoleName = operatorRoleName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.OPERATOR_ROLE_PATH
+     *
+     * @return the value of cms_sys_authority.OPERATOR_ROLE_PATH
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getOperatorRolePath() {
+        return operatorRolePath;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.OPERATOR_ROLE_PATH
+     *
+     * @param operatorRolePath the value for cms_sys_authority.OPERATOR_ROLE_PATH
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setOperatorRolePath(String operatorRolePath) {
+        this.operatorRolePath = operatorRolePath;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.CREATE_DATE
+     *
+     * @return the value of cms_sys_authority.CREATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.CREATE_DATE
+     *
+     * @param createDate the value for cms_sys_authority.CREATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.CREATE_TIME
+     *
+     * @return the value of cms_sys_authority.CREATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.CREATE_TIME
+     *
+     * @param createTime the value for cms_sys_authority.CREATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.CREATE_USER
+     *
+     * @return the value of cms_sys_authority.CREATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.CREATE_USER
+     *
+     * @param createUser the value for cms_sys_authority.CREATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.UPDATE_DATE
+     *
+     * @return the value of cms_sys_authority.UPDATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.UPDATE_DATE
+     *
+     * @param updateDate the value for cms_sys_authority.UPDATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.UPDATE_TIME
+     *
+     * @return the value of cms_sys_authority.UPDATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.UPDATE_TIME
+     *
+     * @param updateTime the value for cms_sys_authority.UPDATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_authority.UPDATE_USER
+     *
+     * @return the value of cms_sys_authority.UPDATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_authority.UPDATE_USER
+     *
+     * @param updateUser the value for cms_sys_authority.UPDATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysAuthorityExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysAuthorityExample.java
new file mode 100644
index 000000000..71d8f0d42
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysAuthorityExample.java
@@ -0,0 +1,1132 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CmsSysAuthorityExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public CmsSysAuthorityExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andNumIsNull() {
+            addCriterion("NUM is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumIsNotNull() {
+            addCriterion("NUM is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumEqualTo(Integer value) {
+            addCriterion("NUM =", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotEqualTo(Integer value) {
+            addCriterion("NUM <>", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumGreaterThan(Integer value) {
+            addCriterion("NUM >", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("NUM >=", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumLessThan(Integer value) {
+            addCriterion("NUM <", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumLessThanOrEqualTo(Integer value) {
+            addCriterion("NUM <=", value, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumIn(List<Integer> values) {
+            addCriterion("NUM in", values, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotIn(List<Integer> values) {
+            addCriterion("NUM not in", values, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumBetween(Integer value1, Integer value2) {
+            addCriterion("NUM between", value1, value2, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("NUM not between", value1, value2, "num");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("ID like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("ID not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelIsNull() {
+            addCriterion("LEVEL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelIsNotNull() {
+            addCriterion("LEVEL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelEqualTo(String value) {
+            addCriterion("LEVEL =", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelNotEqualTo(String value) {
+            addCriterion("LEVEL <>", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelGreaterThan(String value) {
+            addCriterion("LEVEL >", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelGreaterThanOrEqualTo(String value) {
+            addCriterion("LEVEL >=", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelLessThan(String value) {
+            addCriterion("LEVEL <", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelLessThanOrEqualTo(String value) {
+            addCriterion("LEVEL <=", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelLike(String value) {
+            addCriterion("LEVEL like", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelNotLike(String value) {
+            addCriterion("LEVEL not like", value, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelIn(List<String> values) {
+            addCriterion("LEVEL in", values, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelNotIn(List<String> values) {
+            addCriterion("LEVEL not in", values, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelBetween(String value1, String value2) {
+            addCriterion("LEVEL between", value1, value2, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andLevelNotBetween(String value1, String value2) {
+            addCriterion("LEVEL not between", value1, value2, "level");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(String value) {
+            addCriterion("TYPE =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(String value) {
+            addCriterion("TYPE <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(String value) {
+            addCriterion("TYPE >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("TYPE >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(String value) {
+            addCriterion("TYPE <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(String value) {
+            addCriterion("TYPE <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLike(String value) {
+            addCriterion("TYPE like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotLike(String value) {
+            addCriterion("TYPE not like", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<String> values) {
+            addCriterion("TYPE in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<String> values) {
+            addCriterion("TYPE not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(String value1, String value2) {
+            addCriterion("TYPE between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(String value1, String value2) {
+            addCriterion("TYPE not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameIsNull() {
+            addCriterion("OPERATOR_ROLE_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameIsNotNull() {
+            addCriterion("OPERATOR_ROLE_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameEqualTo(String value) {
+            addCriterion("OPERATOR_ROLE_NAME =", value, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameNotEqualTo(String value) {
+            addCriterion("OPERATOR_ROLE_NAME <>", value, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameGreaterThan(String value) {
+            addCriterion("OPERATOR_ROLE_NAME >", value, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameGreaterThanOrEqualTo(String value) {
+            addCriterion("OPERATOR_ROLE_NAME >=", value, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameLessThan(String value) {
+            addCriterion("OPERATOR_ROLE_NAME <", value, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameLessThanOrEqualTo(String value) {
+            addCriterion("OPERATOR_ROLE_NAME <=", value, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameLike(String value) {
+            addCriterion("OPERATOR_ROLE_NAME like", value, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameNotLike(String value) {
+            addCriterion("OPERATOR_ROLE_NAME not like", value, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameIn(List<String> values) {
+            addCriterion("OPERATOR_ROLE_NAME in", values, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameNotIn(List<String> values) {
+            addCriterion("OPERATOR_ROLE_NAME not in", values, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameBetween(String value1, String value2) {
+            addCriterion("OPERATOR_ROLE_NAME between", value1, value2, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRoleNameNotBetween(String value1, String value2) {
+            addCriterion("OPERATOR_ROLE_NAME not between", value1, value2, "operatorRoleName");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathIsNull() {
+            addCriterion("OPERATOR_ROLE_PATH is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathIsNotNull() {
+            addCriterion("OPERATOR_ROLE_PATH is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathEqualTo(String value) {
+            addCriterion("OPERATOR_ROLE_PATH =", value, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathNotEqualTo(String value) {
+            addCriterion("OPERATOR_ROLE_PATH <>", value, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathGreaterThan(String value) {
+            addCriterion("OPERATOR_ROLE_PATH >", value, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathGreaterThanOrEqualTo(String value) {
+            addCriterion("OPERATOR_ROLE_PATH >=", value, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathLessThan(String value) {
+            addCriterion("OPERATOR_ROLE_PATH <", value, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathLessThanOrEqualTo(String value) {
+            addCriterion("OPERATOR_ROLE_PATH <=", value, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathLike(String value) {
+            addCriterion("OPERATOR_ROLE_PATH like", value, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathNotLike(String value) {
+            addCriterion("OPERATOR_ROLE_PATH not like", value, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathIn(List<String> values) {
+            addCriterion("OPERATOR_ROLE_PATH in", values, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathNotIn(List<String> values) {
+            addCriterion("OPERATOR_ROLE_PATH not in", values, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathBetween(String value1, String value2) {
+            addCriterion("OPERATOR_ROLE_PATH between", value1, value2, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andOperatorRolePathNotBetween(String value1, String value2) {
+            addCriterion("OPERATOR_ROLE_PATH not between", value1, value2, "operatorRolePath");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated do_not_delete_during_merge Thu Aug 17 17:24:12 CST 2017
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRole.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRole.java
new file mode 100644
index 000000000..c6d7f2e6c
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRole.java
@@ -0,0 +1,259 @@
+package com.ruoyi.content.domain;
+
+public class CmsSysRole {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_role.ID
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_role.NAME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String name;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_role.CREATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_role.CREATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_role.CREATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_role.UPDATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_role.UPDATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_role.UPDATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    private String updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_role.ID
+     *
+     * @return the value of cms_sys_role.ID
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_role.ID
+     *
+     * @param id the value for cms_sys_role.ID
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_role.NAME
+     *
+     * @return the value of cms_sys_role.NAME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_role.NAME
+     *
+     * @param name the value for cms_sys_role.NAME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_role.CREATE_USER
+     *
+     * @return the value of cms_sys_role.CREATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_role.CREATE_USER
+     *
+     * @param createUser the value for cms_sys_role.CREATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_role.CREATE_DATE
+     *
+     * @return the value of cms_sys_role.CREATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_role.CREATE_DATE
+     *
+     * @param createDate the value for cms_sys_role.CREATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_role.CREATE_TIME
+     *
+     * @return the value of cms_sys_role.CREATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_role.CREATE_TIME
+     *
+     * @param createTime the value for cms_sys_role.CREATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_role.UPDATE_USER
+     *
+     * @return the value of cms_sys_role.UPDATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_role.UPDATE_USER
+     *
+     * @param updateUser the value for cms_sys_role.UPDATE_USER
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_role.UPDATE_DATE
+     *
+     * @return the value of cms_sys_role.UPDATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_role.UPDATE_DATE
+     *
+     * @param updateDate the value for cms_sys_role.UPDATE_DATE
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_role.UPDATE_TIME
+     *
+     * @return the value of cms_sys_role.UPDATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_role.UPDATE_TIME
+     *
+     * @param updateTime the value for cms_sys_role.UPDATE_TIME
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRoleAuthorDto.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRoleAuthorDto.java
new file mode 100644
index 000000000..e469f8523
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRoleAuthorDto.java
@@ -0,0 +1,68 @@
+package com.ruoyi.content.domain;
+
+public class CmsSysRoleAuthorDto {
+	private String id;
+	private String operatorRoleName;
+	private String isHave;
+	private String num;
+	private String level;
+	private String type;
+	private String operatorRolePath;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getOperatorRoleName() {
+		return operatorRoleName;
+	}
+
+	public void setOperatorRoleName(String operatorRoleName) {
+		this.operatorRoleName = operatorRoleName;
+	}
+
+	public String getIsHave() {
+		return isHave;
+	}
+
+	public void setIsHave(String isHave) {
+		this.isHave = isHave;
+	}
+
+	public String getNum() {
+		return num;
+	}
+
+	public void setNum(String num) {
+		this.num = num;
+	}
+
+	public String getLevel() {
+		return level;
+	}
+
+	public void setLevel(String level) {
+		this.level = level;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getOperatorRolePath() {
+		return operatorRolePath;
+	}
+
+	public void setOperatorRolePath(String operatorRolePath) {
+		this.operatorRolePath = operatorRolePath;
+	}
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRoleExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRoleExample.java
new file mode 100644
index 000000000..d91553f94
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysRoleExample.java
@@ -0,0 +1,852 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CmsSysRoleExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public CmsSysRoleExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("NAME =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("NAME <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("NAME >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("NAME >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("NAME <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("NAME <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("NAME like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("NAME not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("NAME in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("NAME not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("NAME between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("NAME not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated do_not_delete_during_merge Thu Aug 17 17:24:12 CST 2017
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysUser.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysUser.java
new file mode 100644
index 000000000..e9f8ea07b
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysUser.java
@@ -0,0 +1,611 @@
+package com.ruoyi.content.domain;
+
+public class CmsSysUser {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.EMAIL
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String email;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.OPEN_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String openId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.PWD
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String pwd;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.SALT
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String salt;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.USER_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String userId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.JOB_NUMBER
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String jobNumber;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.COMPANY_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.BRANCH_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String branchId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.NAME
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String name;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.SEX
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String sex;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.PHONE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String phone;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.STATE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String state;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.CREATE_USER
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.CREATE_DATE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.CREATE_TIME
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.UPDATE_USER
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.UPDATE_DATE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.UPDATE_TIME
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_sys_user.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    private String updateRemark;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.EMAIL
+     *
+     * @return the value of cms_sys_user.EMAIL
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getEmail() {
+        return email;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.EMAIL
+     *
+     * @param email the value for cms_sys_user.EMAIL
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.OPEN_ID
+     *
+     * @return the value of cms_sys_user.OPEN_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getOpenId() {
+        return openId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.OPEN_ID
+     *
+     * @param openId the value for cms_sys_user.OPEN_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setOpenId(String openId) {
+        this.openId = openId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.PWD
+     *
+     * @return the value of cms_sys_user.PWD
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getPwd() {
+        return pwd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.PWD
+     *
+     * @param pwd the value for cms_sys_user.PWD
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setPwd(String pwd) {
+        this.pwd = pwd;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.SALT
+     *
+     * @return the value of cms_sys_user.SALT
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getSalt() {
+        return salt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.SALT
+     *
+     * @param salt the value for cms_sys_user.SALT
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.USER_ID
+     *
+     * @return the value of cms_sys_user.USER_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getUserId() {
+        return userId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.USER_ID
+     *
+     * @param userId the value for cms_sys_user.USER_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.JOB_NUMBER
+     *
+     * @return the value of cms_sys_user.JOB_NUMBER
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getJobNumber() {
+        return jobNumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.JOB_NUMBER
+     *
+     * @param jobNumber the value for cms_sys_user.JOB_NUMBER
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setJobNumber(String jobNumber) {
+        this.jobNumber = jobNumber;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.COMPANY_ID
+     *
+     * @return the value of cms_sys_user.COMPANY_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.COMPANY_ID
+     *
+     * @param companyId the value for cms_sys_user.COMPANY_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.BRANCH_ID
+     *
+     * @return the value of cms_sys_user.BRANCH_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getBranchId() {
+        return branchId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.BRANCH_ID
+     *
+     * @param branchId the value for cms_sys_user.BRANCH_ID
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setBranchId(String branchId) {
+        this.branchId = branchId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.NAME
+     *
+     * @return the value of cms_sys_user.NAME
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.NAME
+     *
+     * @param name the value for cms_sys_user.NAME
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.SEX
+     *
+     * @return the value of cms_sys_user.SEX
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getSex() {
+        return sex;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.SEX
+     *
+     * @param sex the value for cms_sys_user.SEX
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.PHONE
+     *
+     * @return the value of cms_sys_user.PHONE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getPhone() {
+        return phone;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.PHONE
+     *
+     * @param phone the value for cms_sys_user.PHONE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.STATE
+     *
+     * @return the value of cms_sys_user.STATE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.STATE
+     *
+     * @param state the value for cms_sys_user.STATE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.CREATE_USER
+     *
+     * @return the value of cms_sys_user.CREATE_USER
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.CREATE_USER
+     *
+     * @param createUser the value for cms_sys_user.CREATE_USER
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.CREATE_DATE
+     *
+     * @return the value of cms_sys_user.CREATE_DATE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.CREATE_DATE
+     *
+     * @param createDate the value for cms_sys_user.CREATE_DATE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.CREATE_TIME
+     *
+     * @return the value of cms_sys_user.CREATE_TIME
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.CREATE_TIME
+     *
+     * @param createTime the value for cms_sys_user.CREATE_TIME
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.UPDATE_USER
+     *
+     * @return the value of cms_sys_user.UPDATE_USER
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.UPDATE_USER
+     *
+     * @param updateUser the value for cms_sys_user.UPDATE_USER
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.UPDATE_DATE
+     *
+     * @return the value of cms_sys_user.UPDATE_DATE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.UPDATE_DATE
+     *
+     * @param updateDate the value for cms_sys_user.UPDATE_DATE
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.UPDATE_TIME
+     *
+     * @return the value of cms_sys_user.UPDATE_TIME
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.UPDATE_TIME
+     *
+     * @param updateTime the value for cms_sys_user.UPDATE_TIME
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_sys_user.UPDATE_REMARK
+     *
+     * @return the value of cms_sys_user.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getUpdateRemark() {
+        return updateRemark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_sys_user.UPDATE_REMARK
+     *
+     * @param updateRemark the value for cms_sys_user.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setUpdateRemark(String updateRemark) {
+        this.updateRemark = updateRemark;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysUserExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysUserExample.java
new file mode 100644
index 000000000..7937123da
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsSysUserExample.java
@@ -0,0 +1,1632 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CmsSysUserExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public CmsSysUserExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andEmailIsNull() {
+            addCriterion("EMAIL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailIsNotNull() {
+            addCriterion("EMAIL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailEqualTo(String value) {
+            addCriterion("EMAIL =", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotEqualTo(String value) {
+            addCriterion("EMAIL <>", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailGreaterThan(String value) {
+            addCriterion("EMAIL >", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailGreaterThanOrEqualTo(String value) {
+            addCriterion("EMAIL >=", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailLessThan(String value) {
+            addCriterion("EMAIL <", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailLessThanOrEqualTo(String value) {
+            addCriterion("EMAIL <=", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailLike(String value) {
+            addCriterion("EMAIL like", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotLike(String value) {
+            addCriterion("EMAIL not like", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailIn(List<String> values) {
+            addCriterion("EMAIL in", values, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotIn(List<String> values) {
+            addCriterion("EMAIL not in", values, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailBetween(String value1, String value2) {
+            addCriterion("EMAIL between", value1, value2, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotBetween(String value1, String value2) {
+            addCriterion("EMAIL not between", value1, value2, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdIsNull() {
+            addCriterion("OPEN_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdIsNotNull() {
+            addCriterion("OPEN_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdEqualTo(String value) {
+            addCriterion("OPEN_ID =", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotEqualTo(String value) {
+            addCriterion("OPEN_ID <>", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdGreaterThan(String value) {
+            addCriterion("OPEN_ID >", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdGreaterThanOrEqualTo(String value) {
+            addCriterion("OPEN_ID >=", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLessThan(String value) {
+            addCriterion("OPEN_ID <", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLessThanOrEqualTo(String value) {
+            addCriterion("OPEN_ID <=", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdLike(String value) {
+            addCriterion("OPEN_ID like", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotLike(String value) {
+            addCriterion("OPEN_ID not like", value, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdIn(List<String> values) {
+            addCriterion("OPEN_ID in", values, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotIn(List<String> values) {
+            addCriterion("OPEN_ID not in", values, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdBetween(String value1, String value2) {
+            addCriterion("OPEN_ID between", value1, value2, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenIdNotBetween(String value1, String value2) {
+            addCriterion("OPEN_ID not between", value1, value2, "openId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdIsNull() {
+            addCriterion("PWD is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdIsNotNull() {
+            addCriterion("PWD is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdEqualTo(String value) {
+            addCriterion("PWD =", value, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdNotEqualTo(String value) {
+            addCriterion("PWD <>", value, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdGreaterThan(String value) {
+            addCriterion("PWD >", value, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdGreaterThanOrEqualTo(String value) {
+            addCriterion("PWD >=", value, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdLessThan(String value) {
+            addCriterion("PWD <", value, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdLessThanOrEqualTo(String value) {
+            addCriterion("PWD <=", value, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdLike(String value) {
+            addCriterion("PWD like", value, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdNotLike(String value) {
+            addCriterion("PWD not like", value, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdIn(List<String> values) {
+            addCriterion("PWD in", values, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdNotIn(List<String> values) {
+            addCriterion("PWD not in", values, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdBetween(String value1, String value2) {
+            addCriterion("PWD between", value1, value2, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andPwdNotBetween(String value1, String value2) {
+            addCriterion("PWD not between", value1, value2, "pwd");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltIsNull() {
+            addCriterion("SALT is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltIsNotNull() {
+            addCriterion("SALT is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltEqualTo(String value) {
+            addCriterion("SALT =", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltNotEqualTo(String value) {
+            addCriterion("SALT <>", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltGreaterThan(String value) {
+            addCriterion("SALT >", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltGreaterThanOrEqualTo(String value) {
+            addCriterion("SALT >=", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltLessThan(String value) {
+            addCriterion("SALT <", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltLessThanOrEqualTo(String value) {
+            addCriterion("SALT <=", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltLike(String value) {
+            addCriterion("SALT like", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltNotLike(String value) {
+            addCriterion("SALT not like", value, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltIn(List<String> values) {
+            addCriterion("SALT in", values, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltNotIn(List<String> values) {
+            addCriterion("SALT not in", values, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltBetween(String value1, String value2) {
+            addCriterion("SALT between", value1, value2, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andSaltNotBetween(String value1, String value2) {
+            addCriterion("SALT not between", value1, value2, "salt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("USER_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("USER_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(String value) {
+            addCriterion("USER_ID =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(String value) {
+            addCriterion("USER_ID <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(String value) {
+            addCriterion("USER_ID >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(String value) {
+            addCriterion("USER_ID >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(String value) {
+            addCriterion("USER_ID <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(String value) {
+            addCriterion("USER_ID <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLike(String value) {
+            addCriterion("USER_ID like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotLike(String value) {
+            addCriterion("USER_ID not like", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<String> values) {
+            addCriterion("USER_ID in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<String> values) {
+            addCriterion("USER_ID not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(String value1, String value2) {
+            addCriterion("USER_ID between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(String value1, String value2) {
+            addCriterion("USER_ID not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberIsNull() {
+            addCriterion("JOB_NUMBER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberIsNotNull() {
+            addCriterion("JOB_NUMBER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberEqualTo(String value) {
+            addCriterion("JOB_NUMBER =", value, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberNotEqualTo(String value) {
+            addCriterion("JOB_NUMBER <>", value, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberGreaterThan(String value) {
+            addCriterion("JOB_NUMBER >", value, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberGreaterThanOrEqualTo(String value) {
+            addCriterion("JOB_NUMBER >=", value, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberLessThan(String value) {
+            addCriterion("JOB_NUMBER <", value, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberLessThanOrEqualTo(String value) {
+            addCriterion("JOB_NUMBER <=", value, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberLike(String value) {
+            addCriterion("JOB_NUMBER like", value, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberNotLike(String value) {
+            addCriterion("JOB_NUMBER not like", value, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberIn(List<String> values) {
+            addCriterion("JOB_NUMBER in", values, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberNotIn(List<String> values) {
+            addCriterion("JOB_NUMBER not in", values, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberBetween(String value1, String value2) {
+            addCriterion("JOB_NUMBER between", value1, value2, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andJobNumberNotBetween(String value1, String value2) {
+            addCriterion("JOB_NUMBER not between", value1, value2, "jobNumber");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNull() {
+            addCriterion("BRANCH_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIsNotNull() {
+            addCriterion("BRANCH_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdEqualTo(String value) {
+            addCriterion("BRANCH_ID =", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotEqualTo(String value) {
+            addCriterion("BRANCH_ID <>", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThan(String value) {
+            addCriterion("BRANCH_ID >", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdGreaterThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID >=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThan(String value) {
+            addCriterion("BRANCH_ID <", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLessThanOrEqualTo(String value) {
+            addCriterion("BRANCH_ID <=", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdLike(String value) {
+            addCriterion("BRANCH_ID like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotLike(String value) {
+            addCriterion("BRANCH_ID not like", value, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdIn(List<String> values) {
+            addCriterion("BRANCH_ID in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotIn(List<String> values) {
+            addCriterion("BRANCH_ID not in", values, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andBranchIdNotBetween(String value1, String value2) {
+            addCriterion("BRANCH_ID not between", value1, value2, "branchId");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("NAME =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("NAME <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("NAME >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("NAME >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("NAME <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("NAME <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("NAME like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("NAME not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("NAME in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("NAME not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("NAME between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("NAME not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexIsNull() {
+            addCriterion("SEX is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexIsNotNull() {
+            addCriterion("SEX is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexEqualTo(String value) {
+            addCriterion("SEX =", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexNotEqualTo(String value) {
+            addCriterion("SEX <>", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexGreaterThan(String value) {
+            addCriterion("SEX >", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexGreaterThanOrEqualTo(String value) {
+            addCriterion("SEX >=", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexLessThan(String value) {
+            addCriterion("SEX <", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexLessThanOrEqualTo(String value) {
+            addCriterion("SEX <=", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexLike(String value) {
+            addCriterion("SEX like", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexNotLike(String value) {
+            addCriterion("SEX not like", value, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexIn(List<String> values) {
+            addCriterion("SEX in", values, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexNotIn(List<String> values) {
+            addCriterion("SEX not in", values, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexBetween(String value1, String value2) {
+            addCriterion("SEX between", value1, value2, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andSexNotBetween(String value1, String value2) {
+            addCriterion("SEX not between", value1, value2, "sex");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIsNull() {
+            addCriterion("PHONE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIsNotNull() {
+            addCriterion("PHONE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneEqualTo(String value) {
+            addCriterion("PHONE =", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotEqualTo(String value) {
+            addCriterion("PHONE <>", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneGreaterThan(String value) {
+            addCriterion("PHONE >", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneGreaterThanOrEqualTo(String value) {
+            addCriterion("PHONE >=", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLessThan(String value) {
+            addCriterion("PHONE <", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLessThanOrEqualTo(String value) {
+            addCriterion("PHONE <=", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLike(String value) {
+            addCriterion("PHONE like", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotLike(String value) {
+            addCriterion("PHONE not like", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIn(List<String> values) {
+            addCriterion("PHONE in", values, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotIn(List<String> values) {
+            addCriterion("PHONE not in", values, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneBetween(String value1, String value2) {
+            addCriterion("PHONE between", value1, value2, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotBetween(String value1, String value2) {
+            addCriterion("PHONE not between", value1, value2, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(String value) {
+            addCriterion("STATE =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(String value) {
+            addCriterion("STATE <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(String value) {
+            addCriterion("STATE >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(String value) {
+            addCriterion("STATE >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(String value) {
+            addCriterion("STATE <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(String value) {
+            addCriterion("STATE <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLike(String value) {
+            addCriterion("STATE like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotLike(String value) {
+            addCriterion("STATE not like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<String> values) {
+            addCriterion("STATE in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<String> values) {
+            addCriterion("STATE not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(String value1, String value2) {
+            addCriterion("STATE between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(String value1, String value2) {
+            addCriterion("STATE not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkIsNull() {
+            addCriterion("UPDATE_REMARK is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkIsNotNull() {
+            addCriterion("UPDATE_REMARK is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkEqualTo(String value) {
+            addCriterion("UPDATE_REMARK =", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotEqualTo(String value) {
+            addCriterion("UPDATE_REMARK <>", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkGreaterThan(String value) {
+            addCriterion("UPDATE_REMARK >", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_REMARK >=", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkLessThan(String value) {
+            addCriterion("UPDATE_REMARK <", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_REMARK <=", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkLike(String value) {
+            addCriterion("UPDATE_REMARK like", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotLike(String value) {
+            addCriterion("UPDATE_REMARK not like", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkIn(List<String> values) {
+            addCriterion("UPDATE_REMARK in", values, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotIn(List<String> values) {
+            addCriterion("UPDATE_REMARK not in", values, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkBetween(String value1, String value2) {
+            addCriterion("UPDATE_REMARK between", value1, value2, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_REMARK not between", value1, value2, "updateRemark");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated do_not_delete_during_merge Tue Aug 28 09:28:51 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUSerSysRoleDto.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUSerSysRoleDto.java
new file mode 100644
index 000000000..9fda810e1
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUSerSysRoleDto.java
@@ -0,0 +1,32 @@
+package com.ruoyi.content.domain;
+
+public class CmsUSerSysRoleDto {
+	private String name;
+	private String isHave;
+	private String id;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getIsHave() {
+		return isHave;
+	}
+
+	public void setIsHave(String isHave) {
+		this.isHave = isHave;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUserRole.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUserRole.java
new file mode 100644
index 000000000..4fcc8bf83
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUserRole.java
@@ -0,0 +1,291 @@
+package com.ruoyi.content.domain;
+
+public class CmsUserRole {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_user_role.ID
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    private Integer id;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_user_role.AUTHORITY_NAME
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    private String authorityName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_user_role.AUTHORITY_EMAIL
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    private String authorityEmail;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_user_role.CREATE_USER
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_user_role.CREATE_DATE
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_user_role.CREATE_TIME
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_user_role.UPDATE_USER
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_user_role.UPDATE_DATE
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column cms_user_role.UPDATE_TIME
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    private String updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_user_role.ID
+     *
+     * @return the value of cms_user_role.ID
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_user_role.ID
+     *
+     * @param id the value for cms_user_role.ID
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_user_role.AUTHORITY_NAME
+     *
+     * @return the value of cms_user_role.AUTHORITY_NAME
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public String getAuthorityName() {
+        return authorityName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_user_role.AUTHORITY_NAME
+     *
+     * @param authorityName the value for cms_user_role.AUTHORITY_NAME
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void setAuthorityName(String authorityName) {
+        this.authorityName = authorityName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_user_role.AUTHORITY_EMAIL
+     *
+     * @return the value of cms_user_role.AUTHORITY_EMAIL
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public String getAuthorityEmail() {
+        return authorityEmail;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_user_role.AUTHORITY_EMAIL
+     *
+     * @param authorityEmail the value for cms_user_role.AUTHORITY_EMAIL
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void setAuthorityEmail(String authorityEmail) {
+        this.authorityEmail = authorityEmail;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_user_role.CREATE_USER
+     *
+     * @return the value of cms_user_role.CREATE_USER
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_user_role.CREATE_USER
+     *
+     * @param createUser the value for cms_user_role.CREATE_USER
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_user_role.CREATE_DATE
+     *
+     * @return the value of cms_user_role.CREATE_DATE
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_user_role.CREATE_DATE
+     *
+     * @param createDate the value for cms_user_role.CREATE_DATE
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_user_role.CREATE_TIME
+     *
+     * @return the value of cms_user_role.CREATE_TIME
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_user_role.CREATE_TIME
+     *
+     * @param createTime the value for cms_user_role.CREATE_TIME
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_user_role.UPDATE_USER
+     *
+     * @return the value of cms_user_role.UPDATE_USER
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_user_role.UPDATE_USER
+     *
+     * @param updateUser the value for cms_user_role.UPDATE_USER
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_user_role.UPDATE_DATE
+     *
+     * @return the value of cms_user_role.UPDATE_DATE
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_user_role.UPDATE_DATE
+     *
+     * @param updateDate the value for cms_user_role.UPDATE_DATE
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column cms_user_role.UPDATE_TIME
+     *
+     * @return the value of cms_user_role.UPDATE_TIME
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column cms_user_role.UPDATE_TIME
+     *
+     * @param updateTime the value for cms_user_role.UPDATE_TIME
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUserRoleExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUserRoleExample.java
new file mode 100644
index 000000000..aeb6abea4
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CmsUserRoleExample.java
@@ -0,0 +1,922 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CmsUserRoleExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public CmsUserRoleExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("ID =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("ID <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("ID >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ID >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("ID <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("ID <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("ID in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("ID not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("ID between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("ID not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameIsNull() {
+            addCriterion("AUTHORITY_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameIsNotNull() {
+            addCriterion("AUTHORITY_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameEqualTo(String value) {
+            addCriterion("AUTHORITY_NAME =", value, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameNotEqualTo(String value) {
+            addCriterion("AUTHORITY_NAME <>", value, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameGreaterThan(String value) {
+            addCriterion("AUTHORITY_NAME >", value, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameGreaterThanOrEqualTo(String value) {
+            addCriterion("AUTHORITY_NAME >=", value, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameLessThan(String value) {
+            addCriterion("AUTHORITY_NAME <", value, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameLessThanOrEqualTo(String value) {
+            addCriterion("AUTHORITY_NAME <=", value, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameLike(String value) {
+            addCriterion("AUTHORITY_NAME like", value, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameNotLike(String value) {
+            addCriterion("AUTHORITY_NAME not like", value, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameIn(List<String> values) {
+            addCriterion("AUTHORITY_NAME in", values, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameNotIn(List<String> values) {
+            addCriterion("AUTHORITY_NAME not in", values, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameBetween(String value1, String value2) {
+            addCriterion("AUTHORITY_NAME between", value1, value2, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityNameNotBetween(String value1, String value2) {
+            addCriterion("AUTHORITY_NAME not between", value1, value2, "authorityName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailIsNull() {
+            addCriterion("AUTHORITY_EMAIL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailIsNotNull() {
+            addCriterion("AUTHORITY_EMAIL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailEqualTo(String value) {
+            addCriterion("AUTHORITY_EMAIL =", value, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailNotEqualTo(String value) {
+            addCriterion("AUTHORITY_EMAIL <>", value, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailGreaterThan(String value) {
+            addCriterion("AUTHORITY_EMAIL >", value, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailGreaterThanOrEqualTo(String value) {
+            addCriterion("AUTHORITY_EMAIL >=", value, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailLessThan(String value) {
+            addCriterion("AUTHORITY_EMAIL <", value, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailLessThanOrEqualTo(String value) {
+            addCriterion("AUTHORITY_EMAIL <=", value, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailLike(String value) {
+            addCriterion("AUTHORITY_EMAIL like", value, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailNotLike(String value) {
+            addCriterion("AUTHORITY_EMAIL not like", value, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailIn(List<String> values) {
+            addCriterion("AUTHORITY_EMAIL in", values, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailNotIn(List<String> values) {
+            addCriterion("AUTHORITY_EMAIL not in", values, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailBetween(String value1, String value2) {
+            addCriterion("AUTHORITY_EMAIL between", value1, value2, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andAuthorityEmailNotBetween(String value1, String value2) {
+            addCriterion("AUTHORITY_EMAIL not between", value1, value2, "authorityEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_user_role
+     *
+     * @mbggenerated do_not_delete_during_merge Fri Aug 18 13:38:42 CST 2017
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyArticleInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyArticleInfo.java
new file mode 100644
index 000000000..8b5eb2002
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyArticleInfo.java
@@ -0,0 +1,67 @@
+package com.ruoyi.content.domain;
+
+public class CompanyArticleInfo  {
+
+	private String publishId;		//文章发布Id(版本号)
+	private String articleId;		//文章id
+	private String articleName;		//文章名称
+	private String listPicUrl;		//文章列表显示图片
+	private String createDate;		//文章发布日期
+	private String visitorCount;	//文章浏览人数
+	private String sharedCount;		//文章分享人数
+	private String publishViewUrl;	//文章发布浏览静态页面路径
+	
+	
+	
+	public String getPublishId() {
+		return publishId;
+	}
+	public void setPublishId(String publishId) {
+		this.publishId = publishId;
+	}
+	public String getArticleId() {
+		return articleId;
+	}
+	public void setArticleId(String articleId) {
+		this.articleId = articleId;
+	}
+	public String getArticleName() {
+		return articleName;
+	}
+	public void setArticleName(String articleName) {
+		this.articleName = articleName;
+	}
+	public String getListPicUrl() {
+		return listPicUrl;
+	}
+	public void setListPicUrl(String listPicUrl) {
+		this.listPicUrl = listPicUrl;
+	}
+	public String getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+	public String getVisitorCount() {
+		return visitorCount;
+	}
+	public void setVisitorCount(String visitorCount) {
+		this.visitorCount = visitorCount;
+	}
+	public String getSharedCount() {
+		return sharedCount;
+	}
+	public void setSharedCount(String sharedCount) {
+		this.sharedCount = sharedCount;
+	}
+	public String getPublishViewUrl() {
+		return publishViewUrl;
+	}
+	public void setPublishViewUrl(String publishViewUrl) {
+		this.publishViewUrl = publishViewUrl;
+	}
+
+	
+	 
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyInfo.java
new file mode 100644
index 000000000..ca8ffcf47
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyInfo.java
@@ -0,0 +1,547 @@
+package com.ruoyi.content.domain;
+
+public class CompanyInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private Integer companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.APP_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String appName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.APP_ORIGINAL_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String appOriginalId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.WECHAT_CODE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String wechatCode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.WECHAT_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String wechatType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.QR_CODE_URL
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String qrCodeUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.APP_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String appId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.APP_SECRET
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String appSecret;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.COMPANY_CODE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String companyCode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.COMPANY_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String companyName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.COMPANY_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String companyType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column company_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.COMPANY_ID
+     *
+     * @return the value of company_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.COMPANY_ID
+     *
+     * @param companyId the value for company_info.COMPANY_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.APP_NAME
+     *
+     * @return the value of company_info.APP_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getAppName() {
+        return appName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.APP_NAME
+     *
+     * @param appName the value for company_info.APP_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.APP_ORIGINAL_ID
+     *
+     * @return the value of company_info.APP_ORIGINAL_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getAppOriginalId() {
+        return appOriginalId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.APP_ORIGINAL_ID
+     *
+     * @param appOriginalId the value for company_info.APP_ORIGINAL_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setAppOriginalId(String appOriginalId) {
+        this.appOriginalId = appOriginalId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.WECHAT_CODE
+     *
+     * @return the value of company_info.WECHAT_CODE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getWechatCode() {
+        return wechatCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.WECHAT_CODE
+     *
+     * @param wechatCode the value for company_info.WECHAT_CODE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setWechatCode(String wechatCode) {
+        this.wechatCode = wechatCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.WECHAT_TYPE
+     *
+     * @return the value of company_info.WECHAT_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getWechatType() {
+        return wechatType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.WECHAT_TYPE
+     *
+     * @param wechatType the value for company_info.WECHAT_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setWechatType(String wechatType) {
+        this.wechatType = wechatType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.QR_CODE_URL
+     *
+     * @return the value of company_info.QR_CODE_URL
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getQrCodeUrl() {
+        return qrCodeUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.QR_CODE_URL
+     *
+     * @param qrCodeUrl the value for company_info.QR_CODE_URL
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setQrCodeUrl(String qrCodeUrl) {
+        this.qrCodeUrl = qrCodeUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.APP_ID
+     *
+     * @return the value of company_info.APP_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getAppId() {
+        return appId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.APP_ID
+     *
+     * @param appId the value for company_info.APP_ID
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.APP_SECRET
+     *
+     * @return the value of company_info.APP_SECRET
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getAppSecret() {
+        return appSecret;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.APP_SECRET
+     *
+     * @param appSecret the value for company_info.APP_SECRET
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setAppSecret(String appSecret) {
+        this.appSecret = appSecret;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.COMPANY_CODE
+     *
+     * @return the value of company_info.COMPANY_CODE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCompanyCode() {
+        return companyCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.COMPANY_CODE
+     *
+     * @param companyCode the value for company_info.COMPANY_CODE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCompanyCode(String companyCode) {
+        this.companyCode = companyCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.COMPANY_NAME
+     *
+     * @return the value of company_info.COMPANY_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.COMPANY_NAME
+     *
+     * @param companyName the value for company_info.COMPANY_NAME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.COMPANY_TYPE
+     *
+     * @return the value of company_info.COMPANY_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCompanyType() {
+        return companyType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.COMPANY_TYPE
+     *
+     * @param companyType the value for company_info.COMPANY_TYPE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCompanyType(String companyType) {
+        this.companyType = companyType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.CREATE_DATE
+     *
+     * @return the value of company_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.CREATE_DATE
+     *
+     * @param createDate the value for company_info.CREATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.CREATE_TIME
+     *
+     * @return the value of company_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.CREATE_TIME
+     *
+     * @param createTime the value for company_info.CREATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.CREATE_USER
+     *
+     * @return the value of company_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.CREATE_USER
+     *
+     * @param createUser the value for company_info.CREATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.UPDATE_USER
+     *
+     * @return the value of company_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.UPDATE_USER
+     *
+     * @param updateUser the value for company_info.UPDATE_USER
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.UPDATE_DATE
+     *
+     * @return the value of company_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.UPDATE_DATE
+     *
+     * @param updateDate the value for company_info.UPDATE_DATE
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column company_info.UPDATE_TIME
+     *
+     * @return the value of company_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column company_info.UPDATE_TIME
+     *
+     * @param updateTime the value for company_info.UPDATE_TIME
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyInfoExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyInfoExample.java
new file mode 100644
index 000000000..cc2f3a554
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/CompanyInfoExample.java
@@ -0,0 +1,1482 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CompanyInfoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public CompanyInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(Integer value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(Integer value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(Integer value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(Integer value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<Integer> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<Integer> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameIsNull() {
+            addCriterion("APP_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameIsNotNull() {
+            addCriterion("APP_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameEqualTo(String value) {
+            addCriterion("APP_NAME =", value, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameNotEqualTo(String value) {
+            addCriterion("APP_NAME <>", value, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameGreaterThan(String value) {
+            addCriterion("APP_NAME >", value, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameGreaterThanOrEqualTo(String value) {
+            addCriterion("APP_NAME >=", value, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameLessThan(String value) {
+            addCriterion("APP_NAME <", value, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameLessThanOrEqualTo(String value) {
+            addCriterion("APP_NAME <=", value, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameLike(String value) {
+            addCriterion("APP_NAME like", value, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameNotLike(String value) {
+            addCriterion("APP_NAME not like", value, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameIn(List<String> values) {
+            addCriterion("APP_NAME in", values, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameNotIn(List<String> values) {
+            addCriterion("APP_NAME not in", values, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameBetween(String value1, String value2) {
+            addCriterion("APP_NAME between", value1, value2, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppNameNotBetween(String value1, String value2) {
+            addCriterion("APP_NAME not between", value1, value2, "appName");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdIsNull() {
+            addCriterion("APP_ORIGINAL_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdIsNotNull() {
+            addCriterion("APP_ORIGINAL_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdEqualTo(String value) {
+            addCriterion("APP_ORIGINAL_ID =", value, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdNotEqualTo(String value) {
+            addCriterion("APP_ORIGINAL_ID <>", value, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdGreaterThan(String value) {
+            addCriterion("APP_ORIGINAL_ID >", value, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdGreaterThanOrEqualTo(String value) {
+            addCriterion("APP_ORIGINAL_ID >=", value, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdLessThan(String value) {
+            addCriterion("APP_ORIGINAL_ID <", value, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdLessThanOrEqualTo(String value) {
+            addCriterion("APP_ORIGINAL_ID <=", value, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdLike(String value) {
+            addCriterion("APP_ORIGINAL_ID like", value, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdNotLike(String value) {
+            addCriterion("APP_ORIGINAL_ID not like", value, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdIn(List<String> values) {
+            addCriterion("APP_ORIGINAL_ID in", values, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdNotIn(List<String> values) {
+            addCriterion("APP_ORIGINAL_ID not in", values, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdBetween(String value1, String value2) {
+            addCriterion("APP_ORIGINAL_ID between", value1, value2, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppOriginalIdNotBetween(String value1, String value2) {
+            addCriterion("APP_ORIGINAL_ID not between", value1, value2, "appOriginalId");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeIsNull() {
+            addCriterion("WECHAT_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeIsNotNull() {
+            addCriterion("WECHAT_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeEqualTo(String value) {
+            addCriterion("WECHAT_CODE =", value, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeNotEqualTo(String value) {
+            addCriterion("WECHAT_CODE <>", value, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeGreaterThan(String value) {
+            addCriterion("WECHAT_CODE >", value, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("WECHAT_CODE >=", value, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeLessThan(String value) {
+            addCriterion("WECHAT_CODE <", value, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeLessThanOrEqualTo(String value) {
+            addCriterion("WECHAT_CODE <=", value, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeLike(String value) {
+            addCriterion("WECHAT_CODE like", value, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeNotLike(String value) {
+            addCriterion("WECHAT_CODE not like", value, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeIn(List<String> values) {
+            addCriterion("WECHAT_CODE in", values, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeNotIn(List<String> values) {
+            addCriterion("WECHAT_CODE not in", values, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeBetween(String value1, String value2) {
+            addCriterion("WECHAT_CODE between", value1, value2, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatCodeNotBetween(String value1, String value2) {
+            addCriterion("WECHAT_CODE not between", value1, value2, "wechatCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeIsNull() {
+            addCriterion("WECHAT_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeIsNotNull() {
+            addCriterion("WECHAT_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeEqualTo(String value) {
+            addCriterion("WECHAT_TYPE =", value, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeNotEqualTo(String value) {
+            addCriterion("WECHAT_TYPE <>", value, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeGreaterThan(String value) {
+            addCriterion("WECHAT_TYPE >", value, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("WECHAT_TYPE >=", value, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeLessThan(String value) {
+            addCriterion("WECHAT_TYPE <", value, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeLessThanOrEqualTo(String value) {
+            addCriterion("WECHAT_TYPE <=", value, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeLike(String value) {
+            addCriterion("WECHAT_TYPE like", value, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeNotLike(String value) {
+            addCriterion("WECHAT_TYPE not like", value, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeIn(List<String> values) {
+            addCriterion("WECHAT_TYPE in", values, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeNotIn(List<String> values) {
+            addCriterion("WECHAT_TYPE not in", values, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeBetween(String value1, String value2) {
+            addCriterion("WECHAT_TYPE between", value1, value2, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andWechatTypeNotBetween(String value1, String value2) {
+            addCriterion("WECHAT_TYPE not between", value1, value2, "wechatType");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlIsNull() {
+            addCriterion("QR_CODE_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlIsNotNull() {
+            addCriterion("QR_CODE_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlEqualTo(String value) {
+            addCriterion("QR_CODE_URL =", value, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlNotEqualTo(String value) {
+            addCriterion("QR_CODE_URL <>", value, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlGreaterThan(String value) {
+            addCriterion("QR_CODE_URL >", value, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("QR_CODE_URL >=", value, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlLessThan(String value) {
+            addCriterion("QR_CODE_URL <", value, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlLessThanOrEqualTo(String value) {
+            addCriterion("QR_CODE_URL <=", value, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlLike(String value) {
+            addCriterion("QR_CODE_URL like", value, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlNotLike(String value) {
+            addCriterion("QR_CODE_URL not like", value, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlIn(List<String> values) {
+            addCriterion("QR_CODE_URL in", values, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlNotIn(List<String> values) {
+            addCriterion("QR_CODE_URL not in", values, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlBetween(String value1, String value2) {
+            addCriterion("QR_CODE_URL between", value1, value2, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andQrCodeUrlNotBetween(String value1, String value2) {
+            addCriterion("QR_CODE_URL not between", value1, value2, "qrCodeUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdIsNull() {
+            addCriterion("APP_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdIsNotNull() {
+            addCriterion("APP_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdEqualTo(String value) {
+            addCriterion("APP_ID =", value, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdNotEqualTo(String value) {
+            addCriterion("APP_ID <>", value, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdGreaterThan(String value) {
+            addCriterion("APP_ID >", value, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdGreaterThanOrEqualTo(String value) {
+            addCriterion("APP_ID >=", value, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdLessThan(String value) {
+            addCriterion("APP_ID <", value, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdLessThanOrEqualTo(String value) {
+            addCriterion("APP_ID <=", value, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdLike(String value) {
+            addCriterion("APP_ID like", value, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdNotLike(String value) {
+            addCriterion("APP_ID not like", value, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdIn(List<String> values) {
+            addCriterion("APP_ID in", values, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdNotIn(List<String> values) {
+            addCriterion("APP_ID not in", values, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdBetween(String value1, String value2) {
+            addCriterion("APP_ID between", value1, value2, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppIdNotBetween(String value1, String value2) {
+            addCriterion("APP_ID not between", value1, value2, "appId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretIsNull() {
+            addCriterion("APP_SECRET is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretIsNotNull() {
+            addCriterion("APP_SECRET is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretEqualTo(String value) {
+            addCriterion("APP_SECRET =", value, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretNotEqualTo(String value) {
+            addCriterion("APP_SECRET <>", value, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretGreaterThan(String value) {
+            addCriterion("APP_SECRET >", value, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretGreaterThanOrEqualTo(String value) {
+            addCriterion("APP_SECRET >=", value, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretLessThan(String value) {
+            addCriterion("APP_SECRET <", value, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretLessThanOrEqualTo(String value) {
+            addCriterion("APP_SECRET <=", value, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretLike(String value) {
+            addCriterion("APP_SECRET like", value, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretNotLike(String value) {
+            addCriterion("APP_SECRET not like", value, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretIn(List<String> values) {
+            addCriterion("APP_SECRET in", values, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretNotIn(List<String> values) {
+            addCriterion("APP_SECRET not in", values, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretBetween(String value1, String value2) {
+            addCriterion("APP_SECRET between", value1, value2, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andAppSecretNotBetween(String value1, String value2) {
+            addCriterion("APP_SECRET not between", value1, value2, "appSecret");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeIsNull() {
+            addCriterion("COMPANY_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeIsNotNull() {
+            addCriterion("COMPANY_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeEqualTo(String value) {
+            addCriterion("COMPANY_CODE =", value, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeNotEqualTo(String value) {
+            addCriterion("COMPANY_CODE <>", value, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeGreaterThan(String value) {
+            addCriterion("COMPANY_CODE >", value, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_CODE >=", value, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeLessThan(String value) {
+            addCriterion("COMPANY_CODE <", value, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_CODE <=", value, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeLike(String value) {
+            addCriterion("COMPANY_CODE like", value, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeNotLike(String value) {
+            addCriterion("COMPANY_CODE not like", value, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeIn(List<String> values) {
+            addCriterion("COMPANY_CODE in", values, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeNotIn(List<String> values) {
+            addCriterion("COMPANY_CODE not in", values, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeBetween(String value1, String value2) {
+            addCriterion("COMPANY_CODE between", value1, value2, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyCodeNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_CODE not between", value1, value2, "companyCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIsNull() {
+            addCriterion("COMPANY_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIsNotNull() {
+            addCriterion("COMPANY_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameEqualTo(String value) {
+            addCriterion("COMPANY_NAME =", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotEqualTo(String value) {
+            addCriterion("COMPANY_NAME <>", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameGreaterThan(String value) {
+            addCriterion("COMPANY_NAME >", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_NAME >=", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLessThan(String value) {
+            addCriterion("COMPANY_NAME <", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_NAME <=", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameLike(String value) {
+            addCriterion("COMPANY_NAME like", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotLike(String value) {
+            addCriterion("COMPANY_NAME not like", value, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameIn(List<String> values) {
+            addCriterion("COMPANY_NAME in", values, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotIn(List<String> values) {
+            addCriterion("COMPANY_NAME not in", values, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameBetween(String value1, String value2) {
+            addCriterion("COMPANY_NAME between", value1, value2, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyNameNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_NAME not between", value1, value2, "companyName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeIsNull() {
+            addCriterion("COMPANY_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeIsNotNull() {
+            addCriterion("COMPANY_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeEqualTo(String value) {
+            addCriterion("COMPANY_TYPE =", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotEqualTo(String value) {
+            addCriterion("COMPANY_TYPE <>", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeGreaterThan(String value) {
+            addCriterion("COMPANY_TYPE >", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_TYPE >=", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeLessThan(String value) {
+            addCriterion("COMPANY_TYPE <", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_TYPE <=", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeLike(String value) {
+            addCriterion("COMPANY_TYPE like", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotLike(String value) {
+            addCriterion("COMPANY_TYPE not like", value, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeIn(List<String> values) {
+            addCriterion("COMPANY_TYPE in", values, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotIn(List<String> values) {
+            addCriterion("COMPANY_TYPE not in", values, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeBetween(String value1, String value2) {
+            addCriterion("COMPANY_TYPE between", value1, value2, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyTypeNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_TYPE not between", value1, value2, "companyType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table company_info
+     *
+     * @mbggenerated do_not_delete_during_merge Mon Mar 26 15:46:22 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdCom.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdCom.java
new file mode 100644
index 000000000..9f6309f21
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdCom.java
@@ -0,0 +1,1221 @@
+package com.ruoyi.content.domain;
+
+import java.util.Date;
+
+public class LdCom {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.COMCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String comcode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.OUTCOMCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String outcomcode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.NAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String name;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.SHORTNAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String shortname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.ADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String address;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.ZIPCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String zipcode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.PHONE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String phone;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.FAX
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String fax;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.EMAIL
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String email;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.WEBADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String webaddress;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.SATRAPNAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String satrapname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.INSUMONITORCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String insumonitorcode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.INSUREID
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String insureid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.SIGNID
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String signid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.REGIONALISMCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String regionalismcode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.COMNATURE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String comnature;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.VALIDCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String validcode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.SIGN
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String sign;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.COMCITYSIZE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String comcitysize;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.SERVICENAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String servicename;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.SERVICENO
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String serviceno;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.SERVICEPHONE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String servicephone;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.SERVICEPOSTADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String servicepostaddress;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.SERVICEPOSTZIPCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String servicepostzipcode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.LETTERSERVICENAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String letterservicename;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.LETTERSERVICENO
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String letterserviceno;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.LETTERSERVICEPHONE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String letterservicephone;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.LETTERSERVICEPOSTADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String letterservicepostaddress;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.LETTERSERVICEPOSTZIPCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String letterservicepostzipcode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.COMGRADE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String comgrade;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.COMAREATYPE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String comareatype;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.INPUTDATE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private Date inputdate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.INPUTTIME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String inputtime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.SEQUENCE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String sequence;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.PROVINCE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String province;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.CITY
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String city;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.COUNTY
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String county;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom.PREFECTURALLEVELCITY
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    private String prefecturallevelcity;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.COMCODE
+     *
+     * @return the value of ldcom.COMCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getComcode() {
+        return comcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.COMCODE
+     *
+     * @param comcode the value for ldcom.COMCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setComcode(String comcode) {
+        this.comcode = comcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.OUTCOMCODE
+     *
+     * @return the value of ldcom.OUTCOMCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getOutcomcode() {
+        return outcomcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.OUTCOMCODE
+     *
+     * @param outcomcode the value for ldcom.OUTCOMCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setOutcomcode(String outcomcode) {
+        this.outcomcode = outcomcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.NAME
+     *
+     * @return the value of ldcom.NAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.NAME
+     *
+     * @param name the value for ldcom.NAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.SHORTNAME
+     *
+     * @return the value of ldcom.SHORTNAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getShortname() {
+        return shortname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.SHORTNAME
+     *
+     * @param shortname the value for ldcom.SHORTNAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setShortname(String shortname) {
+        this.shortname = shortname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.ADDRESS
+     *
+     * @return the value of ldcom.ADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getAddress() {
+        return address;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.ADDRESS
+     *
+     * @param address the value for ldcom.ADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.ZIPCODE
+     *
+     * @return the value of ldcom.ZIPCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getZipcode() {
+        return zipcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.ZIPCODE
+     *
+     * @param zipcode the value for ldcom.ZIPCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setZipcode(String zipcode) {
+        this.zipcode = zipcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.PHONE
+     *
+     * @return the value of ldcom.PHONE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getPhone() {
+        return phone;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.PHONE
+     *
+     * @param phone the value for ldcom.PHONE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.FAX
+     *
+     * @return the value of ldcom.FAX
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getFax() {
+        return fax;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.FAX
+     *
+     * @param fax the value for ldcom.FAX
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setFax(String fax) {
+        this.fax = fax;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.EMAIL
+     *
+     * @return the value of ldcom.EMAIL
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getEmail() {
+        return email;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.EMAIL
+     *
+     * @param email the value for ldcom.EMAIL
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.WEBADDRESS
+     *
+     * @return the value of ldcom.WEBADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getWebaddress() {
+        return webaddress;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.WEBADDRESS
+     *
+     * @param webaddress the value for ldcom.WEBADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setWebaddress(String webaddress) {
+        this.webaddress = webaddress;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.SATRAPNAME
+     *
+     * @return the value of ldcom.SATRAPNAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getSatrapname() {
+        return satrapname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.SATRAPNAME
+     *
+     * @param satrapname the value for ldcom.SATRAPNAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setSatrapname(String satrapname) {
+        this.satrapname = satrapname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.INSUMONITORCODE
+     *
+     * @return the value of ldcom.INSUMONITORCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getInsumonitorcode() {
+        return insumonitorcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.INSUMONITORCODE
+     *
+     * @param insumonitorcode the value for ldcom.INSUMONITORCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setInsumonitorcode(String insumonitorcode) {
+        this.insumonitorcode = insumonitorcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.INSUREID
+     *
+     * @return the value of ldcom.INSUREID
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getInsureid() {
+        return insureid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.INSUREID
+     *
+     * @param insureid the value for ldcom.INSUREID
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setInsureid(String insureid) {
+        this.insureid = insureid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.SIGNID
+     *
+     * @return the value of ldcom.SIGNID
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getSignid() {
+        return signid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.SIGNID
+     *
+     * @param signid the value for ldcom.SIGNID
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setSignid(String signid) {
+        this.signid = signid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.REGIONALISMCODE
+     *
+     * @return the value of ldcom.REGIONALISMCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getRegionalismcode() {
+        return regionalismcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.REGIONALISMCODE
+     *
+     * @param regionalismcode the value for ldcom.REGIONALISMCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setRegionalismcode(String regionalismcode) {
+        this.regionalismcode = regionalismcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.COMNATURE
+     *
+     * @return the value of ldcom.COMNATURE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getComnature() {
+        return comnature;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.COMNATURE
+     *
+     * @param comnature the value for ldcom.COMNATURE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setComnature(String comnature) {
+        this.comnature = comnature;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.VALIDCODE
+     *
+     * @return the value of ldcom.VALIDCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getValidcode() {
+        return validcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.VALIDCODE
+     *
+     * @param validcode the value for ldcom.VALIDCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setValidcode(String validcode) {
+        this.validcode = validcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.SIGN
+     *
+     * @return the value of ldcom.SIGN
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getSign() {
+        return sign;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.SIGN
+     *
+     * @param sign the value for ldcom.SIGN
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setSign(String sign) {
+        this.sign = sign;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.COMCITYSIZE
+     *
+     * @return the value of ldcom.COMCITYSIZE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getComcitysize() {
+        return comcitysize;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.COMCITYSIZE
+     *
+     * @param comcitysize the value for ldcom.COMCITYSIZE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setComcitysize(String comcitysize) {
+        this.comcitysize = comcitysize;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.SERVICENAME
+     *
+     * @return the value of ldcom.SERVICENAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getServicename() {
+        return servicename;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.SERVICENAME
+     *
+     * @param servicename the value for ldcom.SERVICENAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setServicename(String servicename) {
+        this.servicename = servicename;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.SERVICENO
+     *
+     * @return the value of ldcom.SERVICENO
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getServiceno() {
+        return serviceno;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.SERVICENO
+     *
+     * @param serviceno the value for ldcom.SERVICENO
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setServiceno(String serviceno) {
+        this.serviceno = serviceno;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.SERVICEPHONE
+     *
+     * @return the value of ldcom.SERVICEPHONE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getServicephone() {
+        return servicephone;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.SERVICEPHONE
+     *
+     * @param servicephone the value for ldcom.SERVICEPHONE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setServicephone(String servicephone) {
+        this.servicephone = servicephone;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.SERVICEPOSTADDRESS
+     *
+     * @return the value of ldcom.SERVICEPOSTADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getServicepostaddress() {
+        return servicepostaddress;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.SERVICEPOSTADDRESS
+     *
+     * @param servicepostaddress the value for ldcom.SERVICEPOSTADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setServicepostaddress(String servicepostaddress) {
+        this.servicepostaddress = servicepostaddress;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.SERVICEPOSTZIPCODE
+     *
+     * @return the value of ldcom.SERVICEPOSTZIPCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getServicepostzipcode() {
+        return servicepostzipcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.SERVICEPOSTZIPCODE
+     *
+     * @param servicepostzipcode the value for ldcom.SERVICEPOSTZIPCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setServicepostzipcode(String servicepostzipcode) {
+        this.servicepostzipcode = servicepostzipcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.LETTERSERVICENAME
+     *
+     * @return the value of ldcom.LETTERSERVICENAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getLetterservicename() {
+        return letterservicename;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.LETTERSERVICENAME
+     *
+     * @param letterservicename the value for ldcom.LETTERSERVICENAME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setLetterservicename(String letterservicename) {
+        this.letterservicename = letterservicename;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.LETTERSERVICENO
+     *
+     * @return the value of ldcom.LETTERSERVICENO
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getLetterserviceno() {
+        return letterserviceno;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.LETTERSERVICENO
+     *
+     * @param letterserviceno the value for ldcom.LETTERSERVICENO
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setLetterserviceno(String letterserviceno) {
+        this.letterserviceno = letterserviceno;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.LETTERSERVICEPHONE
+     *
+     * @return the value of ldcom.LETTERSERVICEPHONE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getLetterservicephone() {
+        return letterservicephone;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.LETTERSERVICEPHONE
+     *
+     * @param letterservicephone the value for ldcom.LETTERSERVICEPHONE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setLetterservicephone(String letterservicephone) {
+        this.letterservicephone = letterservicephone;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.LETTERSERVICEPOSTADDRESS
+     *
+     * @return the value of ldcom.LETTERSERVICEPOSTADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getLetterservicepostaddress() {
+        return letterservicepostaddress;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.LETTERSERVICEPOSTADDRESS
+     *
+     * @param letterservicepostaddress the value for ldcom.LETTERSERVICEPOSTADDRESS
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setLetterservicepostaddress(String letterservicepostaddress) {
+        this.letterservicepostaddress = letterservicepostaddress;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.LETTERSERVICEPOSTZIPCODE
+     *
+     * @return the value of ldcom.LETTERSERVICEPOSTZIPCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getLetterservicepostzipcode() {
+        return letterservicepostzipcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.LETTERSERVICEPOSTZIPCODE
+     *
+     * @param letterservicepostzipcode the value for ldcom.LETTERSERVICEPOSTZIPCODE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setLetterservicepostzipcode(String letterservicepostzipcode) {
+        this.letterservicepostzipcode = letterservicepostzipcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.COMGRADE
+     *
+     * @return the value of ldcom.COMGRADE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getComgrade() {
+        return comgrade;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.COMGRADE
+     *
+     * @param comgrade the value for ldcom.COMGRADE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setComgrade(String comgrade) {
+        this.comgrade = comgrade;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.COMAREATYPE
+     *
+     * @return the value of ldcom.COMAREATYPE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getComareatype() {
+        return comareatype;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.COMAREATYPE
+     *
+     * @param comareatype the value for ldcom.COMAREATYPE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setComareatype(String comareatype) {
+        this.comareatype = comareatype;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.INPUTDATE
+     *
+     * @return the value of ldcom.INPUTDATE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public Date getInputdate() {
+        return inputdate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.INPUTDATE
+     *
+     * @param inputdate the value for ldcom.INPUTDATE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setInputdate(Date inputdate) {
+        this.inputdate = inputdate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.INPUTTIME
+     *
+     * @return the value of ldcom.INPUTTIME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getInputtime() {
+        return inputtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.INPUTTIME
+     *
+     * @param inputtime the value for ldcom.INPUTTIME
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setInputtime(String inputtime) {
+        this.inputtime = inputtime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.SEQUENCE
+     *
+     * @return the value of ldcom.SEQUENCE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getSequence() {
+        return sequence;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.SEQUENCE
+     *
+     * @param sequence the value for ldcom.SEQUENCE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setSequence(String sequence) {
+        this.sequence = sequence;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.PROVINCE
+     *
+     * @return the value of ldcom.PROVINCE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getProvince() {
+        return province;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.PROVINCE
+     *
+     * @param province the value for ldcom.PROVINCE
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.CITY
+     *
+     * @return the value of ldcom.CITY
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getCity() {
+        return city;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.CITY
+     *
+     * @param city the value for ldcom.CITY
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.COUNTY
+     *
+     * @return the value of ldcom.COUNTY
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getCounty() {
+        return county;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.COUNTY
+     *
+     * @param county the value for ldcom.COUNTY
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setCounty(String county) {
+        this.county = county;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom.PREFECTURALLEVELCITY
+     *
+     * @return the value of ldcom.PREFECTURALLEVELCITY
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getPrefecturallevelcity() {
+        return prefecturallevelcity;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom.PREFECTURALLEVELCITY
+     *
+     * @param prefecturallevelcity the value for ldcom.PREFECTURALLEVELCITY
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setPrefecturallevelcity(String prefecturallevelcity) {
+        this.prefecturallevelcity = prefecturallevelcity;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComExample.java
new file mode 100644
index 000000000..aa905e58a
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComExample.java
@@ -0,0 +1,2953 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class LdComExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public LdComExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andComcodeIsNull() {
+            addCriterion("COMCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeIsNotNull() {
+            addCriterion("COMCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeEqualTo(String value) {
+            addCriterion("COMCODE =", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeNotEqualTo(String value) {
+            addCriterion("COMCODE <>", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeGreaterThan(String value) {
+            addCriterion("COMCODE >", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("COMCODE >=", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeLessThan(String value) {
+            addCriterion("COMCODE <", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeLessThanOrEqualTo(String value) {
+            addCriterion("COMCODE <=", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeLike(String value) {
+            addCriterion("COMCODE like", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeNotLike(String value) {
+            addCriterion("COMCODE not like", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeIn(List<String> values) {
+            addCriterion("COMCODE in", values, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeNotIn(List<String> values) {
+            addCriterion("COMCODE not in", values, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeBetween(String value1, String value2) {
+            addCriterion("COMCODE between", value1, value2, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeNotBetween(String value1, String value2) {
+            addCriterion("COMCODE not between", value1, value2, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeIsNull() {
+            addCriterion("OUTCOMCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeIsNotNull() {
+            addCriterion("OUTCOMCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeEqualTo(String value) {
+            addCriterion("OUTCOMCODE =", value, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeNotEqualTo(String value) {
+            addCriterion("OUTCOMCODE <>", value, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeGreaterThan(String value) {
+            addCriterion("OUTCOMCODE >", value, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("OUTCOMCODE >=", value, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeLessThan(String value) {
+            addCriterion("OUTCOMCODE <", value, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeLessThanOrEqualTo(String value) {
+            addCriterion("OUTCOMCODE <=", value, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeLike(String value) {
+            addCriterion("OUTCOMCODE like", value, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeNotLike(String value) {
+            addCriterion("OUTCOMCODE not like", value, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeIn(List<String> values) {
+            addCriterion("OUTCOMCODE in", values, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeNotIn(List<String> values) {
+            addCriterion("OUTCOMCODE not in", values, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeBetween(String value1, String value2) {
+            addCriterion("OUTCOMCODE between", value1, value2, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andOutcomcodeNotBetween(String value1, String value2) {
+            addCriterion("OUTCOMCODE not between", value1, value2, "outcomcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNull() {
+            addCriterion("NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIsNotNull() {
+            addCriterion("NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameEqualTo(String value) {
+            addCriterion("NAME =", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotEqualTo(String value) {
+            addCriterion("NAME <>", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThan(String value) {
+            addCriterion("NAME >", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameGreaterThanOrEqualTo(String value) {
+            addCriterion("NAME >=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThan(String value) {
+            addCriterion("NAME <", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLessThanOrEqualTo(String value) {
+            addCriterion("NAME <=", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameLike(String value) {
+            addCriterion("NAME like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotLike(String value) {
+            addCriterion("NAME not like", value, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameIn(List<String> values) {
+            addCriterion("NAME in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> values) {
+            addCriterion("NAME not in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameBetween(String value1, String value2) {
+            addCriterion("NAME between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotBetween(String value1, String value2) {
+            addCriterion("NAME not between", value1, value2, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameIsNull() {
+            addCriterion("SHORTNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameIsNotNull() {
+            addCriterion("SHORTNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameEqualTo(String value) {
+            addCriterion("SHORTNAME =", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameNotEqualTo(String value) {
+            addCriterion("SHORTNAME <>", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameGreaterThan(String value) {
+            addCriterion("SHORTNAME >", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameGreaterThanOrEqualTo(String value) {
+            addCriterion("SHORTNAME >=", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameLessThan(String value) {
+            addCriterion("SHORTNAME <", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameLessThanOrEqualTo(String value) {
+            addCriterion("SHORTNAME <=", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameLike(String value) {
+            addCriterion("SHORTNAME like", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameNotLike(String value) {
+            addCriterion("SHORTNAME not like", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameIn(List<String> values) {
+            addCriterion("SHORTNAME in", values, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameNotIn(List<String> values) {
+            addCriterion("SHORTNAME not in", values, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameBetween(String value1, String value2) {
+            addCriterion("SHORTNAME between", value1, value2, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameNotBetween(String value1, String value2) {
+            addCriterion("SHORTNAME not between", value1, value2, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIsNull() {
+            addCriterion("ADDRESS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIsNotNull() {
+            addCriterion("ADDRESS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressEqualTo(String value) {
+            addCriterion("ADDRESS =", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotEqualTo(String value) {
+            addCriterion("ADDRESS <>", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressGreaterThan(String value) {
+            addCriterion("ADDRESS >", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("ADDRESS >=", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLessThan(String value) {
+            addCriterion("ADDRESS <", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLessThanOrEqualTo(String value) {
+            addCriterion("ADDRESS <=", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressLike(String value) {
+            addCriterion("ADDRESS like", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotLike(String value) {
+            addCriterion("ADDRESS not like", value, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressIn(List<String> values) {
+            addCriterion("ADDRESS in", values, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotIn(List<String> values) {
+            addCriterion("ADDRESS not in", values, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressBetween(String value1, String value2) {
+            addCriterion("ADDRESS between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andAddressNotBetween(String value1, String value2) {
+            addCriterion("ADDRESS not between", value1, value2, "address");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeIsNull() {
+            addCriterion("ZIPCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeIsNotNull() {
+            addCriterion("ZIPCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeEqualTo(String value) {
+            addCriterion("ZIPCODE =", value, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeNotEqualTo(String value) {
+            addCriterion("ZIPCODE <>", value, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeGreaterThan(String value) {
+            addCriterion("ZIPCODE >", value, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("ZIPCODE >=", value, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeLessThan(String value) {
+            addCriterion("ZIPCODE <", value, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeLessThanOrEqualTo(String value) {
+            addCriterion("ZIPCODE <=", value, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeLike(String value) {
+            addCriterion("ZIPCODE like", value, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeNotLike(String value) {
+            addCriterion("ZIPCODE not like", value, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeIn(List<String> values) {
+            addCriterion("ZIPCODE in", values, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeNotIn(List<String> values) {
+            addCriterion("ZIPCODE not in", values, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeBetween(String value1, String value2) {
+            addCriterion("ZIPCODE between", value1, value2, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andZipcodeNotBetween(String value1, String value2) {
+            addCriterion("ZIPCODE not between", value1, value2, "zipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIsNull() {
+            addCriterion("PHONE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIsNotNull() {
+            addCriterion("PHONE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneEqualTo(String value) {
+            addCriterion("PHONE =", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotEqualTo(String value) {
+            addCriterion("PHONE <>", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneGreaterThan(String value) {
+            addCriterion("PHONE >", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneGreaterThanOrEqualTo(String value) {
+            addCriterion("PHONE >=", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLessThan(String value) {
+            addCriterion("PHONE <", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLessThanOrEqualTo(String value) {
+            addCriterion("PHONE <=", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneLike(String value) {
+            addCriterion("PHONE like", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotLike(String value) {
+            addCriterion("PHONE not like", value, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneIn(List<String> values) {
+            addCriterion("PHONE in", values, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotIn(List<String> values) {
+            addCriterion("PHONE not in", values, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneBetween(String value1, String value2) {
+            addCriterion("PHONE between", value1, value2, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andPhoneNotBetween(String value1, String value2) {
+            addCriterion("PHONE not between", value1, value2, "phone");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxIsNull() {
+            addCriterion("FAX is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxIsNotNull() {
+            addCriterion("FAX is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxEqualTo(String value) {
+            addCriterion("FAX =", value, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxNotEqualTo(String value) {
+            addCriterion("FAX <>", value, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxGreaterThan(String value) {
+            addCriterion("FAX >", value, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxGreaterThanOrEqualTo(String value) {
+            addCriterion("FAX >=", value, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxLessThan(String value) {
+            addCriterion("FAX <", value, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxLessThanOrEqualTo(String value) {
+            addCriterion("FAX <=", value, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxLike(String value) {
+            addCriterion("FAX like", value, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxNotLike(String value) {
+            addCriterion("FAX not like", value, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxIn(List<String> values) {
+            addCriterion("FAX in", values, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxNotIn(List<String> values) {
+            addCriterion("FAX not in", values, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxBetween(String value1, String value2) {
+            addCriterion("FAX between", value1, value2, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaxNotBetween(String value1, String value2) {
+            addCriterion("FAX not between", value1, value2, "fax");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailIsNull() {
+            addCriterion("EMAIL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailIsNotNull() {
+            addCriterion("EMAIL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailEqualTo(String value) {
+            addCriterion("EMAIL =", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotEqualTo(String value) {
+            addCriterion("EMAIL <>", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailGreaterThan(String value) {
+            addCriterion("EMAIL >", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailGreaterThanOrEqualTo(String value) {
+            addCriterion("EMAIL >=", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailLessThan(String value) {
+            addCriterion("EMAIL <", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailLessThanOrEqualTo(String value) {
+            addCriterion("EMAIL <=", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailLike(String value) {
+            addCriterion("EMAIL like", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotLike(String value) {
+            addCriterion("EMAIL not like", value, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailIn(List<String> values) {
+            addCriterion("EMAIL in", values, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotIn(List<String> values) {
+            addCriterion("EMAIL not in", values, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailBetween(String value1, String value2) {
+            addCriterion("EMAIL between", value1, value2, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andEmailNotBetween(String value1, String value2) {
+            addCriterion("EMAIL not between", value1, value2, "email");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressIsNull() {
+            addCriterion("WEBADDRESS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressIsNotNull() {
+            addCriterion("WEBADDRESS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressEqualTo(String value) {
+            addCriterion("WEBADDRESS =", value, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressNotEqualTo(String value) {
+            addCriterion("WEBADDRESS <>", value, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressGreaterThan(String value) {
+            addCriterion("WEBADDRESS >", value, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressGreaterThanOrEqualTo(String value) {
+            addCriterion("WEBADDRESS >=", value, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressLessThan(String value) {
+            addCriterion("WEBADDRESS <", value, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressLessThanOrEqualTo(String value) {
+            addCriterion("WEBADDRESS <=", value, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressLike(String value) {
+            addCriterion("WEBADDRESS like", value, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressNotLike(String value) {
+            addCriterion("WEBADDRESS not like", value, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressIn(List<String> values) {
+            addCriterion("WEBADDRESS in", values, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressNotIn(List<String> values) {
+            addCriterion("WEBADDRESS not in", values, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressBetween(String value1, String value2) {
+            addCriterion("WEBADDRESS between", value1, value2, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andWebaddressNotBetween(String value1, String value2) {
+            addCriterion("WEBADDRESS not between", value1, value2, "webaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameIsNull() {
+            addCriterion("SATRAPNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameIsNotNull() {
+            addCriterion("SATRAPNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameEqualTo(String value) {
+            addCriterion("SATRAPNAME =", value, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameNotEqualTo(String value) {
+            addCriterion("SATRAPNAME <>", value, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameGreaterThan(String value) {
+            addCriterion("SATRAPNAME >", value, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameGreaterThanOrEqualTo(String value) {
+            addCriterion("SATRAPNAME >=", value, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameLessThan(String value) {
+            addCriterion("SATRAPNAME <", value, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameLessThanOrEqualTo(String value) {
+            addCriterion("SATRAPNAME <=", value, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameLike(String value) {
+            addCriterion("SATRAPNAME like", value, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameNotLike(String value) {
+            addCriterion("SATRAPNAME not like", value, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameIn(List<String> values) {
+            addCriterion("SATRAPNAME in", values, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameNotIn(List<String> values) {
+            addCriterion("SATRAPNAME not in", values, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameBetween(String value1, String value2) {
+            addCriterion("SATRAPNAME between", value1, value2, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andSatrapnameNotBetween(String value1, String value2) {
+            addCriterion("SATRAPNAME not between", value1, value2, "satrapname");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeIsNull() {
+            addCriterion("INSUMONITORCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeIsNotNull() {
+            addCriterion("INSUMONITORCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeEqualTo(String value) {
+            addCriterion("INSUMONITORCODE =", value, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeNotEqualTo(String value) {
+            addCriterion("INSUMONITORCODE <>", value, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeGreaterThan(String value) {
+            addCriterion("INSUMONITORCODE >", value, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("INSUMONITORCODE >=", value, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeLessThan(String value) {
+            addCriterion("INSUMONITORCODE <", value, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeLessThanOrEqualTo(String value) {
+            addCriterion("INSUMONITORCODE <=", value, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeLike(String value) {
+            addCriterion("INSUMONITORCODE like", value, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeNotLike(String value) {
+            addCriterion("INSUMONITORCODE not like", value, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeIn(List<String> values) {
+            addCriterion("INSUMONITORCODE in", values, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeNotIn(List<String> values) {
+            addCriterion("INSUMONITORCODE not in", values, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeBetween(String value1, String value2) {
+            addCriterion("INSUMONITORCODE between", value1, value2, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsumonitorcodeNotBetween(String value1, String value2) {
+            addCriterion("INSUMONITORCODE not between", value1, value2, "insumonitorcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidIsNull() {
+            addCriterion("INSUREID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidIsNotNull() {
+            addCriterion("INSUREID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidEqualTo(String value) {
+            addCriterion("INSUREID =", value, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidNotEqualTo(String value) {
+            addCriterion("INSUREID <>", value, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidGreaterThan(String value) {
+            addCriterion("INSUREID >", value, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidGreaterThanOrEqualTo(String value) {
+            addCriterion("INSUREID >=", value, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidLessThan(String value) {
+            addCriterion("INSUREID <", value, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidLessThanOrEqualTo(String value) {
+            addCriterion("INSUREID <=", value, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidLike(String value) {
+            addCriterion("INSUREID like", value, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidNotLike(String value) {
+            addCriterion("INSUREID not like", value, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidIn(List<String> values) {
+            addCriterion("INSUREID in", values, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidNotIn(List<String> values) {
+            addCriterion("INSUREID not in", values, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidBetween(String value1, String value2) {
+            addCriterion("INSUREID between", value1, value2, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andInsureidNotBetween(String value1, String value2) {
+            addCriterion("INSUREID not between", value1, value2, "insureid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidIsNull() {
+            addCriterion("SIGNID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidIsNotNull() {
+            addCriterion("SIGNID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidEqualTo(String value) {
+            addCriterion("SIGNID =", value, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidNotEqualTo(String value) {
+            addCriterion("SIGNID <>", value, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidGreaterThan(String value) {
+            addCriterion("SIGNID >", value, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidGreaterThanOrEqualTo(String value) {
+            addCriterion("SIGNID >=", value, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidLessThan(String value) {
+            addCriterion("SIGNID <", value, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidLessThanOrEqualTo(String value) {
+            addCriterion("SIGNID <=", value, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidLike(String value) {
+            addCriterion("SIGNID like", value, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidNotLike(String value) {
+            addCriterion("SIGNID not like", value, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidIn(List<String> values) {
+            addCriterion("SIGNID in", values, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidNotIn(List<String> values) {
+            addCriterion("SIGNID not in", values, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidBetween(String value1, String value2) {
+            addCriterion("SIGNID between", value1, value2, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignidNotBetween(String value1, String value2) {
+            addCriterion("SIGNID not between", value1, value2, "signid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeIsNull() {
+            addCriterion("REGIONALISMCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeIsNotNull() {
+            addCriterion("REGIONALISMCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeEqualTo(String value) {
+            addCriterion("REGIONALISMCODE =", value, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeNotEqualTo(String value) {
+            addCriterion("REGIONALISMCODE <>", value, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeGreaterThan(String value) {
+            addCriterion("REGIONALISMCODE >", value, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("REGIONALISMCODE >=", value, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeLessThan(String value) {
+            addCriterion("REGIONALISMCODE <", value, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeLessThanOrEqualTo(String value) {
+            addCriterion("REGIONALISMCODE <=", value, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeLike(String value) {
+            addCriterion("REGIONALISMCODE like", value, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeNotLike(String value) {
+            addCriterion("REGIONALISMCODE not like", value, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeIn(List<String> values) {
+            addCriterion("REGIONALISMCODE in", values, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeNotIn(List<String> values) {
+            addCriterion("REGIONALISMCODE not in", values, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeBetween(String value1, String value2) {
+            addCriterion("REGIONALISMCODE between", value1, value2, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andRegionalismcodeNotBetween(String value1, String value2) {
+            addCriterion("REGIONALISMCODE not between", value1, value2, "regionalismcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureIsNull() {
+            addCriterion("COMNATURE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureIsNotNull() {
+            addCriterion("COMNATURE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureEqualTo(String value) {
+            addCriterion("COMNATURE =", value, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureNotEqualTo(String value) {
+            addCriterion("COMNATURE <>", value, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureGreaterThan(String value) {
+            addCriterion("COMNATURE >", value, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureGreaterThanOrEqualTo(String value) {
+            addCriterion("COMNATURE >=", value, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureLessThan(String value) {
+            addCriterion("COMNATURE <", value, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureLessThanOrEqualTo(String value) {
+            addCriterion("COMNATURE <=", value, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureLike(String value) {
+            addCriterion("COMNATURE like", value, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureNotLike(String value) {
+            addCriterion("COMNATURE not like", value, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureIn(List<String> values) {
+            addCriterion("COMNATURE in", values, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureNotIn(List<String> values) {
+            addCriterion("COMNATURE not in", values, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureBetween(String value1, String value2) {
+            addCriterion("COMNATURE between", value1, value2, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andComnatureNotBetween(String value1, String value2) {
+            addCriterion("COMNATURE not between", value1, value2, "comnature");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeIsNull() {
+            addCriterion("VALIDCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeIsNotNull() {
+            addCriterion("VALIDCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeEqualTo(String value) {
+            addCriterion("VALIDCODE =", value, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeNotEqualTo(String value) {
+            addCriterion("VALIDCODE <>", value, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeGreaterThan(String value) {
+            addCriterion("VALIDCODE >", value, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("VALIDCODE >=", value, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeLessThan(String value) {
+            addCriterion("VALIDCODE <", value, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeLessThanOrEqualTo(String value) {
+            addCriterion("VALIDCODE <=", value, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeLike(String value) {
+            addCriterion("VALIDCODE like", value, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeNotLike(String value) {
+            addCriterion("VALIDCODE not like", value, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeIn(List<String> values) {
+            addCriterion("VALIDCODE in", values, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeNotIn(List<String> values) {
+            addCriterion("VALIDCODE not in", values, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeBetween(String value1, String value2) {
+            addCriterion("VALIDCODE between", value1, value2, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andValidcodeNotBetween(String value1, String value2) {
+            addCriterion("VALIDCODE not between", value1, value2, "validcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignIsNull() {
+            addCriterion("SIGN is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignIsNotNull() {
+            addCriterion("SIGN is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignEqualTo(String value) {
+            addCriterion("SIGN =", value, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignNotEqualTo(String value) {
+            addCriterion("SIGN <>", value, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignGreaterThan(String value) {
+            addCriterion("SIGN >", value, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignGreaterThanOrEqualTo(String value) {
+            addCriterion("SIGN >=", value, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignLessThan(String value) {
+            addCriterion("SIGN <", value, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignLessThanOrEqualTo(String value) {
+            addCriterion("SIGN <=", value, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignLike(String value) {
+            addCriterion("SIGN like", value, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignNotLike(String value) {
+            addCriterion("SIGN not like", value, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignIn(List<String> values) {
+            addCriterion("SIGN in", values, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignNotIn(List<String> values) {
+            addCriterion("SIGN not in", values, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignBetween(String value1, String value2) {
+            addCriterion("SIGN between", value1, value2, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andSignNotBetween(String value1, String value2) {
+            addCriterion("SIGN not between", value1, value2, "sign");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeIsNull() {
+            addCriterion("COMCITYSIZE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeIsNotNull() {
+            addCriterion("COMCITYSIZE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeEqualTo(String value) {
+            addCriterion("COMCITYSIZE =", value, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeNotEqualTo(String value) {
+            addCriterion("COMCITYSIZE <>", value, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeGreaterThan(String value) {
+            addCriterion("COMCITYSIZE >", value, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeGreaterThanOrEqualTo(String value) {
+            addCriterion("COMCITYSIZE >=", value, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeLessThan(String value) {
+            addCriterion("COMCITYSIZE <", value, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeLessThanOrEqualTo(String value) {
+            addCriterion("COMCITYSIZE <=", value, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeLike(String value) {
+            addCriterion("COMCITYSIZE like", value, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeNotLike(String value) {
+            addCriterion("COMCITYSIZE not like", value, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeIn(List<String> values) {
+            addCriterion("COMCITYSIZE in", values, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeNotIn(List<String> values) {
+            addCriterion("COMCITYSIZE not in", values, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeBetween(String value1, String value2) {
+            addCriterion("COMCITYSIZE between", value1, value2, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcitysizeNotBetween(String value1, String value2) {
+            addCriterion("COMCITYSIZE not between", value1, value2, "comcitysize");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameIsNull() {
+            addCriterion("SERVICENAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameIsNotNull() {
+            addCriterion("SERVICENAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameEqualTo(String value) {
+            addCriterion("SERVICENAME =", value, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameNotEqualTo(String value) {
+            addCriterion("SERVICENAME <>", value, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameGreaterThan(String value) {
+            addCriterion("SERVICENAME >", value, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameGreaterThanOrEqualTo(String value) {
+            addCriterion("SERVICENAME >=", value, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameLessThan(String value) {
+            addCriterion("SERVICENAME <", value, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameLessThanOrEqualTo(String value) {
+            addCriterion("SERVICENAME <=", value, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameLike(String value) {
+            addCriterion("SERVICENAME like", value, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameNotLike(String value) {
+            addCriterion("SERVICENAME not like", value, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameIn(List<String> values) {
+            addCriterion("SERVICENAME in", values, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameNotIn(List<String> values) {
+            addCriterion("SERVICENAME not in", values, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameBetween(String value1, String value2) {
+            addCriterion("SERVICENAME between", value1, value2, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenameNotBetween(String value1, String value2) {
+            addCriterion("SERVICENAME not between", value1, value2, "servicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoIsNull() {
+            addCriterion("SERVICENO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoIsNotNull() {
+            addCriterion("SERVICENO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoEqualTo(String value) {
+            addCriterion("SERVICENO =", value, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoNotEqualTo(String value) {
+            addCriterion("SERVICENO <>", value, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoGreaterThan(String value) {
+            addCriterion("SERVICENO >", value, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoGreaterThanOrEqualTo(String value) {
+            addCriterion("SERVICENO >=", value, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoLessThan(String value) {
+            addCriterion("SERVICENO <", value, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoLessThanOrEqualTo(String value) {
+            addCriterion("SERVICENO <=", value, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoLike(String value) {
+            addCriterion("SERVICENO like", value, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoNotLike(String value) {
+            addCriterion("SERVICENO not like", value, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoIn(List<String> values) {
+            addCriterion("SERVICENO in", values, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoNotIn(List<String> values) {
+            addCriterion("SERVICENO not in", values, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoBetween(String value1, String value2) {
+            addCriterion("SERVICENO between", value1, value2, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicenoNotBetween(String value1, String value2) {
+            addCriterion("SERVICENO not between", value1, value2, "serviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneIsNull() {
+            addCriterion("SERVICEPHONE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneIsNotNull() {
+            addCriterion("SERVICEPHONE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneEqualTo(String value) {
+            addCriterion("SERVICEPHONE =", value, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneNotEqualTo(String value) {
+            addCriterion("SERVICEPHONE <>", value, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneGreaterThan(String value) {
+            addCriterion("SERVICEPHONE >", value, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneGreaterThanOrEqualTo(String value) {
+            addCriterion("SERVICEPHONE >=", value, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneLessThan(String value) {
+            addCriterion("SERVICEPHONE <", value, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneLessThanOrEqualTo(String value) {
+            addCriterion("SERVICEPHONE <=", value, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneLike(String value) {
+            addCriterion("SERVICEPHONE like", value, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneNotLike(String value) {
+            addCriterion("SERVICEPHONE not like", value, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneIn(List<String> values) {
+            addCriterion("SERVICEPHONE in", values, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneNotIn(List<String> values) {
+            addCriterion("SERVICEPHONE not in", values, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneBetween(String value1, String value2) {
+            addCriterion("SERVICEPHONE between", value1, value2, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicephoneNotBetween(String value1, String value2) {
+            addCriterion("SERVICEPHONE not between", value1, value2, "servicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressIsNull() {
+            addCriterion("SERVICEPOSTADDRESS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressIsNotNull() {
+            addCriterion("SERVICEPOSTADDRESS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressEqualTo(String value) {
+            addCriterion("SERVICEPOSTADDRESS =", value, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressNotEqualTo(String value) {
+            addCriterion("SERVICEPOSTADDRESS <>", value, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressGreaterThan(String value) {
+            addCriterion("SERVICEPOSTADDRESS >", value, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressGreaterThanOrEqualTo(String value) {
+            addCriterion("SERVICEPOSTADDRESS >=", value, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressLessThan(String value) {
+            addCriterion("SERVICEPOSTADDRESS <", value, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressLessThanOrEqualTo(String value) {
+            addCriterion("SERVICEPOSTADDRESS <=", value, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressLike(String value) {
+            addCriterion("SERVICEPOSTADDRESS like", value, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressNotLike(String value) {
+            addCriterion("SERVICEPOSTADDRESS not like", value, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressIn(List<String> values) {
+            addCriterion("SERVICEPOSTADDRESS in", values, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressNotIn(List<String> values) {
+            addCriterion("SERVICEPOSTADDRESS not in", values, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressBetween(String value1, String value2) {
+            addCriterion("SERVICEPOSTADDRESS between", value1, value2, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostaddressNotBetween(String value1, String value2) {
+            addCriterion("SERVICEPOSTADDRESS not between", value1, value2, "servicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeIsNull() {
+            addCriterion("SERVICEPOSTZIPCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeIsNotNull() {
+            addCriterion("SERVICEPOSTZIPCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeEqualTo(String value) {
+            addCriterion("SERVICEPOSTZIPCODE =", value, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeNotEqualTo(String value) {
+            addCriterion("SERVICEPOSTZIPCODE <>", value, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeGreaterThan(String value) {
+            addCriterion("SERVICEPOSTZIPCODE >", value, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("SERVICEPOSTZIPCODE >=", value, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeLessThan(String value) {
+            addCriterion("SERVICEPOSTZIPCODE <", value, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeLessThanOrEqualTo(String value) {
+            addCriterion("SERVICEPOSTZIPCODE <=", value, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeLike(String value) {
+            addCriterion("SERVICEPOSTZIPCODE like", value, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeNotLike(String value) {
+            addCriterion("SERVICEPOSTZIPCODE not like", value, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeIn(List<String> values) {
+            addCriterion("SERVICEPOSTZIPCODE in", values, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeNotIn(List<String> values) {
+            addCriterion("SERVICEPOSTZIPCODE not in", values, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeBetween(String value1, String value2) {
+            addCriterion("SERVICEPOSTZIPCODE between", value1, value2, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andServicepostzipcodeNotBetween(String value1, String value2) {
+            addCriterion("SERVICEPOSTZIPCODE not between", value1, value2, "servicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameIsNull() {
+            addCriterion("LETTERSERVICENAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameIsNotNull() {
+            addCriterion("LETTERSERVICENAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameEqualTo(String value) {
+            addCriterion("LETTERSERVICENAME =", value, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameNotEqualTo(String value) {
+            addCriterion("LETTERSERVICENAME <>", value, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameGreaterThan(String value) {
+            addCriterion("LETTERSERVICENAME >", value, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameGreaterThanOrEqualTo(String value) {
+            addCriterion("LETTERSERVICENAME >=", value, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameLessThan(String value) {
+            addCriterion("LETTERSERVICENAME <", value, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameLessThanOrEqualTo(String value) {
+            addCriterion("LETTERSERVICENAME <=", value, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameLike(String value) {
+            addCriterion("LETTERSERVICENAME like", value, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameNotLike(String value) {
+            addCriterion("LETTERSERVICENAME not like", value, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameIn(List<String> values) {
+            addCriterion("LETTERSERVICENAME in", values, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameNotIn(List<String> values) {
+            addCriterion("LETTERSERVICENAME not in", values, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameBetween(String value1, String value2) {
+            addCriterion("LETTERSERVICENAME between", value1, value2, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenameNotBetween(String value1, String value2) {
+            addCriterion("LETTERSERVICENAME not between", value1, value2, "letterservicename");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoIsNull() {
+            addCriterion("LETTERSERVICENO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoIsNotNull() {
+            addCriterion("LETTERSERVICENO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoEqualTo(String value) {
+            addCriterion("LETTERSERVICENO =", value, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoNotEqualTo(String value) {
+            addCriterion("LETTERSERVICENO <>", value, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoGreaterThan(String value) {
+            addCriterion("LETTERSERVICENO >", value, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoGreaterThanOrEqualTo(String value) {
+            addCriterion("LETTERSERVICENO >=", value, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoLessThan(String value) {
+            addCriterion("LETTERSERVICENO <", value, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoLessThanOrEqualTo(String value) {
+            addCriterion("LETTERSERVICENO <=", value, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoLike(String value) {
+            addCriterion("LETTERSERVICENO like", value, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoNotLike(String value) {
+            addCriterion("LETTERSERVICENO not like", value, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoIn(List<String> values) {
+            addCriterion("LETTERSERVICENO in", values, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoNotIn(List<String> values) {
+            addCriterion("LETTERSERVICENO not in", values, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoBetween(String value1, String value2) {
+            addCriterion("LETTERSERVICENO between", value1, value2, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicenoNotBetween(String value1, String value2) {
+            addCriterion("LETTERSERVICENO not between", value1, value2, "letterserviceno");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneIsNull() {
+            addCriterion("LETTERSERVICEPHONE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneIsNotNull() {
+            addCriterion("LETTERSERVICEPHONE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneEqualTo(String value) {
+            addCriterion("LETTERSERVICEPHONE =", value, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneNotEqualTo(String value) {
+            addCriterion("LETTERSERVICEPHONE <>", value, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneGreaterThan(String value) {
+            addCriterion("LETTERSERVICEPHONE >", value, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneGreaterThanOrEqualTo(String value) {
+            addCriterion("LETTERSERVICEPHONE >=", value, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneLessThan(String value) {
+            addCriterion("LETTERSERVICEPHONE <", value, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneLessThanOrEqualTo(String value) {
+            addCriterion("LETTERSERVICEPHONE <=", value, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneLike(String value) {
+            addCriterion("LETTERSERVICEPHONE like", value, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneNotLike(String value) {
+            addCriterion("LETTERSERVICEPHONE not like", value, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneIn(List<String> values) {
+            addCriterion("LETTERSERVICEPHONE in", values, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneNotIn(List<String> values) {
+            addCriterion("LETTERSERVICEPHONE not in", values, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneBetween(String value1, String value2) {
+            addCriterion("LETTERSERVICEPHONE between", value1, value2, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicephoneNotBetween(String value1, String value2) {
+            addCriterion("LETTERSERVICEPHONE not between", value1, value2, "letterservicephone");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressIsNull() {
+            addCriterion("LETTERSERVICEPOSTADDRESS is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressIsNotNull() {
+            addCriterion("LETTERSERVICEPOSTADDRESS is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressEqualTo(String value) {
+            addCriterion("LETTERSERVICEPOSTADDRESS =", value, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressNotEqualTo(String value) {
+            addCriterion("LETTERSERVICEPOSTADDRESS <>", value, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressGreaterThan(String value) {
+            addCriterion("LETTERSERVICEPOSTADDRESS >", value, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressGreaterThanOrEqualTo(String value) {
+            addCriterion("LETTERSERVICEPOSTADDRESS >=", value, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressLessThan(String value) {
+            addCriterion("LETTERSERVICEPOSTADDRESS <", value, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressLessThanOrEqualTo(String value) {
+            addCriterion("LETTERSERVICEPOSTADDRESS <=", value, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressLike(String value) {
+            addCriterion("LETTERSERVICEPOSTADDRESS like", value, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressNotLike(String value) {
+            addCriterion("LETTERSERVICEPOSTADDRESS not like", value, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressIn(List<String> values) {
+            addCriterion("LETTERSERVICEPOSTADDRESS in", values, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressNotIn(List<String> values) {
+            addCriterion("LETTERSERVICEPOSTADDRESS not in", values, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressBetween(String value1, String value2) {
+            addCriterion("LETTERSERVICEPOSTADDRESS between", value1, value2, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostaddressNotBetween(String value1, String value2) {
+            addCriterion("LETTERSERVICEPOSTADDRESS not between", value1, value2, "letterservicepostaddress");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeIsNull() {
+            addCriterion("LETTERSERVICEPOSTZIPCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeIsNotNull() {
+            addCriterion("LETTERSERVICEPOSTZIPCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeEqualTo(String value) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE =", value, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeNotEqualTo(String value) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE <>", value, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeGreaterThan(String value) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE >", value, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE >=", value, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeLessThan(String value) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE <", value, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeLessThanOrEqualTo(String value) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE <=", value, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeLike(String value) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE like", value, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeNotLike(String value) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE not like", value, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeIn(List<String> values) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE in", values, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeNotIn(List<String> values) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE not in", values, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeBetween(String value1, String value2) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE between", value1, value2, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andLetterservicepostzipcodeNotBetween(String value1, String value2) {
+            addCriterion("LETTERSERVICEPOSTZIPCODE not between", value1, value2, "letterservicepostzipcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeIsNull() {
+            addCriterion("COMGRADE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeIsNotNull() {
+            addCriterion("COMGRADE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeEqualTo(String value) {
+            addCriterion("COMGRADE =", value, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeNotEqualTo(String value) {
+            addCriterion("COMGRADE <>", value, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeGreaterThan(String value) {
+            addCriterion("COMGRADE >", value, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeGreaterThanOrEqualTo(String value) {
+            addCriterion("COMGRADE >=", value, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeLessThan(String value) {
+            addCriterion("COMGRADE <", value, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeLessThanOrEqualTo(String value) {
+            addCriterion("COMGRADE <=", value, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeLike(String value) {
+            addCriterion("COMGRADE like", value, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeNotLike(String value) {
+            addCriterion("COMGRADE not like", value, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeIn(List<String> values) {
+            addCriterion("COMGRADE in", values, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeNotIn(List<String> values) {
+            addCriterion("COMGRADE not in", values, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeBetween(String value1, String value2) {
+            addCriterion("COMGRADE between", value1, value2, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComgradeNotBetween(String value1, String value2) {
+            addCriterion("COMGRADE not between", value1, value2, "comgrade");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeIsNull() {
+            addCriterion("COMAREATYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeIsNotNull() {
+            addCriterion("COMAREATYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeEqualTo(String value) {
+            addCriterion("COMAREATYPE =", value, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeNotEqualTo(String value) {
+            addCriterion("COMAREATYPE <>", value, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeGreaterThan(String value) {
+            addCriterion("COMAREATYPE >", value, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeGreaterThanOrEqualTo(String value) {
+            addCriterion("COMAREATYPE >=", value, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeLessThan(String value) {
+            addCriterion("COMAREATYPE <", value, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeLessThanOrEqualTo(String value) {
+            addCriterion("COMAREATYPE <=", value, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeLike(String value) {
+            addCriterion("COMAREATYPE like", value, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeNotLike(String value) {
+            addCriterion("COMAREATYPE not like", value, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeIn(List<String> values) {
+            addCriterion("COMAREATYPE in", values, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeNotIn(List<String> values) {
+            addCriterion("COMAREATYPE not in", values, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeBetween(String value1, String value2) {
+            addCriterion("COMAREATYPE between", value1, value2, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andComareatypeNotBetween(String value1, String value2) {
+            addCriterion("COMAREATYPE not between", value1, value2, "comareatype");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateIsNull() {
+            addCriterion("INPUTDATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateIsNotNull() {
+            addCriterion("INPUTDATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateEqualTo(Date value) {
+            addCriterion("INPUTDATE =", value, "inputdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateNotEqualTo(Date value) {
+            addCriterion("INPUTDATE <>", value, "inputdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateGreaterThan(Date value) {
+            addCriterion("INPUTDATE >", value, "inputdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateGreaterThanOrEqualTo(Date value) {
+            addCriterion("INPUTDATE >=", value, "inputdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateLessThan(Date value) {
+            addCriterion("INPUTDATE <", value, "inputdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateLessThanOrEqualTo(Date value) {
+            addCriterion("INPUTDATE <=", value, "inputdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateIn(List<Date> values) {
+            addCriterion("INPUTDATE in", values, "inputdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateNotIn(List<Date> values) {
+            addCriterion("INPUTDATE not in", values, "inputdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateBetween(Date value1, Date value2) {
+            addCriterion("INPUTDATE between", value1, value2, "inputdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputdateNotBetween(Date value1, Date value2) {
+            addCriterion("INPUTDATE not between", value1, value2, "inputdate");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeIsNull() {
+            addCriterion("INPUTTIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeIsNotNull() {
+            addCriterion("INPUTTIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeEqualTo(String value) {
+            addCriterion("INPUTTIME =", value, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeNotEqualTo(String value) {
+            addCriterion("INPUTTIME <>", value, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeGreaterThan(String value) {
+            addCriterion("INPUTTIME >", value, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeGreaterThanOrEqualTo(String value) {
+            addCriterion("INPUTTIME >=", value, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeLessThan(String value) {
+            addCriterion("INPUTTIME <", value, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeLessThanOrEqualTo(String value) {
+            addCriterion("INPUTTIME <=", value, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeLike(String value) {
+            addCriterion("INPUTTIME like", value, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeNotLike(String value) {
+            addCriterion("INPUTTIME not like", value, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeIn(List<String> values) {
+            addCriterion("INPUTTIME in", values, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeNotIn(List<String> values) {
+            addCriterion("INPUTTIME not in", values, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeBetween(String value1, String value2) {
+            addCriterion("INPUTTIME between", value1, value2, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andInputtimeNotBetween(String value1, String value2) {
+            addCriterion("INPUTTIME not between", value1, value2, "inputtime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceIsNull() {
+            addCriterion("SEQUENCE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceIsNotNull() {
+            addCriterion("SEQUENCE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceEqualTo(String value) {
+            addCriterion("SEQUENCE =", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceNotEqualTo(String value) {
+            addCriterion("SEQUENCE <>", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceGreaterThan(String value) {
+            addCriterion("SEQUENCE >", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceGreaterThanOrEqualTo(String value) {
+            addCriterion("SEQUENCE >=", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceLessThan(String value) {
+            addCriterion("SEQUENCE <", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceLessThanOrEqualTo(String value) {
+            addCriterion("SEQUENCE <=", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceLike(String value) {
+            addCriterion("SEQUENCE like", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceNotLike(String value) {
+            addCriterion("SEQUENCE not like", value, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceIn(List<String> values) {
+            addCriterion("SEQUENCE in", values, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceNotIn(List<String> values) {
+            addCriterion("SEQUENCE not in", values, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceBetween(String value1, String value2) {
+            addCriterion("SEQUENCE between", value1, value2, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andSequenceNotBetween(String value1, String value2) {
+            addCriterion("SEQUENCE not between", value1, value2, "sequence");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceIsNull() {
+            addCriterion("PROVINCE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceIsNotNull() {
+            addCriterion("PROVINCE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceEqualTo(String value) {
+            addCriterion("PROVINCE =", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceNotEqualTo(String value) {
+            addCriterion("PROVINCE <>", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceGreaterThan(String value) {
+            addCriterion("PROVINCE >", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceGreaterThanOrEqualTo(String value) {
+            addCriterion("PROVINCE >=", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceLessThan(String value) {
+            addCriterion("PROVINCE <", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceLessThanOrEqualTo(String value) {
+            addCriterion("PROVINCE <=", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceLike(String value) {
+            addCriterion("PROVINCE like", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceNotLike(String value) {
+            addCriterion("PROVINCE not like", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceIn(List<String> values) {
+            addCriterion("PROVINCE in", values, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceNotIn(List<String> values) {
+            addCriterion("PROVINCE not in", values, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceBetween(String value1, String value2) {
+            addCriterion("PROVINCE between", value1, value2, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceNotBetween(String value1, String value2) {
+            addCriterion("PROVINCE not between", value1, value2, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityIsNull() {
+            addCriterion("CITY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityIsNotNull() {
+            addCriterion("CITY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityEqualTo(String value) {
+            addCriterion("CITY =", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityNotEqualTo(String value) {
+            addCriterion("CITY <>", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityGreaterThan(String value) {
+            addCriterion("CITY >", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityGreaterThanOrEqualTo(String value) {
+            addCriterion("CITY >=", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityLessThan(String value) {
+            addCriterion("CITY <", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityLessThanOrEqualTo(String value) {
+            addCriterion("CITY <=", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityLike(String value) {
+            addCriterion("CITY like", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityNotLike(String value) {
+            addCriterion("CITY not like", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityIn(List<String> values) {
+            addCriterion("CITY in", values, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityNotIn(List<String> values) {
+            addCriterion("CITY not in", values, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityBetween(String value1, String value2) {
+            addCriterion("CITY between", value1, value2, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityNotBetween(String value1, String value2) {
+            addCriterion("CITY not between", value1, value2, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyIsNull() {
+            addCriterion("COUNTY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyIsNotNull() {
+            addCriterion("COUNTY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyEqualTo(String value) {
+            addCriterion("COUNTY =", value, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyNotEqualTo(String value) {
+            addCriterion("COUNTY <>", value, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyGreaterThan(String value) {
+            addCriterion("COUNTY >", value, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyGreaterThanOrEqualTo(String value) {
+            addCriterion("COUNTY >=", value, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyLessThan(String value) {
+            addCriterion("COUNTY <", value, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyLessThanOrEqualTo(String value) {
+            addCriterion("COUNTY <=", value, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyLike(String value) {
+            addCriterion("COUNTY like", value, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyNotLike(String value) {
+            addCriterion("COUNTY not like", value, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyIn(List<String> values) {
+            addCriterion("COUNTY in", values, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyNotIn(List<String> values) {
+            addCriterion("COUNTY not in", values, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyBetween(String value1, String value2) {
+            addCriterion("COUNTY between", value1, value2, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andCountyNotBetween(String value1, String value2) {
+            addCriterion("COUNTY not between", value1, value2, "county");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityIsNull() {
+            addCriterion("PREFECTURALLEVELCITY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityIsNotNull() {
+            addCriterion("PREFECTURALLEVELCITY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityEqualTo(String value) {
+            addCriterion("PREFECTURALLEVELCITY =", value, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityNotEqualTo(String value) {
+            addCriterion("PREFECTURALLEVELCITY <>", value, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityGreaterThan(String value) {
+            addCriterion("PREFECTURALLEVELCITY >", value, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityGreaterThanOrEqualTo(String value) {
+            addCriterion("PREFECTURALLEVELCITY >=", value, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityLessThan(String value) {
+            addCriterion("PREFECTURALLEVELCITY <", value, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityLessThanOrEqualTo(String value) {
+            addCriterion("PREFECTURALLEVELCITY <=", value, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityLike(String value) {
+            addCriterion("PREFECTURALLEVELCITY like", value, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityNotLike(String value) {
+            addCriterion("PREFECTURALLEVELCITY not like", value, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityIn(List<String> values) {
+            addCriterion("PREFECTURALLEVELCITY in", values, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityNotIn(List<String> values) {
+            addCriterion("PREFECTURALLEVELCITY not in", values, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityBetween(String value1, String value2) {
+            addCriterion("PREFECTURALLEVELCITY between", value1, value2, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+
+        public Criteria andPrefecturallevelcityNotBetween(String value1, String value2) {
+            addCriterion("PREFECTURALLEVELCITY not between", value1, value2, "prefecturallevelcity");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table ldcom
+     *
+     * @mbggenerated do_not_delete_during_merge Tue Jul 24 14:14:03 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComParty.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComParty.java
new file mode 100644
index 000000000..40c7b28d6
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComParty.java
@@ -0,0 +1,131 @@
+package com.ruoyi.content.domain;
+
+public class LdComParty {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom_party.PARTY_ID
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    private String partyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom_party.COMCODE
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    private String comcode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom_party.SHORTNAME
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    private String shortname;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column ldcom_party.COMPANY_ID
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom_party.PARTY_ID
+     *
+     * @return the value of ldcom_party.PARTY_ID
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public String getPartyId() {
+        return partyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom_party.PARTY_ID
+     *
+     * @param partyId the value for ldcom_party.PARTY_ID
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public void setPartyId(String partyId) {
+        this.partyId = partyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom_party.COMCODE
+     *
+     * @return the value of ldcom_party.COMCODE
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public String getComcode() {
+        return comcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom_party.COMCODE
+     *
+     * @param comcode the value for ldcom_party.COMCODE
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public void setComcode(String comcode) {
+        this.comcode = comcode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom_party.SHORTNAME
+     *
+     * @return the value of ldcom_party.SHORTNAME
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public String getShortname() {
+        return shortname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom_party.SHORTNAME
+     *
+     * @param shortname the value for ldcom_party.SHORTNAME
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public void setShortname(String shortname) {
+        this.shortname = shortname;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column ldcom_party.COMPANY_ID
+     *
+     * @return the value of ldcom_party.COMPANY_ID
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column ldcom_party.COMPANY_ID
+     *
+     * @param companyId the value for ldcom_party.COMPANY_ID
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComPartyExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComPartyExample.java
new file mode 100644
index 000000000..b5c19ae4a
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdComPartyExample.java
@@ -0,0 +1,582 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LdComPartyExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public LdComPartyExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andPartyIdIsNull() {
+            addCriterion("PARTY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdIsNotNull() {
+            addCriterion("PARTY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdEqualTo(String value) {
+            addCriterion("PARTY_ID =", value, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdNotEqualTo(String value) {
+            addCriterion("PARTY_ID <>", value, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdGreaterThan(String value) {
+            addCriterion("PARTY_ID >", value, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("PARTY_ID >=", value, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdLessThan(String value) {
+            addCriterion("PARTY_ID <", value, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdLessThanOrEqualTo(String value) {
+            addCriterion("PARTY_ID <=", value, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdLike(String value) {
+            addCriterion("PARTY_ID like", value, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdNotLike(String value) {
+            addCriterion("PARTY_ID not like", value, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdIn(List<String> values) {
+            addCriterion("PARTY_ID in", values, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdNotIn(List<String> values) {
+            addCriterion("PARTY_ID not in", values, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdBetween(String value1, String value2) {
+            addCriterion("PARTY_ID between", value1, value2, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPartyIdNotBetween(String value1, String value2) {
+            addCriterion("PARTY_ID not between", value1, value2, "partyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeIsNull() {
+            addCriterion("COMCODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeIsNotNull() {
+            addCriterion("COMCODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeEqualTo(String value) {
+            addCriterion("COMCODE =", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeNotEqualTo(String value) {
+            addCriterion("COMCODE <>", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeGreaterThan(String value) {
+            addCriterion("COMCODE >", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("COMCODE >=", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeLessThan(String value) {
+            addCriterion("COMCODE <", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeLessThanOrEqualTo(String value) {
+            addCriterion("COMCODE <=", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeLike(String value) {
+            addCriterion("COMCODE like", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeNotLike(String value) {
+            addCriterion("COMCODE not like", value, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeIn(List<String> values) {
+            addCriterion("COMCODE in", values, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeNotIn(List<String> values) {
+            addCriterion("COMCODE not in", values, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeBetween(String value1, String value2) {
+            addCriterion("COMCODE between", value1, value2, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andComcodeNotBetween(String value1, String value2) {
+            addCriterion("COMCODE not between", value1, value2, "comcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameIsNull() {
+            addCriterion("SHORTNAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameIsNotNull() {
+            addCriterion("SHORTNAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameEqualTo(String value) {
+            addCriterion("SHORTNAME =", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameNotEqualTo(String value) {
+            addCriterion("SHORTNAME <>", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameGreaterThan(String value) {
+            addCriterion("SHORTNAME >", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameGreaterThanOrEqualTo(String value) {
+            addCriterion("SHORTNAME >=", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameLessThan(String value) {
+            addCriterion("SHORTNAME <", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameLessThanOrEqualTo(String value) {
+            addCriterion("SHORTNAME <=", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameLike(String value) {
+            addCriterion("SHORTNAME like", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameNotLike(String value) {
+            addCriterion("SHORTNAME not like", value, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameIn(List<String> values) {
+            addCriterion("SHORTNAME in", values, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameNotIn(List<String> values) {
+            addCriterion("SHORTNAME not in", values, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameBetween(String value1, String value2) {
+            addCriterion("SHORTNAME between", value1, value2, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andShortnameNotBetween(String value1, String value2) {
+            addCriterion("SHORTNAME not between", value1, value2, "shortname");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table ldcom_party
+     *
+     * @mbggenerated do_not_delete_during_merge Tue Sep 25 15:09:32 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdExCom.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdExCom.java
new file mode 100644
index 000000000..30cc83478
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/LdExCom.java
@@ -0,0 +1,22 @@
+package com.ruoyi.content.domain;
+
+public class LdExCom {
+   
+    private String comcode;
+    private String shortname;
+	public String getComcode() {
+		return comcode;
+	}
+	public void setComcode(String comcode) {
+		this.comcode = comcode;
+	}
+	public String getShortname() {
+		return shortname;
+	}
+	public void setShortname(String shortname) {
+		this.shortname = shortname;
+	}
+
+    
+
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/OssDTO.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/OssDTO.java
new file mode 100644
index 000000000..0e3fefc9d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/OssDTO.java
@@ -0,0 +1,66 @@
+package com.ruoyi.content.domain;
+
+/**
+ * OSS参数对象
+ * 
+ * @author zhanghe
+ *
+ */
+public class OssDTO {
+
+	private String ossId; // 阿里云OSS提供的ossId
+	private String ossKey; // 阿里云OSS提供的ossKey
+	private String bucketName; // 阿里云OSS提供的ossBucket
+	private String ossPath; // 阿里云OSS上保存文件的路径
+	private String ossEndPoint; // 阿里云OSS提供的ossEndPoint
+	private String ossEndPointOut; // 阿里云OSS提供的ossEndPoint
+
+	public String getOssId() {
+		return ossId;
+	}
+
+	public void setOssId(String ossId) {
+		this.ossId = ossId;
+	}
+
+	public String getOssKey() {
+		return ossKey;
+	}
+
+	public void setOssKey(String ossKey) {
+		this.ossKey = ossKey;
+	}
+
+	public String getBucketName() {
+		return bucketName;
+	}
+
+	public void setBucketName(String bucketName) {
+		this.bucketName = bucketName;
+	}
+
+	public String getOssPath() {
+		return ossPath;
+	}
+
+	public void setOssPath(String ossPath) {
+		this.ossPath = ossPath;
+	}
+
+	public String getOssEndPoint() {
+		return ossEndPoint;
+	}
+
+	public void setOssEndPoint(String ossEndPoint) {
+		this.ossEndPoint = ossEndPoint;
+	}
+
+	public String getOssEndPointOut() {
+		return ossEndPointOut;
+	}
+
+	public void setOssEndPointOut(String ossEndPointOut) {
+		this.ossEndPointOut = ossEndPointOut;
+	}
+
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/PageDTO.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/PageDTO.java
new file mode 100644
index 000000000..ff3f3c63e
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/PageDTO.java
@@ -0,0 +1,108 @@
+package com.ruoyi.content.domain;
+
+import java.util.List;
+
+public class PageDTO extends BaseDTO{
+	
+	private static final int PageQuerySize = 5;	
+	private int page = 1;             //当前页号
+	private int rows = PageQuerySize;   //每页显示的行数	
+	private int startRow = 0;              //当前页在数据库中的起始行
+	private Object parameters;       		//查询参数
+	private int total;               		//总页数
+	@SuppressWarnings("rawtypes")
+	private List dataRows;               		//查询结果信息   
+	
+	private String pageCode = "1";    		//默认为成功  1成功 2失败	
+	private String pageMsg = "";   		//结果
+	
+	private int records;//记录数
+	
+	private String userData;//
+
+	public int getPage() {
+		return page;
+	}
+
+	public void setPage(int page) {
+		this.page = page;
+	}
+
+	public int getRows() {
+		return rows;
+	}
+
+	public void setRows(int rows) {
+		this.rows = rows;
+	}
+
+	public int getStartRow() {
+		return startRow;
+	}
+
+	public void setStartRow(int startRow) {
+		this.startRow = startRow;
+	}
+
+	public Object getParameters() {
+		return parameters;
+	}
+
+	public void setParameters(Object parameters) {
+		this.parameters = parameters;
+	}
+
+	public int getTotal() {
+		return total;
+	}
+
+	public void setTotal(int total) {
+		this.total = total;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public List getDataRows() {
+		return dataRows;
+	}
+
+	@SuppressWarnings("rawtypes")
+	public void setDataRows(List dataRows) {
+		this.dataRows = dataRows;
+	}
+
+	public String getPageCode() {
+		return pageCode;
+	}
+
+	public void setPageCode(String pageCode) {
+		this.pageCode = pageCode;
+	}
+
+	public String getPageMsg() {
+		return pageMsg;
+	}
+
+	public void setPageMsg(String pageMsg) {
+		this.pageMsg = pageMsg;
+	}
+
+	public int getRecords() {
+		return records;
+	}
+
+	public void setRecords(int records) {
+		this.records = records;
+	}
+
+	public static int getPagequerysize() {
+		return PageQuerySize;
+	}
+
+	public String getUserData() {
+		return userData;
+	}
+
+	public void setUserData(String userData) {
+		this.userData = userData;
+	}
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/PicAdInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/PicAdInfo.java
new file mode 100644
index 000000000..f9df8e909
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/PicAdInfo.java
@@ -0,0 +1,419 @@
+package com.ruoyi.content.domain;
+
+public class PicAdInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.PIC_AD_ID
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private Integer picAdId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.PIC_AD_TYPE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String picAdType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.PIC_AD_TITLE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String picAdTitle;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.PIC_AD_NAME
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String picAdName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.PIC_AD_URL
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String picAdUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.PIC_AD_STATE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String picAdState;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.COMPANY_ID
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.CREATE_DATE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String createDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.CREATE_TIME
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.CREATE_USER
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.UPDATE_USER
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String updateUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.UPDATE_DATE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String updateDate;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column pic_ad_info.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    private String updateTime;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.PIC_AD_ID
+     *
+     * @return the value of pic_ad_info.PIC_AD_ID
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public Integer getPicAdId() {
+        return picAdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.PIC_AD_ID
+     *
+     * @param picAdId the value for pic_ad_info.PIC_AD_ID
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setPicAdId(Integer picAdId) {
+        this.picAdId = picAdId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.PIC_AD_TYPE
+     *
+     * @return the value of pic_ad_info.PIC_AD_TYPE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getPicAdType() {
+        return picAdType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.PIC_AD_TYPE
+     *
+     * @param picAdType the value for pic_ad_info.PIC_AD_TYPE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setPicAdType(String picAdType) {
+        this.picAdType = picAdType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.PIC_AD_TITLE
+     *
+     * @return the value of pic_ad_info.PIC_AD_TITLE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getPicAdTitle() {
+        return picAdTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.PIC_AD_TITLE
+     *
+     * @param picAdTitle the value for pic_ad_info.PIC_AD_TITLE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setPicAdTitle(String picAdTitle) {
+        this.picAdTitle = picAdTitle;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.PIC_AD_NAME
+     *
+     * @return the value of pic_ad_info.PIC_AD_NAME
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getPicAdName() {
+        return picAdName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.PIC_AD_NAME
+     *
+     * @param picAdName the value for pic_ad_info.PIC_AD_NAME
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setPicAdName(String picAdName) {
+        this.picAdName = picAdName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.PIC_AD_URL
+     *
+     * @return the value of pic_ad_info.PIC_AD_URL
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getPicAdUrl() {
+        return picAdUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.PIC_AD_URL
+     *
+     * @param picAdUrl the value for pic_ad_info.PIC_AD_URL
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setPicAdUrl(String picAdUrl) {
+        this.picAdUrl = picAdUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.PIC_AD_STATE
+     *
+     * @return the value of pic_ad_info.PIC_AD_STATE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getPicAdState() {
+        return picAdState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.PIC_AD_STATE
+     *
+     * @param picAdState the value for pic_ad_info.PIC_AD_STATE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setPicAdState(String picAdState) {
+        this.picAdState = picAdState;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.COMPANY_ID
+     *
+     * @return the value of pic_ad_info.COMPANY_ID
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.COMPANY_ID
+     *
+     * @param companyId the value for pic_ad_info.COMPANY_ID
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.CREATE_DATE
+     *
+     * @return the value of pic_ad_info.CREATE_DATE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.CREATE_DATE
+     *
+     * @param createDate the value for pic_ad_info.CREATE_DATE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.CREATE_TIME
+     *
+     * @return the value of pic_ad_info.CREATE_TIME
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.CREATE_TIME
+     *
+     * @param createTime the value for pic_ad_info.CREATE_TIME
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.CREATE_USER
+     *
+     * @return the value of pic_ad_info.CREATE_USER
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.CREATE_USER
+     *
+     * @param createUser the value for pic_ad_info.CREATE_USER
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.UPDATE_USER
+     *
+     * @return the value of pic_ad_info.UPDATE_USER
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getUpdateUser() {
+        return updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.UPDATE_USER
+     *
+     * @param updateUser the value for pic_ad_info.UPDATE_USER
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setUpdateUser(String updateUser) {
+        this.updateUser = updateUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.UPDATE_DATE
+     *
+     * @return the value of pic_ad_info.UPDATE_DATE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.UPDATE_DATE
+     *
+     * @param updateDate the value for pic_ad_info.UPDATE_DATE
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column pic_ad_info.UPDATE_TIME
+     *
+     * @return the value of pic_ad_info.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column pic_ad_info.UPDATE_TIME
+     *
+     * @param updateTime the value for pic_ad_info.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/PicAdInfoExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/PicAdInfoExample.java
new file mode 100644
index 000000000..a245b6dd8
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/PicAdInfoExample.java
@@ -0,0 +1,1202 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PicAdInfoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public PicAdInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andPicAdIdIsNull() {
+            addCriterion("PIC_AD_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdIsNotNull() {
+            addCriterion("PIC_AD_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdEqualTo(Integer value) {
+            addCriterion("PIC_AD_ID =", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdNotEqualTo(Integer value) {
+            addCriterion("PIC_AD_ID <>", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdGreaterThan(Integer value) {
+            addCriterion("PIC_AD_ID >", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("PIC_AD_ID >=", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdLessThan(Integer value) {
+            addCriterion("PIC_AD_ID <", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdLessThanOrEqualTo(Integer value) {
+            addCriterion("PIC_AD_ID <=", value, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdIn(List<Integer> values) {
+            addCriterion("PIC_AD_ID in", values, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdNotIn(List<Integer> values) {
+            addCriterion("PIC_AD_ID not in", values, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdBetween(Integer value1, Integer value2) {
+            addCriterion("PIC_AD_ID between", value1, value2, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("PIC_AD_ID not between", value1, value2, "picAdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeIsNull() {
+            addCriterion("PIC_AD_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeIsNotNull() {
+            addCriterion("PIC_AD_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeEqualTo(String value) {
+            addCriterion("PIC_AD_TYPE =", value, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeNotEqualTo(String value) {
+            addCriterion("PIC_AD_TYPE <>", value, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeGreaterThan(String value) {
+            addCriterion("PIC_AD_TYPE >", value, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_TYPE >=", value, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeLessThan(String value) {
+            addCriterion("PIC_AD_TYPE <", value, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeLessThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_TYPE <=", value, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeLike(String value) {
+            addCriterion("PIC_AD_TYPE like", value, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeNotLike(String value) {
+            addCriterion("PIC_AD_TYPE not like", value, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeIn(List<String> values) {
+            addCriterion("PIC_AD_TYPE in", values, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeNotIn(List<String> values) {
+            addCriterion("PIC_AD_TYPE not in", values, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeBetween(String value1, String value2) {
+            addCriterion("PIC_AD_TYPE between", value1, value2, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTypeNotBetween(String value1, String value2) {
+            addCriterion("PIC_AD_TYPE not between", value1, value2, "picAdType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleIsNull() {
+            addCriterion("PIC_AD_TITLE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleIsNotNull() {
+            addCriterion("PIC_AD_TITLE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleEqualTo(String value) {
+            addCriterion("PIC_AD_TITLE =", value, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleNotEqualTo(String value) {
+            addCriterion("PIC_AD_TITLE <>", value, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleGreaterThan(String value) {
+            addCriterion("PIC_AD_TITLE >", value, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_TITLE >=", value, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleLessThan(String value) {
+            addCriterion("PIC_AD_TITLE <", value, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleLessThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_TITLE <=", value, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleLike(String value) {
+            addCriterion("PIC_AD_TITLE like", value, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleNotLike(String value) {
+            addCriterion("PIC_AD_TITLE not like", value, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleIn(List<String> values) {
+            addCriterion("PIC_AD_TITLE in", values, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleNotIn(List<String> values) {
+            addCriterion("PIC_AD_TITLE not in", values, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleBetween(String value1, String value2) {
+            addCriterion("PIC_AD_TITLE between", value1, value2, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdTitleNotBetween(String value1, String value2) {
+            addCriterion("PIC_AD_TITLE not between", value1, value2, "picAdTitle");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameIsNull() {
+            addCriterion("PIC_AD_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameIsNotNull() {
+            addCriterion("PIC_AD_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameEqualTo(String value) {
+            addCriterion("PIC_AD_NAME =", value, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameNotEqualTo(String value) {
+            addCriterion("PIC_AD_NAME <>", value, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameGreaterThan(String value) {
+            addCriterion("PIC_AD_NAME >", value, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameGreaterThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_NAME >=", value, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameLessThan(String value) {
+            addCriterion("PIC_AD_NAME <", value, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameLessThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_NAME <=", value, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameLike(String value) {
+            addCriterion("PIC_AD_NAME like", value, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameNotLike(String value) {
+            addCriterion("PIC_AD_NAME not like", value, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameIn(List<String> values) {
+            addCriterion("PIC_AD_NAME in", values, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameNotIn(List<String> values) {
+            addCriterion("PIC_AD_NAME not in", values, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameBetween(String value1, String value2) {
+            addCriterion("PIC_AD_NAME between", value1, value2, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdNameNotBetween(String value1, String value2) {
+            addCriterion("PIC_AD_NAME not between", value1, value2, "picAdName");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlIsNull() {
+            addCriterion("PIC_AD_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlIsNotNull() {
+            addCriterion("PIC_AD_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlEqualTo(String value) {
+            addCriterion("PIC_AD_URL =", value, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlNotEqualTo(String value) {
+            addCriterion("PIC_AD_URL <>", value, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlGreaterThan(String value) {
+            addCriterion("PIC_AD_URL >", value, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_URL >=", value, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlLessThan(String value) {
+            addCriterion("PIC_AD_URL <", value, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlLessThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_URL <=", value, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlLike(String value) {
+            addCriterion("PIC_AD_URL like", value, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlNotLike(String value) {
+            addCriterion("PIC_AD_URL not like", value, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlIn(List<String> values) {
+            addCriterion("PIC_AD_URL in", values, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlNotIn(List<String> values) {
+            addCriterion("PIC_AD_URL not in", values, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlBetween(String value1, String value2) {
+            addCriterion("PIC_AD_URL between", value1, value2, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdUrlNotBetween(String value1, String value2) {
+            addCriterion("PIC_AD_URL not between", value1, value2, "picAdUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateIsNull() {
+            addCriterion("PIC_AD_STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateIsNotNull() {
+            addCriterion("PIC_AD_STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateEqualTo(String value) {
+            addCriterion("PIC_AD_STATE =", value, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateNotEqualTo(String value) {
+            addCriterion("PIC_AD_STATE <>", value, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateGreaterThan(String value) {
+            addCriterion("PIC_AD_STATE >", value, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateGreaterThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_STATE >=", value, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateLessThan(String value) {
+            addCriterion("PIC_AD_STATE <", value, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateLessThanOrEqualTo(String value) {
+            addCriterion("PIC_AD_STATE <=", value, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateLike(String value) {
+            addCriterion("PIC_AD_STATE like", value, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateNotLike(String value) {
+            addCriterion("PIC_AD_STATE not like", value, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateIn(List<String> values) {
+            addCriterion("PIC_AD_STATE in", values, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateNotIn(List<String> values) {
+            addCriterion("PIC_AD_STATE not in", values, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateBetween(String value1, String value2) {
+            addCriterion("PIC_AD_STATE between", value1, value2, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andPicAdStateNotBetween(String value1, String value2) {
+            addCriterion("PIC_AD_STATE not between", value1, value2, "picAdState");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNull() {
+            addCriterion("CREATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIsNotNull() {
+            addCriterion("CREATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateEqualTo(String value) {
+            addCriterion("CREATE_DATE =", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotEqualTo(String value) {
+            addCriterion("CREATE_DATE <>", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThan(String value) {
+            addCriterion("CREATE_DATE >", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE >=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThan(String value) {
+            addCriterion("CREATE_DATE <", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_DATE <=", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateLike(String value) {
+            addCriterion("CREATE_DATE like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotLike(String value) {
+            addCriterion("CREATE_DATE not like", value, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateIn(List<String> values) {
+            addCriterion("CREATE_DATE in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotIn(List<String> values) {
+            addCriterion("CREATE_DATE not in", values, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateDateNotBetween(String value1, String value2) {
+            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLike(String value) {
+            addCriterion("CREATE_TIME like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotLike(String value) {
+            addCriterion("CREATE_TIME not like", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNull() {
+            addCriterion("UPDATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIsNotNull() {
+            addCriterion("UPDATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserEqualTo(String value) {
+            addCriterion("UPDATE_USER =", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotEqualTo(String value) {
+            addCriterion("UPDATE_USER <>", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThan(String value) {
+            addCriterion("UPDATE_USER >", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER >=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThan(String value) {
+            addCriterion("UPDATE_USER <", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_USER <=", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserLike(String value) {
+            addCriterion("UPDATE_USER like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotLike(String value) {
+            addCriterion("UPDATE_USER not like", value, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserIn(List<String> values) {
+            addCriterion("UPDATE_USER in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotIn(List<String> values) {
+            addCriterion("UPDATE_USER not in", values, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateUserNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNull() {
+            addCriterion("UPDATE_DATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIsNotNull() {
+            addCriterion("UPDATE_DATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateEqualTo(String value) {
+            addCriterion("UPDATE_DATE =", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotEqualTo(String value) {
+            addCriterion("UPDATE_DATE <>", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThan(String value) {
+            addCriterion("UPDATE_DATE >", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE >=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThan(String value) {
+            addCriterion("UPDATE_DATE <", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_DATE <=", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateLike(String value) {
+            addCriterion("UPDATE_DATE like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotLike(String value) {
+            addCriterion("UPDATE_DATE not like", value, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateIn(List<String> values) {
+            addCriterion("UPDATE_DATE in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotIn(List<String> values) {
+            addCriterion("UPDATE_DATE not in", values, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateDateNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(String value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(String value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(String value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(String value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLike(String value) {
+            addCriterion("UPDATE_TIME like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotLike(String value) {
+            addCriterion("UPDATE_TIME not like", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<String> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<String> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated do_not_delete_during_merge Tue Jun 12 09:41:05 CST 2018
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/PublishedArticleInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/PublishedArticleInfo.java
new file mode 100644
index 000000000..2aff30401
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/PublishedArticleInfo.java
@@ -0,0 +1,129 @@
+package com.ruoyi.content.domain;
+
+public class PublishedArticleInfo  {
+
+	private String articleId;		//文章id
+	private String articleName;		//文章名称
+	private String pushDate;		//文章发布日期
+	private String articleAuthor;	//文章作者
+	private String special;		//一级栏目	
+	private String channelId;	//二级栏目
+	private String articleState;	//文章状态
+	private String originalUrl;	//原文链接
+	private String shareTitle;	//分享标题
+	private String shareDes;	//分享描述	
+	private String createUser;	//创建者
+	private String updateDate;	//更新日期
+	private String updateTime;	//更新时间
+	private String visitorCount;	//浏览量
+	private String modifiedEditUrl;	//预览路径
+	private String modifiedViewUrl;	//编辑路径
+	private String shareCount;		//分享量
+	
+	public String getArticleId() {
+		return articleId;
+	}
+	public void setArticleId(String articleId) {
+		this.articleId = articleId;
+	}
+	public String getArticleName() {
+		return articleName;
+	}
+	public void setArticleName(String articleName) {
+		this.articleName = articleName;
+	}
+	public String getPushDate() {
+		return pushDate;
+	}
+	public void setPushDate(String pushDate) {
+		this.pushDate = pushDate;
+	}
+	public String getArticleAuthor() {
+		return articleAuthor;
+	}
+	public void setArticleAuthor(String articleAuthor) {
+		this.articleAuthor = articleAuthor;
+	}
+	public String getSpecial() {
+		return special;
+	}
+	public void setSpecial(String special) {
+		this.special = special;
+	}
+	public String getChannelId() {
+		return channelId;
+	}
+	public void setChannelId(String channelId) {
+		this.channelId = channelId;
+	}
+	public String getArticleState() {
+		return articleState;
+	}
+	public void setArticleState(String articleState) {
+		this.articleState = articleState;
+	}
+	
+	public String getOriginalUrl() {
+		return originalUrl;
+	}
+	public void setOriginalUrl(String originalUrl) {
+		this.originalUrl = originalUrl;
+	}
+	public String getShareTitle() {
+		return shareTitle;
+	}
+	public void setShareTitle(String shareTitle) {
+		this.shareTitle = shareTitle;
+	}
+	public String getShareDes() {
+		return shareDes;
+	}
+	public void setShareDes(String shareDes) {
+		this.shareDes = shareDes;
+	}
+	public String getCreateUser() {
+		return createUser;
+	}
+	public void setCreateUser(String createUser) {
+		this.createUser = createUser;
+	}
+	public String getUpdateDate() {
+		return updateDate;
+	}
+	public void setUpdateDate(String updateDate) {
+		this.updateDate = updateDate;
+	}
+	public String getUpdateTime() {
+		return updateTime;
+	}
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+	public String getVisitorCount() {
+		return visitorCount;
+	}
+	public void setVisitorCount(String visitorCount) {
+		this.visitorCount = visitorCount;
+	}
+	public String getShareCount() {
+		return shareCount;
+	}
+	public void setShareCount(String shareCount) {
+		this.shareCount = shareCount;
+	}
+	public String getModifiedEditUrl() {
+		return modifiedEditUrl;
+	}
+	public void setModifiedEditUrl(String modifiedEditUrl) {
+		this.modifiedEditUrl = modifiedEditUrl;
+	}
+	public String getModifiedViewUrl() {
+		return modifiedViewUrl;
+	}
+	public void setModifiedViewUrl(String modifiedViewUrl) {
+		this.modifiedViewUrl = modifiedViewUrl;
+	}
+	
+
+	
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/RedisPublishedArticleInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/RedisPublishedArticleInfo.java
new file mode 100644
index 000000000..80522f579
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/RedisPublishedArticleInfo.java
@@ -0,0 +1,100 @@
+package com.ruoyi.content.domain;
+
+public class RedisPublishedArticleInfo  {
+
+		private String publishId;		//文章发布id
+		private String articleId;		//文章id
+		private String articleName;		//文章名称
+		private String listPicUrl;		//文章列表显示图片
+		private String createDate;		//文章发布日期
+		private String visitorCount;	//文章浏览人数
+		private String sharedCount;		//文章分享人数
+		private String publishViewUrl;	//文章发布浏览静态页面路径
+		private String publishEditUrl;	//文章发布编辑静态页面路径
+		private String adId;			//广告id
+		private String cardId;			//名片id
+
+		public String getCardId() {
+			return cardId;
+		}
+
+		public void setCardId(String cardId) {
+			this.cardId = cardId;
+		}
+
+		public String getAdId() {
+			return adId;
+		}
+
+		public void setAdId(String adId) {
+			this.adId = adId;
+		}
+
+		@Override
+		public String toString() {
+			return "PublishedArticleInfo [publishId=" + publishId + ", articleId=" + articleId + ", articleName="
+					+ articleName + ", listPicUrl=" + listPicUrl + ", createDate=" + createDate + ", visitorCount="
+					+ visitorCount + ", sharedCount=" + sharedCount + ", publishViewUrl=" + publishViewUrl
+					+ ", publishEditUrl=" + publishEditUrl + ", adId=" + adId + ", cardId=" + cardId + "]";
+		}
+		
+		public String getPublishViewUrl() {
+			return publishViewUrl;
+		}
+
+		public void setPublishViewUrl(String publishViewUrl) {
+			this.publishViewUrl = publishViewUrl;
+		}
+
+		public String getPublishEditUrl() {
+			return publishEditUrl;
+		}
+
+		public void setPublishEditUrl(String publishEditUrl) {
+			this.publishEditUrl = publishEditUrl;
+		}
+
+		public String getPublishId() {
+			return publishId;
+		}
+		public void setPublishId(String publishId) {
+			this.publishId = publishId;
+		}
+		public String getArticleId() {
+			return articleId;
+		}
+		public void setArticleId(String articleId) {
+			this.articleId = articleId;
+		}
+		public String getArticleName() {
+			return articleName;
+		}
+		public void setArticleName(String articleName) {
+			this.articleName = articleName;
+		}
+		public String getListPicUrl() {
+			return listPicUrl;
+		}
+		public void setListPicUrl(String listPicUrl) {
+			this.listPicUrl = listPicUrl;
+		}
+		public String getCreateDate() {
+			return createDate;
+		}
+		public void setCreateDate(String createDate) {
+			this.createDate = createDate;
+		}
+		public String getVisitorCount() {
+			return visitorCount;
+		}
+		public void setVisitorCount(String visitorCount) {
+			this.visitorCount = visitorCount;
+		}
+		public String getSharedCount() {
+			return sharedCount;
+		}
+		public void setSharedCount(String sharedCount) {
+			this.sharedCount = sharedCount;
+		}
+		 
+	}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfo.java
new file mode 100644
index 000000000..19113a75e
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfo.java
@@ -0,0 +1,861 @@
+package com.ruoyi.content.domain;
+
+import java.util.Date;
+
+public class UserInfo {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.USER_ID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private Integer userId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.OPENID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String openid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.HEAD_IMG_URL
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String headImgUrl;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.NICK_NAME
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String nickName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.COMPANY_ID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String companyId;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.AGENT_CODE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String agentCode;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.USER_NAME
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String userName;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.ID_TYPE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String idType;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.ID_NO
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String idNo;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.GENDER
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String gender;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.USER_POSITION
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String userPosition;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.BIRTHDAY
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String birthday;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.EDUCATION
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String education;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.MOBILE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String mobile;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.USER_EMAIL
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String userEmail;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.PROVINCE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String province;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.CITY
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String city;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.AREA
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String area;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.REFEREE_USERID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String refereeUserid;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.STATE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String state;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String createUser;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.CREATE_TIME
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String createTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.UPDATE_TIME
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String updateTime;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String updateRemark;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.SOURCE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    private String source;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.TIMESTAMP
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+//    private String timestamp;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column user_info.AGE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+//    private String age;
+    private String cardImgUrl;
+
+    public String getCardImgUrl() {
+		return cardImgUrl;
+	}
+
+	public void setCardImgUrl(String cardImgUrl) {
+		this.cardImgUrl = cardImgUrl;
+	}
+
+	/**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.USER_ID
+     *
+     * @return the value of user_info.USER_ID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public Integer getUserId() {
+        return userId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.USER_ID
+     *
+     * @param userId the value for user_info.USER_ID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.OPENID
+     *
+     * @return the value of user_info.OPENID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getOpenid() {
+        return openid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.OPENID
+     *
+     * @param openid the value for user_info.OPENID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setOpenid(String openid) {
+        this.openid = openid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.HEAD_IMG_URL
+     *
+     * @return the value of user_info.HEAD_IMG_URL
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getHeadImgUrl() {
+        return headImgUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.HEAD_IMG_URL
+     *
+     * @param headImgUrl the value for user_info.HEAD_IMG_URL
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setHeadImgUrl(String headImgUrl) {
+        this.headImgUrl = headImgUrl;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.NICK_NAME
+     *
+     * @return the value of user_info.NICK_NAME
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getNickName() {
+        return nickName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.NICK_NAME
+     *
+     * @param nickName the value for user_info.NICK_NAME
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.COMPANY_ID
+     *
+     * @return the value of user_info.COMPANY_ID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.COMPANY_ID
+     *
+     * @param companyId the value for user_info.COMPANY_ID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setCompanyId(String companyId) {
+        this.companyId = companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.AGENT_CODE
+     *
+     * @return the value of user_info.AGENT_CODE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getAgentCode() {
+        return agentCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.AGENT_CODE
+     *
+     * @param agentCode the value for user_info.AGENT_CODE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setAgentCode(String agentCode) {
+        this.agentCode = agentCode;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.USER_NAME
+     *
+     * @return the value of user_info.USER_NAME
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.USER_NAME
+     *
+     * @param userName the value for user_info.USER_NAME
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.ID_TYPE
+     *
+     * @return the value of user_info.ID_TYPE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getIdType() {
+        return idType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.ID_TYPE
+     *
+     * @param idType the value for user_info.ID_TYPE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setIdType(String idType) {
+        this.idType = idType;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.ID_NO
+     *
+     * @return the value of user_info.ID_NO
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getIdNo() {
+        return idNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.ID_NO
+     *
+     * @param idNo the value for user_info.ID_NO
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setIdNo(String idNo) {
+        this.idNo = idNo;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.GENDER
+     *
+     * @return the value of user_info.GENDER
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getGender() {
+        return gender;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.GENDER
+     *
+     * @param gender the value for user_info.GENDER
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.USER_POSITION
+     *
+     * @return the value of user_info.USER_POSITION
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getUserPosition() {
+        return userPosition;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.USER_POSITION
+     *
+     * @param userPosition the value for user_info.USER_POSITION
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setUserPosition(String userPosition) {
+        this.userPosition = userPosition;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.BIRTHDAY
+     *
+     * @return the value of user_info.BIRTHDAY
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getBirthday() {
+        return birthday;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.BIRTHDAY
+     *
+     * @param birthday the value for user_info.BIRTHDAY
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setBirthday(String birthday) {
+        this.birthday = birthday;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.EDUCATION
+     *
+     * @return the value of user_info.EDUCATION
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getEducation() {
+        return education;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.EDUCATION
+     *
+     * @param education the value for user_info.EDUCATION
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setEducation(String education) {
+        this.education = education;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.MOBILE
+     *
+     * @return the value of user_info.MOBILE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getMobile() {
+        return mobile;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.MOBILE
+     *
+     * @param mobile the value for user_info.MOBILE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.USER_EMAIL
+     *
+     * @return the value of user_info.USER_EMAIL
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getUserEmail() {
+        return userEmail;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.USER_EMAIL
+     *
+     * @param userEmail the value for user_info.USER_EMAIL
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setUserEmail(String userEmail) {
+        this.userEmail = userEmail;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.PROVINCE
+     *
+     * @return the value of user_info.PROVINCE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getProvince() {
+        return province;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.PROVINCE
+     *
+     * @param province the value for user_info.PROVINCE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.CITY
+     *
+     * @return the value of user_info.CITY
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getCity() {
+        return city;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.CITY
+     *
+     * @param city the value for user_info.CITY
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.AREA
+     *
+     * @return the value of user_info.AREA
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getArea() {
+        return area;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.AREA
+     *
+     * @param area the value for user_info.AREA
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.REFEREE_USERID
+     *
+     * @return the value of user_info.REFEREE_USERID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getRefereeUserid() {
+        return refereeUserid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.REFEREE_USERID
+     *
+     * @param refereeUserid the value for user_info.REFEREE_USERID
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setRefereeUserid(String refereeUserid) {
+        this.refereeUserid = refereeUserid;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.STATE
+     *
+     * @return the value of user_info.STATE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.STATE
+     *
+     * @param state the value for user_info.STATE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.CREATE_USER
+     *
+     * @return the value of user_info.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getCreateUser() {
+        return createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.CREATE_USER
+     *
+     * @param createUser the value for user_info.CREATE_USER
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setCreateUser(String createUser) {
+        this.createUser = createUser;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.CREATE_TIME
+     *
+     * @return the value of user_info.CREATE_TIME
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.UPDATE_REMARK
+     *
+     * @return the value of user_info.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getUpdateRemark() {
+        return updateRemark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.UPDATE_REMARK
+     *
+     * @param updateRemark the value for user_info.UPDATE_REMARK
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setUpdateRemark(String updateRemark) {
+        this.updateRemark = updateRemark;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.SOURCE
+     *
+     * @return the value of user_info.SOURCE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.SOURCE
+     *
+     * @param source the value for user_info.SOURCE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.TIMESTAMP
+     *
+     * @return the value of user_info.TIMESTAMP
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column user_info.AGE
+     *
+     * @return the value of user_info.AGE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+//    public String getAge() {
+//        return age;
+//    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column user_info.AGE
+     *
+     * @param age the value for user_info.AGE
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+//    public void setAge(String age) {
+//        this.age = age;
+//    }
+
+	public String getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(String createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(String updateTime) {
+		this.updateTime = updateTime;
+	}
+
+//	public String getTimestamp() {
+//		return timestamp;
+//	}
+//
+//	public void setTimestamp(String timestamp) {
+//		this.timestamp = timestamp;
+//	}
+
+	@Override
+	public String toString() {
+		return "UserInfo [userId=" + userId + ", openid=" + openid + ", headImgUrl=" + headImgUrl + ", nickName="
+				+ nickName + ", companyId=" + companyId + ", agentCode=" + agentCode + ", userName=" + userName
+				+ ", idType=" + idType + ", idNo=" + idNo + ", gender=" + gender + ", userPosition=" + userPosition
+				+ ", birthday=" + birthday + ", education=" + education + ", mobile=" + mobile + ", userEmail="
+				+ userEmail + ", province=" + province + ", city=" + city + ", area=" + area + ", refereeUserid="
+				+ refereeUserid + ", state=" + state + ", createUser=" + createUser + ", createTime=" + createTime
+				+ ", updateTime=" + updateTime + ", updateRemark=" + updateRemark + ", source=" + source
+				+ "]";//, timestamp=" + timestamp + ", age=" + age + "]";
+	}
+    
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfoDTO.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfoDTO.java
new file mode 100644
index 000000000..9223f71d0
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfoDTO.java
@@ -0,0 +1,28 @@
+package com.ruoyi.content.domain;
+
+public class UserInfoDTO {
+
+	private String userId;
+	private String openID;
+	private String companyId;
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public String getOpenID() {
+		return openID;
+	}
+	public void setOpenID(String openID) {
+		this.openID = openID;
+	}
+	public String getCompanyId() {
+		return companyId;
+	}
+	public void setCompanyId(String companyId) {
+		this.companyId = companyId;
+	}
+	
+	
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfoExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfoExample.java
new file mode 100644
index 000000000..c77fe8f60
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/UserInfoExample.java
@@ -0,0 +1,2241 @@
+package com.ruoyi.content.domain;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class UserInfoExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public UserInfoExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andUserIdIsNull() {
+            addCriterion("USER_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIsNotNull() {
+            addCriterion("USER_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdEqualTo(Integer value) {
+            addCriterion("USER_ID =", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotEqualTo(Integer value) {
+            addCriterion("USER_ID <>", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThan(Integer value) {
+            addCriterion("USER_ID >", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("USER_ID >=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThan(Integer value) {
+            addCriterion("USER_ID <", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdLessThanOrEqualTo(Integer value) {
+            addCriterion("USER_ID <=", value, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdIn(List<Integer> values) {
+            addCriterion("USER_ID in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotIn(List<Integer> values) {
+            addCriterion("USER_ID not in", values, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdBetween(Integer value1, Integer value2) {
+            addCriterion("USER_ID between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("USER_ID not between", value1, value2, "userId");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidIsNull() {
+            addCriterion("OPENID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidIsNotNull() {
+            addCriterion("OPENID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidEqualTo(String value) {
+            addCriterion("OPENID =", value, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidNotEqualTo(String value) {
+            addCriterion("OPENID <>", value, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidGreaterThan(String value) {
+            addCriterion("OPENID >", value, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidGreaterThanOrEqualTo(String value) {
+            addCriterion("OPENID >=", value, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidLessThan(String value) {
+            addCriterion("OPENID <", value, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidLessThanOrEqualTo(String value) {
+            addCriterion("OPENID <=", value, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidLike(String value) {
+            addCriterion("OPENID like", value, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidNotLike(String value) {
+            addCriterion("OPENID not like", value, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidIn(List<String> values) {
+            addCriterion("OPENID in", values, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidNotIn(List<String> values) {
+            addCriterion("OPENID not in", values, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidBetween(String value1, String value2) {
+            addCriterion("OPENID between", value1, value2, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andOpenidNotBetween(String value1, String value2) {
+            addCriterion("OPENID not between", value1, value2, "openid");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlIsNull() {
+            addCriterion("HEAD_IMG_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlIsNotNull() {
+            addCriterion("HEAD_IMG_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlEqualTo(String value) {
+            addCriterion("HEAD_IMG_URL =", value, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlNotEqualTo(String value) {
+            addCriterion("HEAD_IMG_URL <>", value, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlGreaterThan(String value) {
+            addCriterion("HEAD_IMG_URL >", value, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("HEAD_IMG_URL >=", value, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlLessThan(String value) {
+            addCriterion("HEAD_IMG_URL <", value, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlLessThanOrEqualTo(String value) {
+            addCriterion("HEAD_IMG_URL <=", value, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlLike(String value) {
+            addCriterion("HEAD_IMG_URL like", value, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlNotLike(String value) {
+            addCriterion("HEAD_IMG_URL not like", value, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlIn(List<String> values) {
+            addCriterion("HEAD_IMG_URL in", values, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlNotIn(List<String> values) {
+            addCriterion("HEAD_IMG_URL not in", values, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlBetween(String value1, String value2) {
+            addCriterion("HEAD_IMG_URL between", value1, value2, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andHeadImgUrlNotBetween(String value1, String value2) {
+            addCriterion("HEAD_IMG_URL not between", value1, value2, "headImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameIsNull() {
+            addCriterion("NICK_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameIsNotNull() {
+            addCriterion("NICK_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameEqualTo(String value) {
+            addCriterion("NICK_NAME =", value, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameNotEqualTo(String value) {
+            addCriterion("NICK_NAME <>", value, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameGreaterThan(String value) {
+            addCriterion("NICK_NAME >", value, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameGreaterThanOrEqualTo(String value) {
+            addCriterion("NICK_NAME >=", value, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameLessThan(String value) {
+            addCriterion("NICK_NAME <", value, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameLessThanOrEqualTo(String value) {
+            addCriterion("NICK_NAME <=", value, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameLike(String value) {
+            addCriterion("NICK_NAME like", value, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameNotLike(String value) {
+            addCriterion("NICK_NAME not like", value, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameIn(List<String> values) {
+            addCriterion("NICK_NAME in", values, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameNotIn(List<String> values) {
+            addCriterion("NICK_NAME not in", values, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameBetween(String value1, String value2) {
+            addCriterion("NICK_NAME between", value1, value2, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andNickNameNotBetween(String value1, String value2) {
+            addCriterion("NICK_NAME not between", value1, value2, "nickName");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("COMPANY_ID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("COMPANY_ID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(String value) {
+            addCriterion("COMPANY_ID =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(String value) {
+            addCriterion("COMPANY_ID <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(String value) {
+            addCriterion("COMPANY_ID >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(String value) {
+            addCriterion("COMPANY_ID <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(String value) {
+            addCriterion("COMPANY_ID <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLike(String value) {
+            addCriterion("COMPANY_ID like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotLike(String value) {
+            addCriterion("COMPANY_ID not like", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<String> values) {
+            addCriterion("COMPANY_ID in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<String> values) {
+            addCriterion("COMPANY_ID not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(String value1, String value2) {
+            addCriterion("COMPANY_ID not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeIsNull() {
+            addCriterion("AGENT_CODE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeIsNotNull() {
+            addCriterion("AGENT_CODE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeEqualTo(String value) {
+            addCriterion("AGENT_CODE =", value, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeNotEqualTo(String value) {
+            addCriterion("AGENT_CODE <>", value, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeGreaterThan(String value) {
+            addCriterion("AGENT_CODE >", value, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("AGENT_CODE >=", value, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeLessThan(String value) {
+            addCriterion("AGENT_CODE <", value, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeLessThanOrEqualTo(String value) {
+            addCriterion("AGENT_CODE <=", value, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeLike(String value) {
+            addCriterion("AGENT_CODE like", value, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeNotLike(String value) {
+            addCriterion("AGENT_CODE not like", value, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeIn(List<String> values) {
+            addCriterion("AGENT_CODE in", values, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeNotIn(List<String> values) {
+            addCriterion("AGENT_CODE not in", values, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeBetween(String value1, String value2) {
+            addCriterion("AGENT_CODE between", value1, value2, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andAgentCodeNotBetween(String value1, String value2) {
+            addCriterion("AGENT_CODE not between", value1, value2, "agentCode");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameIsNull() {
+            addCriterion("USER_NAME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameIsNotNull() {
+            addCriterion("USER_NAME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameEqualTo(String value) {
+            addCriterion("USER_NAME =", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotEqualTo(String value) {
+            addCriterion("USER_NAME <>", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameGreaterThan(String value) {
+            addCriterion("USER_NAME >", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameGreaterThanOrEqualTo(String value) {
+            addCriterion("USER_NAME >=", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameLessThan(String value) {
+            addCriterion("USER_NAME <", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameLessThanOrEqualTo(String value) {
+            addCriterion("USER_NAME <=", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameLike(String value) {
+            addCriterion("USER_NAME like", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotLike(String value) {
+            addCriterion("USER_NAME not like", value, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameIn(List<String> values) {
+            addCriterion("USER_NAME in", values, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotIn(List<String> values) {
+            addCriterion("USER_NAME not in", values, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameBetween(String value1, String value2) {
+            addCriterion("USER_NAME between", value1, value2, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNameNotBetween(String value1, String value2) {
+            addCriterion("USER_NAME not between", value1, value2, "userName");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeIsNull() {
+            addCriterion("ID_TYPE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeIsNotNull() {
+            addCriterion("ID_TYPE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeEqualTo(String value) {
+            addCriterion("ID_TYPE =", value, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeNotEqualTo(String value) {
+            addCriterion("ID_TYPE <>", value, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeGreaterThan(String value) {
+            addCriterion("ID_TYPE >", value, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("ID_TYPE >=", value, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeLessThan(String value) {
+            addCriterion("ID_TYPE <", value, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeLessThanOrEqualTo(String value) {
+            addCriterion("ID_TYPE <=", value, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeLike(String value) {
+            addCriterion("ID_TYPE like", value, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeNotLike(String value) {
+            addCriterion("ID_TYPE not like", value, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeIn(List<String> values) {
+            addCriterion("ID_TYPE in", values, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeNotIn(List<String> values) {
+            addCriterion("ID_TYPE not in", values, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeBetween(String value1, String value2) {
+            addCriterion("ID_TYPE between", value1, value2, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdTypeNotBetween(String value1, String value2) {
+            addCriterion("ID_TYPE not between", value1, value2, "idType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoIsNull() {
+            addCriterion("ID_NO is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoIsNotNull() {
+            addCriterion("ID_NO is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoEqualTo(String value) {
+            addCriterion("ID_NO =", value, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoNotEqualTo(String value) {
+            addCriterion("ID_NO <>", value, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoGreaterThan(String value) {
+            addCriterion("ID_NO >", value, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoGreaterThanOrEqualTo(String value) {
+            addCriterion("ID_NO >=", value, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoLessThan(String value) {
+            addCriterion("ID_NO <", value, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoLessThanOrEqualTo(String value) {
+            addCriterion("ID_NO <=", value, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoLike(String value) {
+            addCriterion("ID_NO like", value, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoNotLike(String value) {
+            addCriterion("ID_NO not like", value, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoIn(List<String> values) {
+            addCriterion("ID_NO in", values, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoNotIn(List<String> values) {
+            addCriterion("ID_NO not in", values, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoBetween(String value1, String value2) {
+            addCriterion("ID_NO between", value1, value2, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNoNotBetween(String value1, String value2) {
+            addCriterion("ID_NO not between", value1, value2, "idNo");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderIsNull() {
+            addCriterion("GENDER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderIsNotNull() {
+            addCriterion("GENDER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderEqualTo(String value) {
+            addCriterion("GENDER =", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderNotEqualTo(String value) {
+            addCriterion("GENDER <>", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderGreaterThan(String value) {
+            addCriterion("GENDER >", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderGreaterThanOrEqualTo(String value) {
+            addCriterion("GENDER >=", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderLessThan(String value) {
+            addCriterion("GENDER <", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderLessThanOrEqualTo(String value) {
+            addCriterion("GENDER <=", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderLike(String value) {
+            addCriterion("GENDER like", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderNotLike(String value) {
+            addCriterion("GENDER not like", value, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderIn(List<String> values) {
+            addCriterion("GENDER in", values, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderNotIn(List<String> values) {
+            addCriterion("GENDER not in", values, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderBetween(String value1, String value2) {
+            addCriterion("GENDER between", value1, value2, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andGenderNotBetween(String value1, String value2) {
+            addCriterion("GENDER not between", value1, value2, "gender");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionIsNull() {
+            addCriterion("USER_POSITION is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionIsNotNull() {
+            addCriterion("USER_POSITION is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionEqualTo(String value) {
+            addCriterion("USER_POSITION =", value, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionNotEqualTo(String value) {
+            addCriterion("USER_POSITION <>", value, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionGreaterThan(String value) {
+            addCriterion("USER_POSITION >", value, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionGreaterThanOrEqualTo(String value) {
+            addCriterion("USER_POSITION >=", value, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionLessThan(String value) {
+            addCriterion("USER_POSITION <", value, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionLessThanOrEqualTo(String value) {
+            addCriterion("USER_POSITION <=", value, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionLike(String value) {
+            addCriterion("USER_POSITION like", value, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionNotLike(String value) {
+            addCriterion("USER_POSITION not like", value, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionIn(List<String> values) {
+            addCriterion("USER_POSITION in", values, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionNotIn(List<String> values) {
+            addCriterion("USER_POSITION not in", values, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionBetween(String value1, String value2) {
+            addCriterion("USER_POSITION between", value1, value2, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserPositionNotBetween(String value1, String value2) {
+            addCriterion("USER_POSITION not between", value1, value2, "userPosition");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayIsNull() {
+            addCriterion("BIRTHDAY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayIsNotNull() {
+            addCriterion("BIRTHDAY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayEqualTo(String value) {
+            addCriterion("BIRTHDAY =", value, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayNotEqualTo(String value) {
+            addCriterion("BIRTHDAY <>", value, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayGreaterThan(String value) {
+            addCriterion("BIRTHDAY >", value, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayGreaterThanOrEqualTo(String value) {
+            addCriterion("BIRTHDAY >=", value, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayLessThan(String value) {
+            addCriterion("BIRTHDAY <", value, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayLessThanOrEqualTo(String value) {
+            addCriterion("BIRTHDAY <=", value, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayLike(String value) {
+            addCriterion("BIRTHDAY like", value, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayNotLike(String value) {
+            addCriterion("BIRTHDAY not like", value, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayIn(List<String> values) {
+            addCriterion("BIRTHDAY in", values, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayNotIn(List<String> values) {
+            addCriterion("BIRTHDAY not in", values, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayBetween(String value1, String value2) {
+            addCriterion("BIRTHDAY between", value1, value2, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andBirthdayNotBetween(String value1, String value2) {
+            addCriterion("BIRTHDAY not between", value1, value2, "birthday");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationIsNull() {
+            addCriterion("EDUCATION is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationIsNotNull() {
+            addCriterion("EDUCATION is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationEqualTo(String value) {
+            addCriterion("EDUCATION =", value, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationNotEqualTo(String value) {
+            addCriterion("EDUCATION <>", value, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationGreaterThan(String value) {
+            addCriterion("EDUCATION >", value, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationGreaterThanOrEqualTo(String value) {
+            addCriterion("EDUCATION >=", value, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationLessThan(String value) {
+            addCriterion("EDUCATION <", value, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationLessThanOrEqualTo(String value) {
+            addCriterion("EDUCATION <=", value, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationLike(String value) {
+            addCriterion("EDUCATION like", value, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationNotLike(String value) {
+            addCriterion("EDUCATION not like", value, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationIn(List<String> values) {
+            addCriterion("EDUCATION in", values, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationNotIn(List<String> values) {
+            addCriterion("EDUCATION not in", values, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationBetween(String value1, String value2) {
+            addCriterion("EDUCATION between", value1, value2, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andEducationNotBetween(String value1, String value2) {
+            addCriterion("EDUCATION not between", value1, value2, "education");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileIsNull() {
+            addCriterion("MOBILE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileIsNotNull() {
+            addCriterion("MOBILE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileEqualTo(String value) {
+            addCriterion("MOBILE =", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotEqualTo(String value) {
+            addCriterion("MOBILE <>", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileGreaterThan(String value) {
+            addCriterion("MOBILE >", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileGreaterThanOrEqualTo(String value) {
+            addCriterion("MOBILE >=", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileLessThan(String value) {
+            addCriterion("MOBILE <", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileLessThanOrEqualTo(String value) {
+            addCriterion("MOBILE <=", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileLike(String value) {
+            addCriterion("MOBILE like", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotLike(String value) {
+            addCriterion("MOBILE not like", value, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileIn(List<String> values) {
+            addCriterion("MOBILE in", values, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotIn(List<String> values) {
+            addCriterion("MOBILE not in", values, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileBetween(String value1, String value2) {
+            addCriterion("MOBILE between", value1, value2, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andMobileNotBetween(String value1, String value2) {
+            addCriterion("MOBILE not between", value1, value2, "mobile");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailIsNull() {
+            addCriterion("USER_EMAIL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailIsNotNull() {
+            addCriterion("USER_EMAIL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailEqualTo(String value) {
+            addCriterion("USER_EMAIL =", value, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailNotEqualTo(String value) {
+            addCriterion("USER_EMAIL <>", value, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailGreaterThan(String value) {
+            addCriterion("USER_EMAIL >", value, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailGreaterThanOrEqualTo(String value) {
+            addCriterion("USER_EMAIL >=", value, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailLessThan(String value) {
+            addCriterion("USER_EMAIL <", value, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailLessThanOrEqualTo(String value) {
+            addCriterion("USER_EMAIL <=", value, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailLike(String value) {
+            addCriterion("USER_EMAIL like", value, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailNotLike(String value) {
+            addCriterion("USER_EMAIL not like", value, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailIn(List<String> values) {
+            addCriterion("USER_EMAIL in", values, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailNotIn(List<String> values) {
+            addCriterion("USER_EMAIL not in", values, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailBetween(String value1, String value2) {
+            addCriterion("USER_EMAIL between", value1, value2, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserEmailNotBetween(String value1, String value2) {
+            addCriterion("USER_EMAIL not between", value1, value2, "userEmail");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceIsNull() {
+            addCriterion("PROVINCE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceIsNotNull() {
+            addCriterion("PROVINCE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceEqualTo(String value) {
+            addCriterion("PROVINCE =", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceNotEqualTo(String value) {
+            addCriterion("PROVINCE <>", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceGreaterThan(String value) {
+            addCriterion("PROVINCE >", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceGreaterThanOrEqualTo(String value) {
+            addCriterion("PROVINCE >=", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceLessThan(String value) {
+            addCriterion("PROVINCE <", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceLessThanOrEqualTo(String value) {
+            addCriterion("PROVINCE <=", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceLike(String value) {
+            addCriterion("PROVINCE like", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceNotLike(String value) {
+            addCriterion("PROVINCE not like", value, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceIn(List<String> values) {
+            addCriterion("PROVINCE in", values, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceNotIn(List<String> values) {
+            addCriterion("PROVINCE not in", values, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceBetween(String value1, String value2) {
+            addCriterion("PROVINCE between", value1, value2, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andProvinceNotBetween(String value1, String value2) {
+            addCriterion("PROVINCE not between", value1, value2, "province");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityIsNull() {
+            addCriterion("CITY is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityIsNotNull() {
+            addCriterion("CITY is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityEqualTo(String value) {
+            addCriterion("CITY =", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityNotEqualTo(String value) {
+            addCriterion("CITY <>", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityGreaterThan(String value) {
+            addCriterion("CITY >", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityGreaterThanOrEqualTo(String value) {
+            addCriterion("CITY >=", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityLessThan(String value) {
+            addCriterion("CITY <", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityLessThanOrEqualTo(String value) {
+            addCriterion("CITY <=", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityLike(String value) {
+            addCriterion("CITY like", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityNotLike(String value) {
+            addCriterion("CITY not like", value, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityIn(List<String> values) {
+            addCriterion("CITY in", values, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityNotIn(List<String> values) {
+            addCriterion("CITY not in", values, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityBetween(String value1, String value2) {
+            addCriterion("CITY between", value1, value2, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andCityNotBetween(String value1, String value2) {
+            addCriterion("CITY not between", value1, value2, "city");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIsNull() {
+            addCriterion("AREA is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIsNotNull() {
+            addCriterion("AREA is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaEqualTo(String value) {
+            addCriterion("AREA =", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNotEqualTo(String value) {
+            addCriterion("AREA <>", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaGreaterThan(String value) {
+            addCriterion("AREA >", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaGreaterThanOrEqualTo(String value) {
+            addCriterion("AREA >=", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaLessThan(String value) {
+            addCriterion("AREA <", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaLessThanOrEqualTo(String value) {
+            addCriterion("AREA <=", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaLike(String value) {
+            addCriterion("AREA like", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNotLike(String value) {
+            addCriterion("AREA not like", value, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaIn(List<String> values) {
+            addCriterion("AREA in", values, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNotIn(List<String> values) {
+            addCriterion("AREA not in", values, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaBetween(String value1, String value2) {
+            addCriterion("AREA between", value1, value2, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andAreaNotBetween(String value1, String value2) {
+            addCriterion("AREA not between", value1, value2, "area");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridIsNull() {
+            addCriterion("REFEREE_USERID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridIsNotNull() {
+            addCriterion("REFEREE_USERID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridEqualTo(String value) {
+            addCriterion("REFEREE_USERID =", value, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridNotEqualTo(String value) {
+            addCriterion("REFEREE_USERID <>", value, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridGreaterThan(String value) {
+            addCriterion("REFEREE_USERID >", value, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridGreaterThanOrEqualTo(String value) {
+            addCriterion("REFEREE_USERID >=", value, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridLessThan(String value) {
+            addCriterion("REFEREE_USERID <", value, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridLessThanOrEqualTo(String value) {
+            addCriterion("REFEREE_USERID <=", value, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridLike(String value) {
+            addCriterion("REFEREE_USERID like", value, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridNotLike(String value) {
+            addCriterion("REFEREE_USERID not like", value, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridIn(List<String> values) {
+            addCriterion("REFEREE_USERID in", values, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridNotIn(List<String> values) {
+            addCriterion("REFEREE_USERID not in", values, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridBetween(String value1, String value2) {
+            addCriterion("REFEREE_USERID between", value1, value2, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRefereeUseridNotBetween(String value1, String value2) {
+            addCriterion("REFEREE_USERID not between", value1, value2, "refereeUserid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("STATE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("STATE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(String value) {
+            addCriterion("STATE =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(String value) {
+            addCriterion("STATE <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(String value) {
+            addCriterion("STATE >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(String value) {
+            addCriterion("STATE >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(String value) {
+            addCriterion("STATE <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(String value) {
+            addCriterion("STATE <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLike(String value) {
+            addCriterion("STATE like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotLike(String value) {
+            addCriterion("STATE not like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<String> values) {
+            addCriterion("STATE in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<String> values) {
+            addCriterion("STATE not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(String value1, String value2) {
+            addCriterion("STATE between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(String value1, String value2) {
+            addCriterion("STATE not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNull() {
+            addCriterion("CREATE_USER is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIsNotNull() {
+            addCriterion("CREATE_USER is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserEqualTo(String value) {
+            addCriterion("CREATE_USER =", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotEqualTo(String value) {
+            addCriterion("CREATE_USER <>", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThan(String value) {
+            addCriterion("CREATE_USER >", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER >=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThan(String value) {
+            addCriterion("CREATE_USER <", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_USER <=", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserLike(String value) {
+            addCriterion("CREATE_USER like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotLike(String value) {
+            addCriterion("CREATE_USER not like", value, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserIn(List<String> values) {
+            addCriterion("CREATE_USER in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotIn(List<String> values) {
+            addCriterion("CREATE_USER not in", values, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserBetween(String value1, String value2) {
+            addCriterion("CREATE_USER between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateUserNotBetween(String value1, String value2) {
+            addCriterion("CREATE_USER not between", value1, value2, "createUser");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("CREATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("CREATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        /**
+         * 生产上是String,原来是Date
+         * @param value
+         * @return
+         */
+        public Criteria andCreateTimeEqualTo(String value) {
+            addCriterion("CREATE_TIME =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(String value) {
+            addCriterion("CREATE_TIME <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(String value) {
+            addCriterion("CREATE_TIME >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(String value) {
+            addCriterion("CREATE_TIME <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
+            addCriterion("CREATE_TIME <=", value, "createTime");
+            return (Criteria) this;
+        }
+        
+		public Criteria andCreateTimeLike(String value) {
+			addCriterion("CREATE_TIME like", value, "createTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCreateTimeNotLike(String value) {
+			addCriterion("CREATE_TIME not like", value, "createTime");
+			return (Criteria) this;
+		}
+
+        public Criteria andCreateTimeIn(List<String> values) {
+            addCriterion("CREATE_TIME in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<String> values) {
+            addCriterion("CREATE_TIME not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(String value1, String value2) {
+            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("UPDATE_TIME is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("UPDATE_TIME is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("UPDATE_TIME =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("UPDATE_TIME <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("UPDATE_TIME >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("UPDATE_TIME >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("UPDATE_TIME <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("UPDATE_TIME <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("UPDATE_TIME in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("UPDATE_TIME not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkIsNull() {
+            addCriterion("UPDATE_REMARK is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkIsNotNull() {
+            addCriterion("UPDATE_REMARK is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkEqualTo(String value) {
+            addCriterion("UPDATE_REMARK =", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotEqualTo(String value) {
+            addCriterion("UPDATE_REMARK <>", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkGreaterThan(String value) {
+            addCriterion("UPDATE_REMARK >", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("UPDATE_REMARK >=", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkLessThan(String value) {
+            addCriterion("UPDATE_REMARK <", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkLessThanOrEqualTo(String value) {
+            addCriterion("UPDATE_REMARK <=", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkLike(String value) {
+            addCriterion("UPDATE_REMARK like", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotLike(String value) {
+            addCriterion("UPDATE_REMARK not like", value, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkIn(List<String> values) {
+            addCriterion("UPDATE_REMARK in", values, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotIn(List<String> values) {
+            addCriterion("UPDATE_REMARK not in", values, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkBetween(String value1, String value2) {
+            addCriterion("UPDATE_REMARK between", value1, value2, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateRemarkNotBetween(String value1, String value2) {
+            addCriterion("UPDATE_REMARK not between", value1, value2, "updateRemark");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIsNull() {
+            addCriterion("SOURCE is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIsNotNull() {
+            addCriterion("SOURCE is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceEqualTo(String value) {
+            addCriterion("SOURCE =", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotEqualTo(String value) {
+            addCriterion("SOURCE <>", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceGreaterThan(String value) {
+            addCriterion("SOURCE >", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceGreaterThanOrEqualTo(String value) {
+            addCriterion("SOURCE >=", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceLessThan(String value) {
+            addCriterion("SOURCE <", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceLessThanOrEqualTo(String value) {
+            addCriterion("SOURCE <=", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceLike(String value) {
+            addCriterion("SOURCE like", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotLike(String value) {
+            addCriterion("SOURCE not like", value, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceIn(List<String> values) {
+            addCriterion("SOURCE in", values, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotIn(List<String> values) {
+            addCriterion("SOURCE not in", values, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceBetween(String value1, String value2) {
+            addCriterion("SOURCE between", value1, value2, "source");
+            return (Criteria) this;
+        }
+
+        public Criteria andSourceNotBetween(String value1, String value2) {
+            addCriterion("SOURCE not between", value1, value2, "source");
+            return (Criteria) this;
+        }
+        
+        public Criteria andCardImgUrlIsNull() {
+            addCriterion("CARD_IMG_URL is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlIsNotNull() {
+            addCriterion("CARD_IMG_URL is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlEqualTo(String value) {
+            addCriterion("CARD_IMG_URL =", value, "cardImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlNotEqualTo(String value) {
+            addCriterion("CARD_IMG_URL <>", value, "cardImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlGreaterThan(String value) {
+            addCriterion("CARD_IMG_URL >", value, "cardImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("CARD_IMG_URL >=", value, "cardImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlLessThan(String value) {
+            addCriterion("CARD_IMG_URL <", value, "cardImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlLessThanOrEqualTo(String value) {
+            addCriterion("CARD_IMG_URL <=", value, "cardImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlLike(String value) {
+            addCriterion("CARD_IMG_URL like", value, "cardImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlNotLike(String value) {
+            addCriterion("CARD_IMG_URL not like", value, "cardImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlIn(List<String> values) {
+            addCriterion("CARD_IMG_URL in", values, "cardImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlNotIn(List<String> values) {
+            addCriterion("CARD_IMG_URL not in", values, "cardImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlBetween(String value1, String value2) {
+            addCriterion("CARD_IMG_URL between", value1, value2, "cardImgUrl");
+            return (Criteria) this;
+        }
+
+        public Criteria andCardImgUrlNotBetween(String value1, String value2) {
+            addCriterion("CARD_IMG_URL not between", value1, value2, "cardImgUrl");
+            return (Criteria) this;
+        }
+        
+        
+        
+
+//        public Criteria andTimestampIsNull() {
+//            addCriterion("TIMESTAMP is null");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andTimestampIsNotNull() {
+//            addCriterion("TIMESTAMP is not null");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andTimestampEqualTo(Date value) {
+//            addCriterion("TIMESTAMP =", value, "timestamp");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andTimestampNotEqualTo(Date value) {
+//            addCriterion("TIMESTAMP <>", value, "timestamp");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andTimestampGreaterThan(Date value) {
+//            addCriterion("TIMESTAMP >", value, "timestamp");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andTimestampGreaterThanOrEqualTo(Date value) {
+//            addCriterion("TIMESTAMP >=", value, "timestamp");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andTimestampLessThan(Date value) {
+//            addCriterion("TIMESTAMP <", value, "timestamp");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andTimestampLessThanOrEqualTo(Date value) {
+//            addCriterion("TIMESTAMP <=", value, "timestamp");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andTimestampIn(List<Date> values) {
+//            addCriterion("TIMESTAMP in", values, "timestamp");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andTimestampNotIn(List<Date> values) {
+//            addCriterion("TIMESTAMP not in", values, "timestamp");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andTimestampBetween(Date value1, Date value2) {
+//            addCriterion("TIMESTAMP between", value1, value2, "timestamp");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andTimestampNotBetween(Date value1, Date value2) {
+//            addCriterion("TIMESTAMP not between", value1, value2, "timestamp");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeIsNull() {
+//            addCriterion("AGE is null");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeIsNotNull() {
+//            addCriterion("AGE is not null");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeEqualTo(String value) {
+//            addCriterion("AGE =", value, "age");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeNotEqualTo(String value) {
+//            addCriterion("AGE <>", value, "age");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeGreaterThan(String value) {
+//            addCriterion("AGE >", value, "age");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeGreaterThanOrEqualTo(String value) {
+//            addCriterion("AGE >=", value, "age");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeLessThan(String value) {
+//            addCriterion("AGE <", value, "age");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeLessThanOrEqualTo(String value) {
+//            addCriterion("AGE <=", value, "age");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeLike(String value) {
+//            addCriterion("AGE like", value, "age");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeNotLike(String value) {
+//            addCriterion("AGE not like", value, "age");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeIn(List<String> values) {
+//            addCriterion("AGE in", values, "age");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeNotIn(List<String> values) {
+//            addCriterion("AGE not in", values, "age");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeBetween(String value1, String value2) {
+//            addCriterion("AGE between", value1, value2, "age");
+//            return (Criteria) this;
+//        }
+//
+//        public Criteria andAgeNotBetween(String value1, String value2) {
+//            addCriterion("AGE not between", value1, value2, "age");
+//            return (Criteria) this;
+//        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table user_info
+     *
+     * @mbggenerated do_not_delete_during_merge Tue Jul 16 10:12:10 CST 2019
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Jul 16 10:12:10 CST 2019
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/WxUserInfoDto.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/WxUserInfoDto.java
new file mode 100644
index 000000000..9c8250142
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/WxUserInfoDto.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.domain;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 用户微信基本信息
+*
+* @author liu.hx  
+* @date 2018年4月3日  
+*
+ */
+public class WxUserInfoDto implements Serializable{
+	
+	private static final long serialVersionUID = -2402610715101110825L;
+	private String subscribe;     	//关注公众号标识  用户是否订阅该公众号标识，值为0时，代表此用户没有关注该公众号，拉取不到其余信息。
+	private String openid;     		//用户openid
+	@JsonProperty("nickname")
+	private String nickName;     	//用户的昵称	  
+	private String sex;     		//用户的性别	  值为1时是男性，值为2时是女性，值为0时是未知
+	private String city;     		//用户所在城市	  
+	private String country;     	//用户所在国家	  
+	private String province;     	//用户所在省份	  
+	private String language;     	//用户的语言	 
+	@JsonProperty("headimgurl")
+	private String headImgUrl;     	//用户头像		 
+	@JsonProperty("groupid")
+	private String groupId; 		//用户所在的分组  
+	
+	
+	@Override
+	public String toString() {
+		return "WxUserInfoDto [subscribe=" + subscribe + ", openid=" + openid + ", nickName=" + nickName + ", sex="
+				+ sex + ", city=" + city + ", country=" + country + ", province=" + province + ", language=" + language
+				+ ", headImgUrl=" + headImgUrl + ", groupId=" + groupId + "]";
+	}
+	public String getSubscribe() {
+		return subscribe;
+	}
+	public void setSubscribe(String subscribe) {
+		this.subscribe = subscribe;
+	}
+	public String getOpenid() {
+		return openid;
+	}
+	public void setOpenid(String openid) {
+		this.openid = openid;
+	}
+	public String getNickName() {
+		return nickName;
+	}
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+	public String getSex() {
+		return sex;
+	}
+	public void setSex(String sex) {
+		this.sex = sex;
+	}
+	public String getCity() {
+		return city;
+	}
+	public void setCity(String city) {
+		this.city = city;
+	}
+	public String getCountry() {
+		return country;
+	}
+	public void setCountry(String country) {
+		this.country = country;
+	}
+	public String getProvince() {
+		return province;
+	}
+	public void setProvince(String province) {
+		this.province = province;
+	}
+	public String getLanguage() {
+		return language;
+	}
+	public void setLanguage(String language) {
+		this.language = language;
+	}
+	public String getHeadImgUrl() {
+		return headImgUrl;
+	}
+	public void setHeadImgUrl(String headImgUrl) {
+		this.headImgUrl = headImgUrl;
+	}
+	public String getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
+	
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/YwyForwardUserInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/YwyForwardUserInfo.java
new file mode 100644
index 000000000..d4572c98f
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/YwyForwardUserInfo.java
@@ -0,0 +1,61 @@
+package com.ruoyi.content.domain;
+
+import java.io.Serializable;
+
+/**
+ * 文章转发，用户记录
+*
+* @author  
+* @date 2018年4月16日  
+*
+ */
+public class YwyForwardUserInfo implements Serializable{
+
+	private static final long serialVersionUID = 3152100900712336169L;
+	
+	private String userId;
+	private String articleId;
+	private String headImgUrl;
+	private String nickName;
+	private String createDate;
+	private String createUser;
+
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public String getArticleId() {
+		return articleId;
+	}
+	public void setArticleId(String articleId) {
+		this.articleId = articleId;
+	}
+	public String getHeadImgUrl() {
+		return headImgUrl;
+	}
+	public void setHeadImgUrl(String headImgUrl) {
+		this.headImgUrl = headImgUrl;
+	}
+	public String getNickName() {
+		return nickName;
+	}
+	public void setNickName(String nickName) {
+		this.nickName = nickName;
+	}
+	public String getCreateDate() {
+		return createDate;
+	}
+	public void setCreateDate(String createDate) {
+		this.createDate = createDate;
+	}
+	public String getCreateUser() {
+		return createUser;
+	}
+	public void setCreateUser(String createUser) {
+		this.createUser = createUser;
+	}
+
+	
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/YwyPublishInfo.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/YwyPublishInfo.java
new file mode 100644
index 000000000..c4d20f081
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/YwyPublishInfo.java
@@ -0,0 +1,74 @@
+package com.ruoyi.content.domain;
+
+import java.io.Serializable;
+
+/**
+ * 文章转发，用户记录
+*
+* @author  
+* @date 2018年4月16日  
+*
+ */
+public class YwyPublishInfo implements Serializable{
+
+	private static final long serialVersionUID = 3152100900712336169L;
+	
+	private String clickId;
+	private String openId;
+	private String watchTime;
+	private String shareState;
+	private String clickDate;
+	private String clickTime;
+	private String clientNickName;
+	private String clientHeadImgurl;
+	
+	public String getClickId() {
+		return clickId;
+	}
+	public void setClickId(String clickId) {
+		this.clickId = clickId;
+	}
+	public String getOpenId() {
+		return openId;
+	}
+	public void setOpenId(String openId) {
+		this.openId = openId;
+	}
+	public String getWatchTime() {
+		return watchTime;
+	}
+	public void setWatchTime(String watchTime) {
+		this.watchTime = watchTime;
+	}
+	public String getShareState() {
+		return shareState;
+	}
+	public void setShareState(String shareState) {
+		this.shareState = shareState;
+	}
+	public String getClickDate() {
+		return clickDate;
+	}
+	public void setClickDate(String clickDate) {
+		this.clickDate = clickDate;
+	}
+	public String getClickTime() {
+		return clickTime;
+	}
+	public void setClickTime(String clickTime) {
+		this.clickTime = clickTime;
+	}
+	public String getClientNickName() {
+		return clientNickName;
+	}
+	public void setClientNickName(String clientNickName) {
+		this.clientNickName = clientNickName;
+	}
+	public String getClientHeadImgurl() {
+		return clientHeadImgurl;
+	}
+	public void setClientHeadImgurl(String clientHeadImgurl) {
+		this.clientHeadImgurl = clientHeadImgurl;
+	}	
+	
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/exception/MyTimeoutException.java b/ruoyi-content/src/main/java/com/ruoyi/content/exception/MyTimeoutException.java
new file mode 100644
index 000000000..750ac2a09
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/exception/MyTimeoutException.java
@@ -0,0 +1,24 @@
+package com.ruoyi.content.exception;
+
+/**
+ * 自定义请求返回超时异常
+ *
+ * @author zhanghe
+ */
+public class MyTimeoutException extends RuntimeException {
+
+    private static final long serialVersionUID = -4725428316233745222L;
+
+    public MyTimeoutException() {
+        super("读取请求返回信息超时");
+    }
+
+    public MyTimeoutException(String message) {
+        super(message);
+    }
+
+    public MyTimeoutException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AdvertisementInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AdvertisementInfoMapper.java
new file mode 100644
index 000000000..edbe2db95
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AdvertisementInfoMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.AdvertisementInfo;
+import com.ruoyi.content.domain.AdvertisementInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface AdvertisementInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int countByExample(AdvertisementInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int deleteByExample(AdvertisementInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int deleteByPrimaryKey(Integer adId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int insert(AdvertisementInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int insertSelective(AdvertisementInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    List<AdvertisementInfo> selectByExample(AdvertisementInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    AdvertisementInfo selectByPrimaryKey(Integer adId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") AdvertisementInfo record, @Param("example") AdvertisementInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByExample(@Param("record") AdvertisementInfo record, @Param("example") AdvertisementInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByPrimaryKeySelective(AdvertisementInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table advertisement_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByPrimaryKey(AdvertisementInfo record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticeClickInfoExMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticeClickInfoExMapper.java
new file mode 100644
index 000000000..8012d654c
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticeClickInfoExMapper.java
@@ -0,0 +1,32 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticeClickInfoExDTO;
+import com.ruoyi.content.domain.ArticleinfoExDTO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticeClickInfoExMapper {
+    //用户浏览分享信息（List）
+    public List<ArticeClickInfoExDTO> queryClerkArticleInfo(@Param(value = "companyId") String companyId, @Param(value = "articleId") String articleId,
+                                                            @Param(value = "startRow") int startRow, @Param(value = "rows") int rows);
+
+    ///用户浏览分享信息总数
+    public int clerkArticleCount(@Param(value = "companyId") String companyId, @Param(value = "articleId") String articleId);
+
+
+    public List<ArticleinfoExDTO> queryArticleInfoList(@Param(value = "companyId") String companyId,
+                                                       @Param(value = "articelName") String articelName, @Param(value = "articelAuthor") String articelAuthor,
+                                                       @Param(value = "channelId") String channelId, @Param(value = "special") String special,
+                                                       @Param(value = "startRow") int startRow, @Param(value = "rows") int rows);
+
+    public int articleInfoCount(@Param(value = "companyId") String companyId,
+                                @Param(value = "articelName") String articelName, @Param(value = "articelAuthor") String articelAuthor,
+                                @Param(value = "channelId") String channelId, @Param(value = "special") String special);
+
+    //查询业务员文章信息
+    public ArticleinfoExDTO selClerkArticleContent(@Param(value = "companyId") String companyId,
+                                                   @Param(value = "articleId") String articleId);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleAdInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleAdInfoMapper.java
new file mode 100644
index 000000000..16e7192df
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleAdInfoMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticleAdInfo;
+import com.ruoyi.content.domain.ArticleAdInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticleAdInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    int countByExample(ArticleAdInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    int deleteByExample(ArticleAdInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    int deleteByPrimaryKey(Integer adId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    int insert(ArticleAdInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    int insertSelective(ArticleAdInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    List<ArticleAdInfo> selectByExample(ArticleAdInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    ArticleAdInfo selectByPrimaryKey(Integer adId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") ArticleAdInfo record, @Param("example") ArticleAdInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    int updateByExample(@Param("record") ArticleAdInfo record, @Param("example") ArticleAdInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    int updateByPrimaryKeySelective(ArticleAdInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_ad_info
+     *
+     * @mbggenerated Thu Aug 02 14:00:18 CST 2018
+     */
+    int updateByPrimaryKey(ArticleAdInfo record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleAdQueryMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleAdQueryMapper.java
new file mode 100644
index 000000000..d0841afa6
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleAdQueryMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticleAdInfo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticleAdQueryMapper {
+
+    List<ArticleAdInfo> queryAdByCompanyId(@Param("companyId") String companyId);
+
+    List<ArticleAdInfo> selectAllWithLimit(@Param(value = "companyId") String companyId, @Param(value = "adTitle") String adTitle,
+                                           @Param(value = "startRow") int startRow, @Param(value = "rows") int rows);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleChannelMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleChannelMapper.java
new file mode 100644
index 000000000..a8023a63e
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleChannelMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticleChannel;
+import com.ruoyi.content.domain.ArticleChannelExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticleChannelMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    int countByExample(ArticleChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    int deleteByExample(ArticleChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    int insert(ArticleChannel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    int insertSelective(ArticleChannel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    List<ArticleChannel> selectByExample(ArticleChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    ArticleChannel selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    int updateByExampleSelective(@Param("record") ArticleChannel record, @Param("example") ArticleChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    int updateByExample(@Param("record") ArticleChannel record, @Param("example") ArticleChannelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    int updateByPrimaryKeySelective(ArticleChannel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_channel
+     *
+     * @mbggenerated Wed Mar 06 16:10:09 CST 2019
+     */
+    int updateByPrimaryKey(ArticleChannel record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleChannelQueryMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleChannelQueryMapper.java
new file mode 100644
index 000000000..ef1a5fd40
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleChannelQueryMapper.java
@@ -0,0 +1,67 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticleChannel;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Repository
+public interface ArticleChannelQueryMapper {
+
+    /**
+     * 查询文库表全部信息
+     *
+     * @param companyId
+     * @param startRow
+     * @param rows
+     * @return
+     */
+    public List<ArticleChannel> selectAllWithLimit(@Param(value = "companyId") String companyId, @Param(value = "branchId") String branchId,
+                                                   @Param(value = "articleState") List<String> articleState, @Param(value = "startRow") int startRow,
+                                                   @Param(value = "rows") int rows, @Param(value = "articelName") String articelName,
+                                                   @Param(value = "special") String special, @Param(value = "channel") String channel);
+
+    /**
+     * 根据文章id查文章修改路径
+     *
+     * @param articleId
+     * @return
+     */
+    String queryModifiedEditUrlByArticleId(String articleId);
+
+    /**
+     * 根据栏目查文章ID
+     *
+     * @param channel
+     * @return
+     */
+    List<Integer> queryArticleIdByChannel(@Param(value = "channel") String channel);
+
+    /**
+     * 根据文章id查文库关系
+     *
+     * @return
+     */
+    public List<ArticleChannel> queryByPublishId(String publishId);
+
+    /*
+     * 分页查询文库表信息
+     */
+    public List<HashMap<String, Object>> selectByLimit(HashMap<String, Object> map);
+
+    public List<HashMap<String, Object>> selectCountByParam(HashMap<String, Object> parMap);
+
+    /**
+     * 批量收录文章
+     *
+     * @param batchInsertArticle
+     * @return
+     */
+    public int batchInsertArticeChannel(@Param(value = "batchInsertArticle") List<ArticleChannel> batchInsertArticle);
+
+    public List<HashMap<String, Object>> selectByPublishList(@Param(value = "publishList") List<String> publishList);
+
+
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleForwardTrackMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleForwardTrackMapper.java
new file mode 100644
index 000000000..953b6677d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleForwardTrackMapper.java
@@ -0,0 +1,100 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticleForwardTrack;
+import com.ruoyi.content.domain.ArticleForwardTrackExample;
+import com.ruoyi.content.domain.ArticleForwardTrackKey;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticleForwardTrackMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    int countByExample(ArticleForwardTrackExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    int deleteByExample(ArticleForwardTrackExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    int deleteByPrimaryKey(ArticleForwardTrackKey key);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    int insert(ArticleForwardTrack record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    int insertSelective(ArticleForwardTrack record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    List<ArticleForwardTrack> selectByExample(ArticleForwardTrackExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    ArticleForwardTrack selectByPrimaryKey(ArticleForwardTrackKey key);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") ArticleForwardTrack record, @Param("example") ArticleForwardTrackExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    int updateByExample(@Param("record") ArticleForwardTrack record, @Param("example") ArticleForwardTrackExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    int updateByPrimaryKeySelective(ArticleForwardTrack record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_forward_track
+     *
+     * @mbggenerated Fri Jul 06 14:53:46 CST 2018
+     */
+    int updateByPrimaryKey(ArticleForwardTrack record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleInfoMapper.java
new file mode 100644
index 000000000..6282f5641
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleInfoMapper.java
@@ -0,0 +1,123 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticleInfo;
+import com.ruoyi.content.domain.ArticleInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticleInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    int countByExample(ArticleInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    int deleteByExample(ArticleInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    int deleteByPrimaryKey(Integer articleId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    int insert(ArticleInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    int insertSelective(ArticleInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    List<ArticleInfo> selectByExampleWithBLOBs(ArticleInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    List<ArticleInfo> selectByExample(ArticleInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    ArticleInfo selectByPrimaryKey(Integer articleId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") ArticleInfo record, @Param("example") ArticleInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    int updateByExampleWithBLOBs(@Param("record") ArticleInfo record, @Param("example") ArticleInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    int updateByExample(@Param("record") ArticleInfo record, @Param("example") ArticleInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    int updateByPrimaryKeySelective(ArticleInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    int updateByPrimaryKeyWithBLOBs(ArticleInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_info
+     *
+     * @mbggenerated Fri May 25 15:02:37 CST 2018
+     */
+    int updateByPrimaryKey(ArticleInfo record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleLabelMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleLabelMapper.java
new file mode 100644
index 000000000..b77d1ee4c
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleLabelMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticleLabel;
+import com.ruoyi.content.domain.ArticleLabelExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticleLabelMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    int countByExample(ArticleLabelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    int deleteByExample(ArticleLabelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    int deleteByPrimaryKey(Integer labelId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    int insert(ArticleLabel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    int insertSelective(ArticleLabel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    List<ArticleLabel> selectByExample(ArticleLabelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    ArticleLabel selectByPrimaryKey(Integer labelId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    int updateByExampleSelective(@Param("record") ArticleLabel record, @Param("example") ArticleLabelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    int updateByExample(@Param("record") ArticleLabel record, @Param("example") ArticleLabelExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKeySelective(ArticleLabel record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKey(ArticleLabel record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleLabelRelationshipMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleLabelRelationshipMapper.java
new file mode 100644
index 000000000..9d30347ab
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleLabelRelationshipMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticleLabelRelationship;
+import com.ruoyi.content.domain.ArticleLabelRelationshipExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticleLabelRelationshipMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    int countByExample(ArticleLabelRelationshipExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    int deleteByExample(ArticleLabelRelationshipExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    int insert(ArticleLabelRelationship record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    int insertSelective(ArticleLabelRelationship record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    List<ArticleLabelRelationship> selectByExample(ArticleLabelRelationshipExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    ArticleLabelRelationship selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    int updateByExampleSelective(@Param("record") ArticleLabelRelationship record, @Param("example") ArticleLabelRelationshipExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    int updateByExample(@Param("record") ArticleLabelRelationship record, @Param("example") ArticleLabelRelationshipExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKeySelective(ArticleLabelRelationship record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_label_relationship
+     *
+     * @mbggenerated
+     */
+    int updateByPrimaryKey(ArticleLabelRelationship record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePersonalConfigMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePersonalConfigMapper.java
new file mode 100644
index 000000000..17e14e23f
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePersonalConfigMapper.java
@@ -0,0 +1,100 @@
+package com.ruoyi.content.mapper;
+
+
+import com.ruoyi.content.domain.ArticlePersonalConfig;
+import com.ruoyi.content.domain.ArticlePersonalConfigExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticlePersonalConfigMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    int countByExample(ArticlePersonalConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    int deleteByExample(ArticlePersonalConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    int insert(ArticlePersonalConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    int insertSelective(ArticlePersonalConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    List<ArticlePersonalConfig> selectByExample(ArticlePersonalConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    ArticlePersonalConfig selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    int updateByExampleSelective(@Param("record") ArticlePersonalConfig record, @Param("example") ArticlePersonalConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    int updateByExample(@Param("record") ArticlePersonalConfig record, @Param("example") ArticlePersonalConfigExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    int updateByPrimaryKeySelective(ArticlePersonalConfig record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_personal_config
+     *
+     * @mbggenerated Wed May 20 09:55:58 CST 2020
+     */
+    int updateByPrimaryKey(ArticlePersonalConfig record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishSendMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishSendMapper.java
new file mode 100644
index 000000000..f5b4b164b
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishSendMapper.java
@@ -0,0 +1,100 @@
+package com.ruoyi.content.mapper;
+
+
+import com.ruoyi.content.domain.ArticlePublishSend;
+import com.ruoyi.content.domain.ArticlePublishSendExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticlePublishSendMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    int countByExample(ArticlePublishSendExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    int deleteByExample(ArticlePublishSendExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    int insert(ArticlePublishSend record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    int insertSelective(ArticlePublishSend record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    List<ArticlePublishSend> selectByExample(ArticlePublishSendExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    ArticlePublishSend selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    int updateByExampleSelective(@Param("record") ArticlePublishSend record, @Param("example") ArticlePublishSendExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    int updateByExample(@Param("record") ArticlePublishSend record, @Param("example") ArticlePublishSendExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    int updateByPrimaryKeySelective(ArticlePublishSend record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_send
+     *
+     * @mbggenerated Thu Jun 04 15:03:08 CST 2020
+     */
+    int updateByPrimaryKey(ArticlePublishSend record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishTrackMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishTrackMapper.java
new file mode 100644
index 000000000..073fff2a7
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishTrackMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticlePublishTrack;
+import com.ruoyi.content.domain.ArticlePublishTrackExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticlePublishTrackMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    int countByExample(ArticlePublishTrackExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    int deleteByExample(ArticlePublishTrackExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    int deleteByPrimaryKey(String publishId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    int insert(ArticlePublishTrack record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    int insertSelective(ArticlePublishTrack record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    List<ArticlePublishTrack> selectByExample(ArticlePublishTrackExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    ArticlePublishTrack selectByPrimaryKey(String publishId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") ArticlePublishTrack record, @Param("example") ArticlePublishTrackExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    int updateByExample(@Param("record") ArticlePublishTrack record, @Param("example") ArticlePublishTrackExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    int updateByPrimaryKeySelective(ArticlePublishTrack record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_publish_track
+     *
+     * @mbggenerated Fri Jul 27 10:31:00 CST 2018
+     */
+    int updateByPrimaryKey(ArticlePublishTrack record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishTrackQueryMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishTrackQueryMapper.java
new file mode 100644
index 000000000..de275e661
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticlePublishTrackQueryMapper.java
@@ -0,0 +1,46 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticlePublishTrack;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticlePublishTrackQueryMapper {
+
+    /**
+     * @return
+     */
+    ArticlePublishTrack queryEditUrlByArticleId(String articleId, String puhlishId);
+
+    /**
+     * 根据文章id查询发布该文章的所有业务员信息
+     *
+     * @param articleId
+     * @return
+     */
+    List<ArticlePublishTrack> queryPublishUserInfo(@Param(value = "articleId") String articleId,
+                                                   @Param(value = "startRow") int startRow, @Param(value = "rows") int rows);
+
+    List<ArticlePublishTrack> queryArticleIdByUserId(@Param(value = "userId") List<String> userId,
+                                                     @Param(value = "startRow") int startRow, @Param(value = "rows") int rows);
+
+    int countArticleIdByUserId(@Param(value = "userId") List<String> userId);
+
+    /**
+     * 根据publishid查询发布表记录
+     *
+     * @param publishId
+     * @return
+     */
+    ArticlePublishTrack queryByPublishId(@Param(value = "publishId") String publishId);
+
+    /**
+     * 查询文章列表的文章信息
+     *
+     * @param articleId
+     * @return
+     */
+    List<ArticlePublishTrack> queryArticleinfo(@Param(value = "articleId") String articleId);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java
new file mode 100644
index 000000000..2df1fce5e
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java
@@ -0,0 +1,53 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.*;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface ArticleQueryMapper {
+
+    //List<PublishedArticleInfo> queryAllPublishedArticles(@Param("userId")String userId);
+
+    List<ArticeClickInfo> queryPublishedDetails(@Param("userId") String userId, @Param("articleId") String articleId);
+
+    PublishedArticleInfo queryPublishedById(@Param("userId") String userId, @Param("articleId") String articleId);
+
+    //	int queryArticleByUrl(@Param("companyId")String companyId,@Param("originalUrl") String originalUrl);
+    int queryArticleByUrl(@Param("originalUrl") String originalUrl);
+
+    int updatePublishedArticle(Map<String, String> articleMap);
+
+    public List<PublishedArticleInfo> selectAllWithLimit(@Param(value = "companyId") String companyId,
+                                                         @Param(value = "articleState") List<String> articleState, @Param(value = "startRow") int startRow,
+                                                         @Param(value = "rows") int rows, @Param(value = "articelName") String articelName,
+                                                         @Param(value = "articelAuthor") String articelAuthor, @Param(value = "special") String special, @Param(value = "channelId") String channelId);
+
+    ArticleInfo queryArticleInfoByCompanyId(@Param("companyId") String companyId, @Param("originalUrl") String originalUrl);
+
+    List<AdvertisementInfo> queryAdByCompanyId(@Param(value = "companyId") String companyId);
+
+    /**
+     * @param valueOf
+     * @return
+     */
+    ArticleInfo queryModifiedEditUrlByArticleId(Integer valueOf);
+
+    CompanyArticleInfo queryCompanyArticleById(@Param("publishId") String publishId, @Param("articleId") String articleId);
+
+    /**
+     * 根据文章主键集合查询文章对应的所有标签集合
+     *
+     * @param articelId
+     * @return
+     */
+    List<ArticleLabelRelDTO> findArticleLabelRelByArticleIds(@Param(value = "articelId") List<String> articelId);
+
+    List<ArticlePublishSend> noSendPublishArticle(HashMap<String, Object> paramMap);
+
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleSendUrlMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleSendUrlMapper.java
new file mode 100644
index 000000000..0948c2c9b
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleSendUrlMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ArticleSendUrl;
+import com.ruoyi.content.domain.ArticleSendUrlExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ArticleSendUrlMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    int countByExample(ArticleSendUrlExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    int deleteByExample(ArticleSendUrlExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    int deleteByPrimaryKey(String publishId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    int insert(ArticleSendUrl record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    int insertSelective(ArticleSendUrl record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    List<ArticleSendUrl> selectByExample(ArticleSendUrlExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    ArticleSendUrl selectByPrimaryKey(String publishId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") ArticleSendUrl record, @Param("example") ArticleSendUrlExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    int updateByExample(@Param("record") ArticleSendUrl record, @Param("example") ArticleSendUrlExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    int updateByPrimaryKeySelective(ArticleSendUrl record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table article_send_url
+     *
+     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
+     */
+    int updateByPrimaryKey(ArticleSendUrl record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AttachmentInfoExMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AttachmentInfoExMapper.java
new file mode 100644
index 000000000..4ddf89377
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AttachmentInfoExMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.AttachmentInfo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 说明：根据附件的对应id和type查询某个课程下的所有附件进行分页查询
+ */
+@Repository
+public interface AttachmentInfoExMapper {
+    public List<AttachmentInfo> selectAllWithLimit(@Param(value = "courseId") String courseId, @Param(value = "courseType") String courseType,
+                                                   @Param(value = "startRow") int startRow, @Param(value = "rows") int rows);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AttachmentInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AttachmentInfoMapper.java
new file mode 100644
index 000000000..71f8b664c
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AttachmentInfoMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.AttachmentInfo;
+import com.ruoyi.content.domain.AttachmentInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface AttachmentInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int countByExample(AttachmentInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int deleteByExample(AttachmentInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int deleteByPrimaryKey(Integer fileId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int insert(AttachmentInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int insertSelective(AttachmentInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    List<AttachmentInfo> selectByExample(AttachmentInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    AttachmentInfo selectByPrimaryKey(Integer fileId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") AttachmentInfo record, @Param("example") AttachmentInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByExample(@Param("record") AttachmentInfo record, @Param("example") AttachmentInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByPrimaryKeySelective(AttachmentInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table attachment_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByPrimaryKey(AttachmentInfo record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AuthorityFindfExMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AuthorityFindfExMapper.java
new file mode 100644
index 000000000..1e82b9221
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/AuthorityFindfExMapper.java
@@ -0,0 +1,25 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.AuthorityExDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface AuthorityFindfExMapper {
+
+    int batchDdeleteOperatorInfo(@Param("array") String[] array);
+
+    /**
+     * 根据用户查询菜单
+     *
+     * @param userLog
+     * @return
+     */
+    public List<AuthorityExDto> findAuthorityEx(@Param(value = "userLog") String userLog);
+
+    public int insertOPeratorPath(@Param("array") String[] array, @Param(value = "email") String email,
+                                  @Param(value = "createUser") String createUser, @Param(value = "creaetDate") String createDate,
+                                  @Param(value = "createTime") String createTime);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
new file mode 100644
index 000000000..0aca77d98
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
@@ -0,0 +1,25 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.BaseCode;
+import com.ruoyi.content.domain.BaseCodeTree;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.HashMap;
+import java.util.List;
+
+@Repository
+public interface BaseCodeExMapper {
+    public List<BaseCode> selectAllWithLimit(@Param(value = "companyId") String companyId, @Param(value = "branchId") String branchId, @Param(value = "codeType") String codeType,
+                                             @Param(value = "codeCname") String codeCname, @Param(value = "orderNo") String orderNo, @Param(value = "startRow") int startRow,
+                                             @Param(value = "rows") int rows);
+
+    /**
+     * 查询栏目树
+     *
+     * @param parMap
+     * @return
+     */
+    public List<BaseCodeTree> columnTree(HashMap<String, String> parMap);
+
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CardInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CardInfoMapper.java
new file mode 100644
index 000000000..6747e95e9
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CardInfoMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.CardInfo;
+import com.ruoyi.content.domain.CardInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CardInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int countByExample(CardInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int deleteByExample(CardInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int deleteByPrimaryKey(Integer cardId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int insert(CardInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int insertSelective(CardInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    List<CardInfo> selectByExample(CardInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    CardInfo selectByPrimaryKey(Integer cardId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") CardInfo record, @Param("example") CardInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByExample(@Param("record") CardInfo record, @Param("example") CardInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByPrimaryKeySelective(CardInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table card_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByPrimaryKey(CardInfo record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ChannelInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ChannelInfoMapper.java
new file mode 100644
index 000000000..333dcd7b1
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ChannelInfoMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ChannelInfo;
+import com.ruoyi.content.domain.ChannelInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ChannelInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int countByExample(ChannelInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int deleteByExample(ChannelInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int deleteByPrimaryKey(Integer channelId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int insert(ChannelInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int insertSelective(ChannelInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    List<ChannelInfo> selectByExample(ChannelInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    ChannelInfo selectByPrimaryKey(Integer channelId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") ChannelInfo record, @Param("example") ChannelInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByExample(@Param("record") ChannelInfo record, @Param("example") ChannelInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByPrimaryKeySelective(ChannelInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table channel_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByPrimaryKey(ChannelInfo record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ClickTrackInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ClickTrackInfoMapper.java
new file mode 100644
index 000000000..01b8f7b62
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ClickTrackInfoMapper.java
@@ -0,0 +1,123 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ClickTrackInfo;
+import com.ruoyi.content.domain.ClickTrackInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ClickTrackInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    int countByExample(ClickTrackInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    int deleteByExample(ClickTrackInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    int deleteByPrimaryKey(String clickId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    int insert(ClickTrackInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    int insertSelective(ClickTrackInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    List<ClickTrackInfo> selectByExampleWithBLOBs(ClickTrackInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    List<ClickTrackInfo> selectByExample(ClickTrackInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    ClickTrackInfo selectByPrimaryKey(String clickId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") ClickTrackInfo record, @Param("example") ClickTrackInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    int updateByExampleWithBLOBs(@Param("record") ClickTrackInfo record, @Param("example") ClickTrackInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    int updateByExample(@Param("record") ClickTrackInfo record, @Param("example") ClickTrackInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    int updateByPrimaryKeySelective(ClickTrackInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    int updateByPrimaryKeyWithBLOBs(ClickTrackInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table click_track_info
+     *
+     * @mbggenerated Wed Jun 20 16:32:59 CST 2018
+     */
+    int updateByPrimaryKey(ClickTrackInfo record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ClickTrackInfoQueryMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ClickTrackInfoQueryMapper.java
new file mode 100644
index 000000000..e000e145f
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ClickTrackInfoQueryMapper.java
@@ -0,0 +1,15 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.ClickTrackInfo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ClickTrackInfoQueryMapper {
+
+    List<ClickTrackInfo> queryClickInfoByUserId(@Param(value = "userId") String userId, @Param(value = "articleId") String articleId, @Param(value = "startRow") int startRow,
+                                                @Param(value = "rows") int rows);
+
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsRoleAuthorityMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsRoleAuthorityMapper.java
new file mode 100644
index 000000000..3d8d2fded
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsRoleAuthorityMapper.java
@@ -0,0 +1,68 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.CmsRoleAuthority;
+import com.ruoyi.content.domain.CmsRoleAuthorityExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CmsRoleAuthorityMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int countByExample(CmsRoleAuthorityExample
+                               example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int deleteByExample(CmsRoleAuthorityExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int insert(CmsRoleAuthority record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int insertSelective(CmsRoleAuthority record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    List<CmsRoleAuthority> selectByExample(CmsRoleAuthorityExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int updateByExampleSelective(@Param("record") CmsRoleAuthority record, @Param("example") CmsRoleAuthorityExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_role_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int updateByExample(@Param("record") CmsRoleAuthority record, @Param("example") CmsRoleAuthorityExample example);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysAuthorityExMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysAuthorityExMapper.java
new file mode 100644
index 000000000..0b033a24d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysAuthorityExMapper.java
@@ -0,0 +1,25 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.CmsSysAuthority;
+import com.ruoyi.content.domain.CmsSysRoleAuthorDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CmsSysAuthorityExMapper {
+
+    /**
+     * 分页查询
+     */
+    public List<CmsSysAuthority> selectAllMenuWithLimit(@Param(value = "startRow") int startRow,
+                                                        @Param(value = "rows") int rows, @Param(value = "createUser") String createUser,
+                                                        @Param(value = "id") String id, @Param(value = "level") String level,
+                                                        @Param(value = "type") String type, @Param(value = "operatorRoleName") String operatorRoleName);
+
+    public List<CmsSysRoleAuthorDto> selectAllRoleMenuWithLimit(@Param(value = "startRow") int startRow,
+                                                                @Param(value = "rows") int rows, @Param(value = "createUser") String createUser,
+                                                                @Param(value = "id") String id, @Param(value = "level") String level, @Param(value = "type") String type,
+                                                                @Param(value = "operatorRoleName") String operatorRoleName, @Param(value = "role") String role);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysAuthorityMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysAuthorityMapper.java
new file mode 100644
index 000000000..699589c67
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysAuthorityMapper.java
@@ -0,0 +1,101 @@
+package com.ruoyi.content.mapper;
+
+
+import com.ruoyi.content.domain.CmsSysAuthority;
+import com.ruoyi.content.domain.CmsSysAuthorityExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CmsSysAuthorityMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int countByExample(CmsSysAuthorityExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int deleteByExample(CmsSysAuthorityExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int deleteByPrimaryKey(Integer num);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int insert(CmsSysAuthority record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int insertSelective(CmsSysAuthority record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    List<CmsSysAuthority> selectByExample(CmsSysAuthorityExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    CmsSysAuthority selectByPrimaryKey(Integer num);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int updateByExampleSelective(@Param("record") CmsSysAuthority record, @Param("example") CmsSysAuthorityExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int updateByExample(@Param("record") CmsSysAuthority record, @Param("example") CmsSysAuthorityExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int updateByPrimaryKeySelective(CmsSysAuthority record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_authority
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int updateByPrimaryKey(CmsSysAuthority record);
+
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysRoleExMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysRoleExMapper.java
new file mode 100644
index 000000000..26af623f9
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysRoleExMapper.java
@@ -0,0 +1,21 @@
+package com.ruoyi.content.mapper;
+
+
+import com.ruoyi.content.domain.CmsSysRole;
+import com.ruoyi.content.domain.CmsUSerSysRoleDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CmsSysRoleExMapper {
+    /**
+     * 分页查所有
+     */
+    List<CmsSysRole> selectByPage(@Param(value = "startRow") int startRow, @Param(value = "rows") int rows,
+                                  @Param(value = "createUser") String createUser, @Param(value = "name") String name);
+
+    List<CmsUSerSysRoleDto> selectuserRoleByPage(@Param(value = "startRow") int startRow, @Param(value = "rows") int rows,
+                                                 @Param(value = "createUser") String createUser, @Param(value = "name") String name, @Param(value = "email") String email);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysRoleMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysRoleMapper.java
new file mode 100644
index 000000000..6a76a2bab
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysRoleMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.CmsSysRole;
+import com.ruoyi.content.domain.CmsSysRoleExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CmsSysRoleMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int countByExample(CmsSysRoleExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int deleteByExample(CmsSysRoleExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int insert(CmsSysRole record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int insertSelective(CmsSysRole record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    List<CmsSysRole> selectByExample(CmsSysRoleExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    CmsSysRole selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int updateByExampleSelective(@Param("record") CmsSysRole record, @Param("example") CmsSysRoleExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int updateByExample(@Param("record") CmsSysRole record, @Param("example") CmsSysRoleExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int updateByPrimaryKeySelective(CmsSysRole record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_role
+     *
+     * @mbggenerated Thu Aug 17 17:24:12 CST 2017
+     */
+    int updateByPrimaryKey(CmsSysRole record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysUserExMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysUserExMapper.java
new file mode 100644
index 000000000..3677277b8
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysUserExMapper.java
@@ -0,0 +1,35 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.CmsSysUser;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * 系统用户的分页查询
+ *
+ * @author ZMN
+ */
+@Repository
+public interface CmsSysUserExMapper {
+    /**
+     * 分页查所有
+     */
+//    List<CmsSysUser> selectByPage(@Param(value = "startRow") int startRow,@Param(value = "rows") int rows,
+//    		@Param(value = "createUser") String createUser,@Param(value = "emial") String emial,
+//    		@Param(value = "phone") String phone,@Param(value = "name") String name,
+//    		@Param(value = "companyId") String companyId);
+    List<CmsSysUser> selectByPage(@Param(value = "startRow") int startRow, @Param(value = "rows") int rows,
+                                  @Param(value = "email") String email,
+                                  @Param(value = "phone") String phone, @Param(value = "name") String name,
+                                  @Param(value = "companyId") String companyId);
+
+    /**
+     * 根据登录账号查询登录信息
+     *
+     * @param email
+     * @return
+     */
+    CmsSysUser queryLoginInfoByEmail(@Param(value = "email") String email);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysUserMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysUserMapper.java
new file mode 100644
index 000000000..8c5eccd37
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsSysUserMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.CmsSysUser;
+import com.ruoyi.content.domain.CmsSysUserExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CmsSysUserMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    int countByExample(CmsSysUserExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    int deleteByExample(CmsSysUserExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    int deleteByPrimaryKey(String email);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    int insert(CmsSysUser record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    int insertSelective(CmsSysUser record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    List<CmsSysUser> selectByExample(CmsSysUserExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    CmsSysUser selectByPrimaryKey(String email);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") CmsSysUser record, @Param("example") CmsSysUserExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    int updateByExample(@Param("record") CmsSysUser record, @Param("example") CmsSysUserExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    int updateByPrimaryKeySelective(CmsSysUser record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_sys_user
+     *
+     * @mbggenerated Tue Aug 28 09:28:51 CST 2018
+     */
+    int updateByPrimaryKey(CmsSysUser record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsUserRoleMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsUserRoleMapper.java
new file mode 100644
index 000000000..d62a907bb
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CmsUserRoleMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.CmsUserRole;
+import com.ruoyi.content.domain.CmsUserRoleExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CmsUserRoleMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    int countByExample(CmsUserRoleExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    int deleteByExample(CmsUserRoleExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    int insert(CmsUserRole record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    int insertSelective(CmsUserRole record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    List<CmsUserRole> selectByExample(CmsUserRoleExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    CmsUserRole selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    int updateByExampleSelective(@Param("record") CmsUserRole record, @Param("example") CmsUserRoleExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    int updateByExample(@Param("record") CmsUserRole record, @Param("example") CmsUserRoleExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    int updateByPrimaryKeySelective(CmsUserRole record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table cms_user_role
+     *
+     * @mbggenerated Fri Aug 18 13:38:42 CST 2017
+     */
+    int updateByPrimaryKey(CmsUserRole record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CompanyInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CompanyInfoMapper.java
new file mode 100644
index 000000000..298c04ef0
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/CompanyInfoMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.CompanyInfo;
+import com.ruoyi.content.domain.CompanyInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface CompanyInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int countByExample(CompanyInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int deleteByExample(CompanyInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int deleteByPrimaryKey(Integer companyId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int insert(CompanyInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int insertSelective(CompanyInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    List<CompanyInfo> selectByExample(CompanyInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    CompanyInfo selectByPrimaryKey(Integer companyId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") CompanyInfo record, @Param("example") CompanyInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByExample(@Param("record") CompanyInfo record, @Param("example") CompanyInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByPrimaryKeySelective(CompanyInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table company_info
+     *
+     * @mbggenerated Mon Mar 26 15:46:22 CST 2018
+     */
+    int updateByPrimaryKey(CompanyInfo record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComMapper.java
new file mode 100644
index 000000000..11073cdc1
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.LdCom;
+import com.ruoyi.content.domain.LdComExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface LdComMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    int countByExample(LdComExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    int deleteByExample(LdComExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    int deleteByPrimaryKey(String comcode);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    int insert(LdCom record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    int insertSelective(LdCom record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    List<LdCom> selectByExample(LdComExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    LdCom selectByPrimaryKey(String comcode);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") LdCom record, @Param("example") LdComExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    int updateByExample(@Param("record") LdCom record, @Param("example") LdComExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    int updateByPrimaryKeySelective(LdCom record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom
+     *
+     * @mbggenerated Tue Jul 24 14:14:03 CST 2018
+     */
+    int updateByPrimaryKey(LdCom record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComPartyMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComPartyMapper.java
new file mode 100644
index 000000000..0193b2c1e
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComPartyMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.LdComParty;
+import com.ruoyi.content.domain.LdComPartyExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface LdComPartyMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    int countByExample(LdComPartyExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    int deleteByExample(LdComPartyExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    int deleteByPrimaryKey(String partyId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    int insert(LdComParty record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    int insertSelective(LdComParty record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    List<LdComParty> selectByExample(LdComPartyExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    LdComParty selectByPrimaryKey(String partyId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") LdComParty record, @Param("example") LdComPartyExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    int updateByExample(@Param("record") LdComParty record, @Param("example") LdComPartyExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    int updateByPrimaryKeySelective(LdComParty record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table ldcom_party
+     *
+     * @mbggenerated Tue Sep 25 15:09:32 CST 2018
+     */
+    int updateByPrimaryKey(LdComParty record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComQueryMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComQueryMapper.java
new file mode 100644
index 000000000..1f288825f
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/LdComQueryMapper.java
@@ -0,0 +1,14 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.LdCom;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface LdComQueryMapper {
+
+    List<LdCom> queryAll();
+
+
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/PicAdInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/PicAdInfoMapper.java
new file mode 100644
index 000000000..d27c160b4
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/PicAdInfoMapper.java
@@ -0,0 +1,99 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.PicAdInfo;
+import com.ruoyi.content.domain.PicAdInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PicAdInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    int countByExample(PicAdInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    int deleteByExample(PicAdInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    int deleteByPrimaryKey(Integer picAdId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    int insert(PicAdInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    int insertSelective(PicAdInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    List<PicAdInfo> selectByExample(PicAdInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    PicAdInfo selectByPrimaryKey(Integer picAdId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") PicAdInfo record, @Param("example") PicAdInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    int updateByExample(@Param("record") PicAdInfo record, @Param("example") PicAdInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    int updateByPrimaryKeySelective(PicAdInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table pic_ad_info
+     *
+     * @mbggenerated Tue Jun 12 09:41:05 CST 2018
+     */
+    int updateByPrimaryKey(PicAdInfo record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/PicAdQueryMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/PicAdQueryMapper.java
new file mode 100644
index 000000000..13a890df8
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/PicAdQueryMapper.java
@@ -0,0 +1,14 @@
+package com.ruoyi.content.mapper;
+
+import com.ruoyi.content.domain.PicAdInfo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PicAdQueryMapper {
+
+    List<PicAdInfo> selectAllWithLimit(@Param(value = "companyId") String companyId, @Param(value = "picAdTitle") String picAdTitle,
+                                       @Param(value = "startRow") int startRow, @Param(value = "rows") int rows);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/UserInfoMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/UserInfoMapper.java
new file mode 100644
index 000000000..5c126a66d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/UserInfoMapper.java
@@ -0,0 +1,104 @@
+package com.ruoyi.content.mapper;
+
+
+import com.ruoyi.content.domain.UserInfo;
+import com.ruoyi.content.domain.UserInfoExample;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface UserInfoMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Apr 03 16:25:50 CST 2018
+     */
+    int countByExample(UserInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Apr 03 16:25:50 CST 2018
+     */
+    int deleteByExample(UserInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Apr 03 16:25:50 CST 2018
+     */
+    int deleteByPrimaryKey(Integer userId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Apr 03 16:25:50 CST 2018
+     */
+    int insert(UserInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Apr 03 16:25:50 CST 2018
+     */
+    int insertSelective(UserInfo record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Apr 03 16:25:50 CST 2018
+     */
+    List<UserInfo> selectByExample(UserInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Apr 03 16:25:50 CST 2018
+     */
+    UserInfo selectByPrimaryKey(Integer userId);
+
+//    UserInfo selectByOpenId(String openId);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Apr 03 16:25:50 CST 2018
+     */
+    int updateByExampleSelective(@Param("record") UserInfo record, @Param("example") UserInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Apr 03 16:25:50 CST 2018
+     */
+    int updateByExample(@Param("record") UserInfo record, @Param("example") UserInfoExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Apr 03 16:25:50 CST 2018
+     */
+    int updateByPrimaryKeySelective(UserInfo record);
+
+//    int updateByOpenId(UserInfo userInfo);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table user_info
+     *
+     * @mbggenerated Tue Apr 03 16:25:50 CST 2018
+     */
+    int updateByPrimaryKey(UserInfo record);
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleLabelService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleLabelService.java
new file mode 100644
index 000000000..a4ad85dc8
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleLabelService.java
@@ -0,0 +1,58 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.ArticleLabel;
+import com.ruoyi.content.message.Message;
+
+import java.util.List;
+
+/**
+ * 标签业务层
+ */
+public interface ArticleLabelService {
+    /**
+     * 查询出所有标签
+     *
+     * @return
+     */
+    public List<ArticleLabel> queryLabel();
+
+    /**
+     * 根据公司id查询标签
+     *
+     * @return
+     */
+    public List<ArticleLabel> queryLabelOss(String companyId);
+
+    /**
+     * 添加文章标签关系
+     *
+     * @return
+     */
+    public Message addlabel(String articleId, String labelIds);
+
+    /**
+     * 新增标签
+     *
+     * @param labelName
+     * @return
+     */
+    public Message saveLabel(String labelName);
+
+    /**
+     * 修改标签
+     *
+     * @param labelId
+     * @param labelName
+     * @return
+     */
+    public Message updateLabel(Integer labelId, String labelName);
+
+    /**
+     * 删除标签信息
+     *
+     * @param labelId
+     * @return
+     */
+    public Message deleteLabel(Integer labelId);
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java
new file mode 100644
index 000000000..df5359f87
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java
@@ -0,0 +1,187 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.ArticleInfo;
+import com.ruoyi.content.domain.PageDTO;
+import com.ruoyi.content.domain.PublishedArticleInfo;
+import com.ruoyi.content.message.Message;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文章处理业务层
+ *
+ * @author root
+ */
+public interface ArticleService {
+
+    /**
+     * 根据文章连接获取文章内容
+     *
+     * @return
+     */
+    Message getArticleContentByUrl(String originalUrl, String createUser, String author, String ids,
+                                   String isAuthorization, String isReserve, String automaticName, String introduction, String labelIds,
+                                   String isJoinActive);
+
+    /**
+     * 个人编辑文章
+     *
+     * @param createUser
+     * @param author
+     * @param ids
+     * @param isAuthorization
+     * @param isReserve
+     * @param automaticName
+     * @param introduction
+     * @param labelIds
+     * @param isJoinActive
+     * @param articleName
+     * @param shareImgUrl
+     * @param shareDes
+     * @param articleContent
+     * @return
+     */
+    public Message getArticleContent(String createUser, String author, String ids, String isAuthorization,
+                                     String isReserve, String automaticName, String introduction, String labelIds, String isJoinActive,
+                                     String articleName, String shareImgUrl, String shareDes, String articleContent);
+
+    /**
+     * 保存个人已经发布过的文章
+     */
+    Message savePulishedArticle(Map<String, Object> requestMap);
+
+    /**
+     * 更新文章信息
+     *
+     * @param articleInfo
+     * @return
+     * @throws Exception
+     */
+    Message articleUpByArticleId(ArticleInfo articleInfo) throws Exception;
+
+    /**
+     * 根据id查询文章信息
+     *
+     * @return
+     */
+    public ArticleInfo queryArticleByArticleId(String articleId);
+
+    /**
+     * 浏览详情查询
+     */
+    Message queryPublishedDetails(String userId, String articleId);
+
+    /**
+     * 根据id删除文章
+     *
+     * @param id
+     * @return
+     */
+    Message delArticle(String id);
+
+    /**
+     * 查询当前用户发布的文章
+     *
+     * @return
+     */
+    public List<PublishedArticleInfo> queryArticle(int startRow, int rows, String articelName, String articelAuthor,
+                                                   String special, String articelType, String articleState) throws Exception;
+
+    /**
+     * 根据状态查询当前用户所有发布过的文章
+     *
+     * @return
+     */
+    public int countArticleInfoByState(String articelName, String articelAuthor, String special, String channelId,
+                                       String articleState);
+
+    /**
+     * 根据原始url爬取文章
+     *
+     * @param originalUrl
+     * @param author
+     * @param ids
+     * @return
+     */
+    Message getArticleContent(String originalUrl, String author, String ids);
+
+    /**
+     * 生成静态页面路径
+     *
+     * @param articleId
+     * @param shareTitle
+     * @param shareImgUrl
+     * @param shareDes
+     * @param articleContent
+     * @param ids
+     * @return
+     */
+    Message getHtmlUrl(Integer articleId, String shareTitle, String shareImgUrl, String shareDes, String articleContent,
+                       String ids, String publishId, String companyId, String isAuthorization, String isReserve,
+                       String automaticName, String introduction, String isJoinActives);
+
+    /**
+     * 检查是否有工号
+     *
+     * @param articleId
+     * @param articleName
+     * @param listPicUrl
+     * @param ids
+     * @param publishId
+     * @param companyId
+     * @param jobNumber
+     * @param userId
+     * @param createUser
+     * @return
+     */
+    void checkJobNumber(Integer articleId, String articleName, String listPicUrl, String ids, String publishId,
+                        String companyId, String jobNumber, String userId, String createUser, String editUrl, String viewUrl,
+                        String versionNumber);
+
+    /**
+     * 查询分公司文章列表
+     *
+     * @param companyId
+     * @param branchId
+     * @param startRow
+     * @param rows
+     * @return
+     */
+    PageDTO queryBranchIdArticle(String companyId, String branchId, Integer startRow, Integer rows);
+
+    /**
+     * 文章列表的删除功能
+     *
+     * @param id
+     * @return
+     */
+    Message delArticleInfo(String id);
+
+    Message articleUrlCopy(String articleId, String userId, String publishId1);
+
+    Message delHTML(String ids);
+
+    /**
+     * 2020-04-16 新需求 编辑按钮 逻辑变为替换原HTML
+     *
+     * @param articleId
+     * @param shareTitle
+     * @param shareImgUrl
+     * @param shareDes
+     * @param articleContent
+     * @param ids
+     * @param publishId
+     * @param companyId
+     * @param isAuthorization
+     * @param isReserve
+     * @param automaticName
+     * @param introduction
+     * @param isJoinActive
+     * @return
+     */
+    Message getHtmlUrl2(Integer articleId, String shareTitle, String shareImgUrl, String shareDes,
+                        String articleContent, String ids, String publishId, String companyId, String isAuthorization,
+                        String isReserve, String automaticName, String introduction, String isJoinActive);
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
new file mode 100644
index 000000000..19bfac610
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
@@ -0,0 +1,103 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.BaseCode;
+import com.ruoyi.content.domain.BaseCodeTree;
+import com.ruoyi.content.message.Message;
+
+import java.util.List;
+
+/**
+ * 说明：基础数据查询
+ *
+ * @author wang.q
+ * @date 2017年8月25日
+ */
+public interface BaseCodeService {
+    /**
+     * 根据代码类型查找数据字典项
+     *
+     * @param codeType 代码类型
+     * @return
+     */
+    public List<BaseCode> queryBaseCodeByType(String codeType);
+
+    /**
+     * 添加基础数据
+     *
+     * @param baseCode
+     * @return
+     */
+    public Message saveBaseCode(BaseCode baseCode);
+
+    /**
+     * 更新基础数据
+     *
+     * @param baseCode
+     * @return
+     */
+    public Message updateBaseCode(BaseCode baseCode);
+
+    /**
+     * 根据id查询基本数据
+     *
+     * @return
+     */
+    public Message queryBaseCode(String ids);
+
+    /**
+     * 条件查询基础数据
+     *
+     * @param startRow
+     * @param rows
+     * @param codeType
+     * @param codeCname
+     * @param codeCode
+     * @return
+     */
+    public List<BaseCode> queryBaseCode(int startRow, int rows, String codeType, String codeCname, String codeCode);
+
+    /**
+     * 统计条件下有多少数据
+     *
+     * @param codeType
+     * @param codeCname
+     * @param codeCode
+     * @return
+     */
+    public int countBaseCode(String codeType, String codeCname, String codeCode);
+
+    /**
+     * 查询栏目信息
+     *
+     * @param
+     * @return
+     */
+    public List<BaseCode> queryColumn();
+
+    /**
+     * 删除栏目
+     *
+     * @param ids
+     * @return
+     */
+    Message delBaseCode(String ids);
+
+    /**
+     * 查询栏目树
+     *
+     * @param codeCode
+     * @return
+     */
+    public List<BaseCodeTree> columnTree(String codeCode);
+
+    /**
+     * 操作栏目排序
+     *
+     * @param columnId
+     * @param operateType
+     * @return
+     */
+    public Message operateColumn(String columnId, String operateType);
+
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsRoleAuthorityService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsRoleAuthorityService.java
new file mode 100644
index 000000000..7b30e7deb
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsRoleAuthorityService.java
@@ -0,0 +1,37 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.message.Message;
+
+import java.util.List;
+
+/**
+ * 说明：系统用户权限
+ *
+ * @author wang.q
+ * @date 2017年8月15日
+ */
+public interface CmsRoleAuthorityService {
+    /**
+     * 查询当前用户的
+     *
+     * @return
+     */
+    public List<?> queryUserRole();
+
+
+    /**
+     * 添加系统用户权限
+     */
+    public Message insertRoleAuthority(String selfChild, String parentChild);
+
+    /**
+     * 删除或者添加之前先查询当前对应关系是否存在
+     */
+    public List<?> queryRoleAuthority(String selfChild, String parentChild);
+
+    /**
+     * 删除对应关系
+     */
+    public Message delRoleAuthority(String selfChild, String parentChild);
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsRoleService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsRoleService.java
new file mode 100644
index 000000000..493b029ae
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsRoleService.java
@@ -0,0 +1,43 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.CmsSysRole;
+import com.ruoyi.content.message.Message;
+
+import java.util.List;
+
+/**
+ * 说明：系统角色
+ */
+public interface CmsRoleService {
+
+    /**
+     * 添加新角色
+     */
+    public Message insertRole(CmsSysRole role);
+
+    /**
+     * 删除角色
+     */
+    public Message delRole(String id);
+
+    /**
+     * 修改角色信息
+     */
+    public Message updateRole(CmsSysRole role);
+
+    /**
+     * 查询所有的角色,分页展示
+     */
+    public List<?> queryRole(int startRow, int rows, String name, String email);
+
+    /**
+     * 查询单个角色
+     */
+    public CmsSysRole queryRoleById(String id);
+
+    /**
+     * 查询角色数量
+     */
+    public int countRole(String name);
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsSysAuthorityService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsSysAuthorityService.java
new file mode 100644
index 000000000..86be00aa3
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsSysAuthorityService.java
@@ -0,0 +1,76 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.CmsSysAuthority;
+import com.ruoyi.content.message.Message;
+
+import java.util.List;
+
+/**
+ * 说明：系统菜单管理
+ *
+ * @author wang.q
+ * @date 2017年9月15日
+ */
+public interface CmsSysAuthorityService {
+    /**
+     * 添加菜单
+     *
+     * @param authority
+     * @return
+     */
+    public Message addMenu(CmsSysAuthority authority);
+
+    /**
+     * 修改菜单
+     *
+     * @param authority
+     * @return
+     */
+    public Message upMenu(CmsSysAuthority authority);
+
+    /**
+     * 根据num删除菜单以及下级菜单
+     *
+     * @return
+     */
+    public Message delMenu(String nums);
+
+    /**
+     * 根据id查询下级菜单
+     *
+     * @param id
+     * @return
+     */
+    public Message queryAuthoryById(String id);
+
+    /**
+     * 查询所有菜单集合
+     *
+     * @param startRow
+     * @param rows
+     * @return
+     */
+    public Message queryMenuList(int startRow, int rows, String id, String level, String type, String operatorRoleName);
+
+    /**
+     * 查询角色已有权限
+     *
+     * @param startRow
+     * @param rows
+     * @param id
+     * @param level
+     * @param type
+     * @param operatorRoleName
+     * @return
+     */
+    public Message queryRoleMenuList(int startRow, int rows, String id, String level, String type,
+                                     String operatorRoleName, String role);
+
+    /**
+     * 查询所有菜单集合
+     *
+     * @return
+     */
+    public List<CmsSysAuthority> authorityList(String id, String level, String type, String operatorRoleName);
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsUserRoleService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsUserRoleService.java
new file mode 100644
index 000000000..251897e62
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsUserRoleService.java
@@ -0,0 +1,23 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.message.Message;
+
+import java.util.List;
+
+public interface CmsUserRoleService {
+
+    /**
+     * 添加对应关系
+     */
+    public Message insertUserRole(String names, String email);
+
+    /**
+     * 根据主键删除对应关系
+     */
+    public Message delUserRole(String id);
+
+    /**
+     * 查询对应关系，添加或者删除对应关系之前先确定此关系是否存在
+     */
+    public List<?> queryUserRole(String name, String email);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsUserService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsUserService.java
new file mode 100644
index 000000000..f66b40acb
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/CmsUserService.java
@@ -0,0 +1,52 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.CmsSysUser;
+import com.ruoyi.content.message.Message;
+
+import java.util.List;
+
+/**
+ * 说明：系统用户
+ */
+public interface CmsUserService {
+
+    /**
+     * 添加新用户
+     */
+    public Message insertUser(CmsSysUser user);
+
+    /**
+     * 删除用户
+     */
+    public Message delUser(String email);
+
+    /**
+     * 修改用户信息
+     */
+    public Message updateUser(CmsSysUser user);
+
+    /**
+     * 查询所有的用户,分页展示
+     */
+    public List<?> queryUser(int startRow, int rows, String email, String phone, String name, String companyId);
+
+    /**
+     * 查询单个用户
+     */
+    public CmsSysUser queryUserByEmail(String email);
+
+    /**
+     * 查询用户数量
+     */
+    public int countUser(String email, String phone, String name, String companyId);
+
+    /**
+     * 修改当前登录人的密码
+     */
+    public Message updataPassword(String newPass);
+
+    /**
+     * 判断原始密码是否正确
+     */
+    public Message checkOldPass(String oldPass);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/LdComService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/LdComService.java
new file mode 100644
index 000000000..2fed86e87
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/LdComService.java
@@ -0,0 +1,12 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.LdComParty;
+
+import java.util.List;
+
+public interface LdComService {
+
+    List<LdComParty> queryldcomList();
+
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java
new file mode 100644
index 000000000..934f8ef71
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java
@@ -0,0 +1,135 @@
+package com.ruoyi.content.service;
+
+
+import com.ruoyi.content.domain.BaseCode;
+import com.ruoyi.content.domain.PageDTO;
+import com.ruoyi.content.message.Message;
+
+import java.util.HashMap;
+import java.util.List;
+
+
+/**
+ * 文库处理业务层
+ *
+ * @author Ma.C
+ */
+public interface LibraryService {
+
+
+    /**
+     * 查询文库全部文章
+     *
+     * @param articleState
+     * @param special
+     * @param articelName
+     * @return
+     */
+    public List<HashMap<String, Object>> queryLibrary(int startRow, int rows, String articelName, String special, String channel, String articleState) throws Exception;
+
+    /**
+     * 根据状态查询当前用户所有发布过的文章
+     *
+     * @param articelName
+     * @param special
+     * @param articleState
+     * @return
+     */
+    public int countArticleInfoByState(String articelName, String special, String channel,
+                                       String articleState);
+
+    /**
+     * 添加文章栏目关系
+     *
+     * @return
+     */
+    public Message addLibrary(String companyId, String branchId, String channelId, String articleInfoList);
+
+    /**
+     * 移除文章栏目关系
+     *
+     * @return
+     */
+    public Message removeArticleItem(String companyId, String branchId, String channelId, String articleInfoList);
+
+    /**
+     * 发布文章
+     *
+     * @param ids
+     * @return
+     */
+    public Message changeSate(String ids, String eState, String sState, String publishId);
+
+    /**
+     * 删除文章
+     *
+     * @param id
+     * @return
+     */
+    public Message delArticle(String id);
+
+    /**
+     * 文章排序
+     *
+     * @param id
+     * @return
+     */
+    public Message updateLibrary(String id, String orderNo);
+
+
+    /**
+     * 根据栏目id查一二级栏目名称
+     *
+     * @param channelId
+     * @return
+     */
+    public BaseCode queryBaseCodeByChannelId(String channelId);
+
+    /**
+     * 根据文章id查后台修改路径
+     *
+     * @return
+     */
+    public Message queryEditUrlByPublishId(String publishId);
+
+    /**
+     * 根据文章id查询文章是否有原始静态页面路径
+     *
+     * @param articleId
+     * @return
+     */
+    public int checkCreateUser(String articleId, String originalUrl, String createUser);
+
+    /**
+     * 推送文章
+     *
+     * @return
+     */
+    public Message articleSend(String articleId, String publishId, String agentCode, String sendType, String partyId, Integer sendId);
+
+    /**
+     * 定时推送文章信息
+     *
+     * @param articleId
+     * @param publishId
+     * @param agentCode
+     * @param sendType
+     * @param partyId
+     * @param sendTime
+     * @return
+     */
+    public Message onTimeSend(String articleId, String publishId, String agentCode, String sendType, String partyId, String sendTime);
+
+
+    public Message delLibraryHTML(String id);
+
+    public int countArticleByParam(String articelName, String special, String channel, String articleState);
+
+    public Message onkeyExChange(String from, String to, String companyId, String branchId);
+
+    public PageDTO noSendPublishArticle(String articleId, int startRow, int rows, String publishId);
+
+    public Message delOnTimeTask(String delId);
+
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java
new file mode 100644
index 000000000..9b5e2bda1
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java
@@ -0,0 +1,49 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.ArticleInfo;
+import com.ruoyi.content.domain.ClickTrackInfo;
+import com.ruoyi.content.domain.PageDTO;
+import com.ruoyi.content.domain.UserInfo;
+
+public interface StaffArticleManageService {
+
+
+    public ClickTrackInfo articleSharingTrackInfo(String clickId);
+
+    /**
+     * 根据userId 查询对应user信息
+     *
+     * @param publishUserId
+     * @return
+     */
+    public UserInfo queryPublishUserInfo(String publishUserId);
+
+    /**
+     * 根据文章id查view路径
+     *
+     * @param articleId
+     * @return
+     */
+    public ArticleInfo queryModifiedViewUrl(String articleId);
+
+    /**
+     * 根据文章id去查publish表，找出该文章对应所有业务员
+     *
+     * @param articleId
+     * @param startRow
+     * @param rows
+     * @return
+     */
+    public PageDTO querySalesmanByArticleId(String articleId, int startRow, int rows);
+
+    /**
+     * 根据用户id查询浏览表
+     *
+     * @param userId
+     * @param startRow
+     * @param rows
+     * @return
+     */
+    public PageDTO queryClickInfoByUserId(String userId, String articleId, int startRow, int rows);
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/TemplateSendService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/TemplateSendService.java
new file mode 100644
index 000000000..289ef36c2
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/TemplateSendService.java
@@ -0,0 +1,26 @@
+package com.ruoyi.content.service;
+
+
+import com.ruoyi.content.message.Message;
+
+public interface TemplateSendService {
+
+    /**
+     * 新文章发布通知
+     *
+     * @throws Exception
+     */
+    Message newArticleSend(String articleName, String url, String picurl, String shareDes, String agentCode, String partyId) throws Exception;
+    /**
+     * 已阅读通知
+     * @throws Exception
+     *//*
+	void haveReadSend() throws Exception;
+	*//**
+     * 已转发通知
+     * @throws Exception
+     *//*
+	void forwardedSend() throws Exception;*/
+
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/UserService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/UserService.java
new file mode 100644
index 000000000..0a95bc4ef
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/UserService.java
@@ -0,0 +1,22 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.WxUserInfoDto;
+
+/**
+ * 用户业务层
+*
+* @author liu.hx  
+* @date 2018年4月3日  
+*
+ */
+public interface UserService {
+
+	/**
+	 * 获取用户id
+	*
+	*	liu.hx
+	*	2018年4月3日
+	* @throws
+	 */
+	String getUserId(WxUserInfoDto wxUserInfoDto);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/WechatIMGService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/WechatIMGService.java
new file mode 100644
index 000000000..f7a8894e0
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/WechatIMGService.java
@@ -0,0 +1,9 @@
+package com.ruoyi.content.service;
+
+import java.io.InputStream;
+
+public interface WechatIMGService {
+
+	InputStream getInputStream(String mediaId, InputStream ins);
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/WmsOperatorService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/WmsOperatorService.java
new file mode 100644
index 000000000..74c20c816
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/WmsOperatorService.java
@@ -0,0 +1,7 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.domain.CmsSysUser;
+
+public interface WmsOperatorService {
+    public CmsSysUser findTblWmsOperatorByEmail(String email);
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleLabelServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleLabelServiceImpl.java
new file mode 100644
index 000000000..f12c5979d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleLabelServiceImpl.java
@@ -0,0 +1,152 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.content.domain.ArticleLabel;
+import com.ruoyi.content.domain.ArticleLabelExample;
+import com.ruoyi.content.domain.ArticleLabelRelationship;
+import com.ruoyi.content.domain.ArticleLabelRelationshipExample;
+import com.ruoyi.content.mapper.ArticleLabelMapper;
+import com.ruoyi.content.mapper.ArticleLabelRelationshipMapper;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.ArticleLabelService;
+import com.ruoyi.content.utils.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class ArticleLabelServiceImpl implements ArticleLabelService {
+    private static final Logger logger = LoggerFactory.getLogger(ArticleLabelServiceImpl.class);
+    @Autowired
+    private ArticleLabelMapper articleLabelMapper;
+    @Autowired
+    ArticleLabelRelationshipMapper articleLabelRelationshipMapper;
+
+    @Override
+    public List<ArticleLabel> queryLabel() {
+        logger.info("查询标签的方法开始");
+        List<ArticleLabel> list = null;
+        String companyId = "1";// 公司id
+        String branchId = "86";
+        ArticleLabelExample example = new ArticleLabelExample();
+        ArticleLabelExample.Criteria criteria = example.createCriteria();
+        criteria.andCompanyIdEqualTo(companyId);
+        if (!"86".equals(branchId)) {
+            List<String> branchList = new ArrayList<>();
+            branchList.add("86");
+            branchList.add(branchId);
+            criteria.andBranchIdIn(branchList);
+        }
+        list = articleLabelMapper.selectByExample(example);
+        logger.info("查询标签信息结束，查询到的结果为【{}】" + JsonUtil.objectToJackson(list));
+        logger.info("查询标签的方法结束！");
+        return list;
+    }
+
+    @Override
+    public Message addlabel(String articleId, String labelIds) {
+        logger.info("添加文章标签方法开始");
+        Message msg = new Message();
+        try {
+            String[] arrId = labelIds.split(",");
+            for (String labelId : arrId) {
+                if (StringUtils.isNotBlank(labelId)) {
+                    ArticleLabelRelationshipExample example = new ArticleLabelRelationshipExample();
+                    ArticleLabelRelationshipExample.Criteria criteria = example.createCriteria();
+                    criteria.andArticleIdEqualTo(Integer.valueOf(articleId));
+                    criteria.andLabelIdEqualTo(Integer.valueOf(labelId));
+                    List<ArticleLabelRelationship> list = articleLabelRelationshipMapper.selectByExample(example);
+                    logger.info("该文章是否存在该关系articleId[{}],labelId[{}],list[{}]", articleId, labelId,
+                            JsonUtil.objectToJackson(list));
+                    if (null == list || list.size() == 0) {
+                        ArticleLabelRelationship articleLabelRelationship = new ArticleLabelRelationship();
+                        articleLabelRelationship.setArticleId(Integer.valueOf(articleId));
+                        articleLabelRelationship.setLabelId(Integer.valueOf(labelId));
+                        if (articleLabelRelationshipMapper.insert(articleLabelRelationship) == 1) {
+                            logger.info("给文章添加标签关系成功！");
+                        } else {
+                            logger.info("给文章添加标签关系失败！");
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("给文章添加标签失败");
+            msg.setInfo("添加标签失败！");
+            msg.setResult(false);
+        }
+        msg.setInfo("添加标签成功");
+        msg.setResult(true);
+        logger.info("添加文章标签方法结束！");
+        return msg;
+    }
+
+    @Override
+    public List<ArticleLabel> queryLabelOss(String companyId) {
+        logger.info("根据公司id查询标签的方法开始,companyId【{}】", companyId);
+        List<ArticleLabel> list = null;
+        ArticleLabelExample example = new ArticleLabelExample();
+        ArticleLabelExample.Criteria criteria = example.createCriteria();
+        criteria.andCompanyIdEqualTo(companyId);
+        list = articleLabelMapper.selectByExample(example);
+        logger.info("根据公司id查询标签信息结束，查询到的结果为【{}】" + JsonUtil.objectToJackson(list));
+        logger.info("查询标签的方法结束！");
+        return list;
+    }
+
+    @Override
+    public Message saveLabel(String labelName) {
+        logger.info("新增标签的方法开始");
+        String companyId = "1";// 公司id
+        String branchId = "86";
+        String date = DateUtils.getDate();
+        String time = DateUtils.getTimeNow();
+        ArticleLabel record = new ArticleLabel();
+        record.setBranchId(branchId);
+        record.setCompanyId(companyId);
+        record.setLabelName(labelName);
+        record.setCreateDate(date);
+        record.setCreateTime(time);
+        record.setUpdateDate(date);
+        record.setUpdateTime(time);
+        int i = articleLabelMapper.insertSelective(record);
+        logger.info("新增标签信息结束，结果为【{}】", i > 0);
+        return new Message(true, "新增成功");
+    }
+
+    @Override
+    public Message updateLabel(Integer labelId, String labelName) {
+        logger.info("修改标签的方法开始");
+        ArticleLabel record = articleLabelMapper.selectByPrimaryKey(labelId);
+        if (record == null) {
+            return new Message(false, "标签不存在");
+        }
+        String date = DateUtils.getDate();
+        String time = DateUtils.getTimeNow();
+        record.setLabelName(labelName);
+        record.setUpdateDate(date);
+        record.setUpdateTime(time);
+        int i = articleLabelMapper.insertSelective(record);
+        logger.info("修改标签信息结束，结果为【{}】", i > 0);
+        return new Message(true, "修改成功");
+    }
+
+    @Override
+    public Message deleteLabel(Integer labelId) {
+        logger.info("删除标签的方法开始");
+        ArticleLabel record = articleLabelMapper.selectByPrimaryKey(labelId);
+        if (record == null) {
+            return new Message(false, "标签不存在");
+        }
+        int i = articleLabelMapper.deleteByPrimaryKey(labelId);
+        logger.info("修改标签信息结束，结果为【{}】", i > 0);
+        return new Message(true, "删除成功");
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
new file mode 100644
index 000000000..a881db6f4
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
@@ -0,0 +1,1201 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.content.constants.PropertiesConstants;
+import com.ruoyi.content.domain.*;
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.exception.ParameterException;
+import com.ruoyi.content.mapper.*;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.redis.RedisManager;
+import com.ruoyi.content.service.ArticleService;
+import com.ruoyi.content.utils.*;
+import freemarker.template.Configuration;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.UnsupportedEncodingException;
+import java.util.*;
+
+@Service
+public class ArticleServiceImpl implements ArticleService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArticleServiceImpl.class);
+
+    @Autowired
+    private ArticleInfoMapper articleMapper;
+    @Autowired
+    private ArticleQueryMapper articleQueryMapper;
+    @Autowired
+    private ArticlePublishTrackMapper articlePublishTrackMapper;
+    @Autowired
+    private ArticleChannelQueryMapper articleChannelQueryMapper;
+    @Autowired
+    private CmsSysUserExMapper cmsSysUserExMapper;
+    //	@Autowired
+//	private ContentRedisManager redisManager;
+    @Autowired
+    private RedisManager rManager;
+    @Autowired
+    private CmsSysUserMapper cmsSysUserMapper;
+    @Autowired
+    private ArticlePublishTrackQueryMapper articlePublishTrackQueryMapper;
+    @Autowired
+    private ArticleLabelServiceImpl articleLabelServiceImpl;
+    @Autowired
+    private ArticleChannelMapper articleChannelMapper;
+
+    /*
+     * 根据文章url爬文章,创建文章
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public Message getArticleContentByUrl(String originalUrl, String createUser, String author, String ids,
+                                          String isAuthorization, String isReserve, String automaticName, String introduction, String labelIds,
+                                          String isJoinActive) {
+        Message msg = new Message();
+        Map<String, String> resultMap = new HashMap<String, String>();
+        /*************** 根据链接爬文章***********start ****************************/
+        LOGGER.info(
+                "根据文章链接获取文章内容,参数originalUrl[{}],createUser[{}],author[{}],ids[{}],isAuthorization[{}],isReserve[{}],automaticName[{}],introduction[{}],isJoinActive[{}]",
+                originalUrl, createUser, author, ids, isAuthorization, isReserve, automaticName, introduction,
+                isJoinActive);
+        String companyId = "1";// 渠道id
+        String email = "";
+        // 根据登录人查询登录信息（shiro里有缓存数据不是最新）
+        CmsSysUser cmsSysUser = cmsSysUserExMapper.queryLoginInfoByEmail(email);
+        // 此时后台管理员
+        String userId = cmsSysUser.getUserId();
+        // 判断该url是否被爬取过
+        ArticleInfo articleInfo = articleQueryMapper.queryArticleInfoByCompanyId(companyId, originalUrl);
+        LOGGER.info("查询该文章是否存在[{}]", JsonUtil.objectToJackson(articleInfo));
+
+        if (articleInfo != null) {
+            // 数据库里有这篇文章
+            String aritcleEditUrl = articleInfo.getArticleEditUrl();
+            String modifiedEditUrl = articleInfo.getModifiedEditUrl();
+            Integer articleId = articleInfo.getArticleId();
+            // 存文章和标签的关系
+            articleLabelServiceImpl.addlabel(String.valueOf(articleId), labelIds);
+            LOGGER.info("aritcleEditUrl[{}],modifiedEditUrl[{}],articleId[{}]", aritcleEditUrl, modifiedEditUrl,
+                    articleId);
+            String publishId = userId + "a" + articleId;
+            // modifiedEditUrl有值说明是后台导入过该文章返回已经发布过信息
+            if (modifiedEditUrl != null && !"".equals(modifiedEditUrl)) {
+
+                ArticlePublishTrackExample example = new ArticlePublishTrackExample();
+                ArticlePublishTrackExample.Criteria criteria = example.createCriteria();
+                criteria.andArticleIdEqualTo(String.valueOf(articleId));
+                criteria.andPublishIdEqualTo(publishId);
+                List<ArticlePublishTrack> list = articlePublishTrackMapper.selectByExample(example);
+                if (list.size() > 0) {
+                    // 该管理员发布过这篇文章
+                    LOGGER.info("该文章后台已经发布过");
+                    msg.setInfo("亲，该文章您已经发布过,请到文章列表中进行编辑~");
+                    msg.setResult(false);
+                } else {
+
+                    // 该管理员没有导入过该文章，重新爬取文章;是否存在工号，有的存publish表
+                    if (StringUtils.isNotBlank(cmsSysUser.getJobNumber())) {
+                        msg = this.getArticleContent(originalUrl, author, "");
+                        resultMap = (Map<String, String>) msg.getObject();
+                        String listPicUrl = resultMap.get("listPicUrl");
+                        String articleName = resultMap.get("articleName");
+                        String shareTitle = resultMap.get("shareTitle");
+                        String shareImgUrl = resultMap.get("shareImgUrl");
+                        String shareDes = resultMap.get("shareDes");
+                        String articleContent = resultMap.get("articleContent");
+                        msg = this.getHtmlUrl(articleId, shareTitle, shareImgUrl, shareDes, articleContent, "",
+                                publishId, companyId, isAuthorization, isReserve, automaticName, introduction,
+                                isJoinActive);
+                        resultMap = (Map<String, String>) msg.getObject();
+                        String editUrl = resultMap.get("articleEditUrl");
+                        String viewUrl = resultMap.get("articleViewUrl");
+
+                        String versionNumber = (String) resultMap.get("versionNumber");
+                        LOGGER.info("获取到的版本号3为{}", versionNumber);
+
+                        String jobNumber = cmsSysUser.getJobNumber();
+                        this.checkJobNumber(articleId, articleName, listPicUrl, ids, publishId, companyId, jobNumber,
+                                userId, cmsSysUser.getName(), editUrl, viewUrl, versionNumber);
+                        if (articleInfo.getArticleState().equals("1")) {
+                            // 如果文章已被删除重新导入 更新article_info表文章状态
+                            String updateDate = DateUtils.getDate();
+                            String updateTime = DateUtils.getTimeNow();
+                            articleInfo.setArticleState("0");
+                            articleInfo.setUpdateDate(updateDate);
+                            articleInfo.setUpdateTime(updateTime);
+                            int cont = articleMapper.updateByPrimaryKeySelective(articleInfo);
+                            if (cont == 0) {
+                                LOGGER.info("更新文章失败");
+                                throw new BusinessException("系统繁忙,请稍后再试");
+                            }
+                        }
+                        resultMap.put("articleEditUrl", editUrl);
+                        msg.setResult(true);
+                        msg.setObject(resultMap);
+                    }
+                }
+                return msg;
+            }
+            // aritcleEditUrl有值说明是手机端导入 ，此时重新导入更新modifiedEditUrl
+            if (aritcleEditUrl != null && !"".equals(aritcleEditUrl)) {
+                msg = this.getArticleContent(originalUrl, author, ids);
+                resultMap = (Map<String, String>) msg.getObject();
+                String listPicUrl = resultMap.get("listPicUrl");
+                String articleName = resultMap.get("articleName");
+                String shareTitle = resultMap.get("shareTitle");
+                String shareImgUrl = resultMap.get("shareImgUrl");
+                String shareDes = resultMap.get("shareDes");
+                String articleContent = resultMap.get("articleContent");
+                msg = this.getHtmlUrl(articleId, shareTitle, shareImgUrl, shareDes, articleContent, ids, publishId,
+                        companyId, isAuthorization, isReserve, automaticName, introduction, isJoinActive);
+                resultMap = (Map<String, String>) msg.getObject();
+                String EditUrl = resultMap.get("articleEditUrl");
+                String ViewUrl = resultMap.get("articleViewUrl");
+                String versionNumber = (String) resultMap.get("versionNumber");
+
+                articleInfo.setModifiedEditUrl(EditUrl);
+                articleInfo.setModifiedViewUrl(ViewUrl);
+                int count = articleMapper.updateByPrimaryKey(articleInfo);
+                if (count == 0) {
+                    LOGGER.info("更新modifiedEditUrl失败");
+                    msg.setInfo("系统繁忙,请稍后再试");
+                    msg.setResult(false);
+                }
+                resultMap.put("articleEditUrl", EditUrl);
+                String jobNumber = cmsSysUser.getJobNumber();
+                LOGGER.info("获取到的versionNumber1为{}", versionNumber);
+                LOGGER.info("当前用户工号为jobNumber【{}】", jobNumber);
+                this.checkJobNumber(articleId, articleName, listPicUrl, ids, publishId, companyId, jobNumber, userId,
+                        cmsSysUser.getName() + "", EditUrl, ViewUrl, versionNumber);
+                msg.setInfo("成功导入文章!");
+                msg.setResult(true);
+                msg.setObject(resultMap);
+                return msg;
+            }
+
+        } else {
+            // 如果文章没有导入过重新导入 存article_info表，如果这个管理员有工号同时存publish表
+            msg = this.getArticleContent(originalUrl, author, ids);
+            resultMap = (Map<String, String>) msg.getObject();
+            String listPicUrl = resultMap.get("listPicUrl");
+            String articleName = resultMap.get("articleName");
+            String shareTitle = resultMap.get("shareTitle");
+            String shareImgUrl = resultMap.get("shareImgUrl");
+            String shareDes = resultMap.get("shareDes");
+            String articleContent = resultMap.get("articleContent");
+            String createDate = DateUtils.getDate();
+            String createTime = DateUtils.getTimeNow();
+            LOGGER.info(
+                    "导入文章相关信息：【listPicUrl:{},articleName:{},shareTitle:{},shareImgUrl:{},shareDes:{},articleContent:{},createDate:{},createTime:{}】",
+                    new Object[]{listPicUrl, articleName, shareTitle, shareImgUrl, shareDes, articleContent,
+                            createDate, createTime});
+
+            ArticleInfo article = new ArticleInfo();
+            article.setArticleAuthor(cmsSysUser.getName() + "");
+            article.setArticleName(articleName);
+            article.setOriginalUrl(originalUrl);
+            article.setShareImgUrl(shareImgUrl);
+            article.setShareTitle(shareTitle);
+            article.setShareDes(shareDes);
+            article.setListPicUrl(listPicUrl);
+            article.setCreateUser(createUser);
+            article.setCompanyId(companyId);
+            article.setCreateDate(createDate);
+            article.setCreateTime(createTime);
+
+            int cont = articleMapper.insertSelective(article);
+            if (cont == 0) {
+                LOGGER.info("插入新文章失败");
+                throw new BusinessException("系统繁忙,请稍后再试");
+            }
+
+            // 根据文章原始url和创建公司查该文章
+            ArticleInfo arInfo = articleQueryMapper.queryArticleInfoByCompanyId(companyId, originalUrl);
+            // 文章id
+            Integer articleId = arInfo.getArticleId();
+            // 文章的发布id
+            String publishId = userId + "a" + articleId;
+
+            msg = this.getHtmlUrl(articleId, shareTitle, shareImgUrl, shareDes, articleContent, ids, publishId,
+                    companyId, isAuthorization, isReserve, automaticName, introduction, isJoinActive);
+            Map<String, String> resultMap1 = new HashMap<String, String>();
+            resultMap1 = (Map<String, String>) msg.getObject();
+            String modifiedEditUrl = resultMap1.get("articleEditUrl");
+            String modifiedViewUrl = resultMap1.get("articleViewUrl");
+            String versionNumber = (String) resultMap1.get("versionNumber");
+
+            resultMap.put("articleEditUrl", modifiedEditUrl);
+            resultMap.put("articleViewUrl", modifiedViewUrl);
+            // article_info 中modified两个字段自判断是否后台导入过，第一次存值后不再更新
+            arInfo.setModifiedEditUrl(modifiedEditUrl);
+            arInfo.setModifiedViewUrl(modifiedViewUrl);
+            LOGGER.info("存放静态页面路径modifiedEditUrl[{}],modifiedViewUrl[{}]", modifiedEditUrl, modifiedViewUrl);
+            int count1 = articleMapper.updateByPrimaryKeySelective(arInfo);
+            if (count1 == 0) {
+                LOGGER.info("原始静态页面路径入库失败");
+                throw new BusinessException("系统繁忙,请稍后再试");
+            }
+            // 后台管理员工号
+            String jobNumber = cmsSysUser.getJobNumber();
+            LOGGER.info("当前用户工号为jobNumber【{}】", jobNumber);
+            LOGGER.info("获取到的versionNumber2为{}", versionNumber);
+            // 存文章和标签的关系
+            articleLabelServiceImpl.addlabel(String.valueOf(articleId), labelIds);
+            this.checkJobNumber(articleId, articleName, listPicUrl, ids, publishId, companyId, jobNumber, userId,
+                    cmsSysUser.getName() + "", modifiedEditUrl, modifiedViewUrl, versionNumber);
+            msg.setInfo("成功导入文章!");
+            msg.setResult(true);
+            msg.setObject(resultMap);
+        }
+        return msg;
+    }
+
+    /**
+     * 创建，二次编辑并发表
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    @Transactional
+    public Message savePulishedArticle(Map<String, Object> requestMap) {
+        // 更新已经发布过的文章
+        Message msg = new Message();
+        Map<String, String> resultMap = new HashMap<String, String>();
+        LOGGER.info("准备更新文章数据");
+        ArticleInfo articleInfo = (ArticleInfo) requestMap.get("article");
+        String articleContent = (String) requestMap.get("articleContent");
+        Integer articleId = articleInfo.getArticleId();
+        String shareTitle = articleInfo.getShareTitle();
+        String shareImgUrl = articleInfo.getShareImgUrl();
+        String shareDes = articleInfo.getShareDes();
+        String adId = (String) requestMap.get("adId");
+        String companyId = (String) requestMap.get("companyId");
+        String publishId = (String) requestMap.get("publishId");
+        String isAuthorization = (String) requestMap.get("isAuthorization");
+        String isReserve = (String) requestMap.get("isReserve");
+        String isJoinActive = (String) requestMap.get("isJoinActive");
+        String automaticName = (String) requestMap.get("automaticName");
+        String introduction = (String) requestMap.get("introduction");
+
+        LOGGER.info(
+                "获取静态页面参数adId【{}】,companyId【{}】,publishId【{}】,isAuthorization【{}】,isReserve【{}】,automaticName【{}】,introduction【{}】,isJoinActive【{}】",
+                adId, companyId, publishId, isAuthorization, isReserve, automaticName, introduction, isJoinActive);
+        String updateDate = DateUtils.getDate();
+        String updateTime = DateUtils.getTimeNow();
+        articleInfo.setUpdateDate(updateDate);
+        articleInfo.setUpdateTime(updateTime);
+
+        // msg = this.getHtmlUrl(articleId, shareTitle, shareImgUrl, shareDes,
+        // articleContent, adId, publishId, companyId,
+        // isAuthorization, isReserve,automaticName,introduction, isJoinActive);
+        msg = this.getHtmlUrl2(articleId, shareTitle, shareImgUrl, shareDes, articleContent, adId, publishId, companyId,
+                isAuthorization, isReserve, automaticName, introduction, isJoinActive);
+        resultMap = (Map<String, String>) msg.getObject();
+        String modifiedEditUrl = resultMap.get("articleEditUrl");
+        String modifiedViewUrl = resultMap.get("articleViewUrl");
+        String versionNumber = (String) resultMap.get("versionNumber");
+        // articleInfo.setModifiedEditUrl(modifiedEditUrl);
+        // articleInfo.setModifiedViewUrl(modifiedViewUrl);
+        // // 更新数据
+        int count = articleMapper.updateByPrimaryKeySelective(articleInfo);
+        if (count == 0) {
+            LOGGER.info("根据链接发布文章,文章更新失败");
+            throw new BusinessException("系统繁忙,请稍后再试");
+        }
+
+        // 根据publishId 去表里查 如果没数据不用更新
+        ArticlePublishTrack apt = articlePublishTrackMapper.selectByPrimaryKey(publishId);
+        LOGGER.info("根据publishId查询到信息apt[{}]", JsonUtil.objectToJackson(apt));
+        if (apt != null) {
+            ArticlePublishTrack articlePublishTrack = new ArticlePublishTrack();
+            articlePublishTrack.setPublishId(publishId);
+            articlePublishTrack.setUpdateDate(updateDate);
+            articlePublishTrack.setUpdateTime(updateTime);
+            articlePublishTrack.setAdId(adId);
+            // articlePublishTrack.setPublishEditUrl(modifiedEditUrl);
+            articlePublishTrack.setPublishViewUrl(modifiedViewUrl);
+            articlePublishTrack.setBackgroundEditUrl(modifiedEditUrl);
+            articlePublishTrack.setArticleVersion(versionNumber);
+            int count1 = articlePublishTrackMapper.updateByPrimaryKeySelective(articlePublishTrack);
+            LOGGER.info("更新publish表:" + JsonUtil.objectToJackson(articlePublishTrack) + "---返回标识：" + count1);
+            if (count1 == 0) {
+                LOGGER.info("根据链接发布文章,文章更新失败");
+                throw new BusinessException("系统繁忙,请稍后再试");
+            }
+            Long flag = rManager.delete("company_articleInfo_Id" + articleInfo.getArticleId());
+            Long flag1 = rManager.delete("company_articleInfo_" + publishId);
+            // 清除文章列表缓存 使更新的文章置顶
+            ArticleChannelExample ex = new ArticleChannelExample();
+            ex.createCriteria().andArticleIdEqualTo(Integer.parseInt(apt.getArticleId()));
+            List<ArticleChannel> channelList = articleChannelMapper.selectByExample(ex);
+            for (ArticleChannel channel : channelList) {
+                String key = "article_channel_" + channel.getSpecial() + "_" + channel.getChannel();
+                LOGGER.info("清除redis中key：" + key);
+                rManager.delete(key);
+            }
+            if (flag != 0 && flag1 != 0) {
+                LOGGER.info("再次编辑删除更新文章redis信息成功！");
+            }
+            // 添加文库成功后，redis更新
+            CompanyArticleInfo companyArticleInfo = articleQueryMapper.queryCompanyArticleById(publishId,
+                    String.valueOf(articleId));
+            String value = JsonUtil.objectToJackson(companyArticleInfo);
+            Map<String, String> hMap = JsonUtil.jackson2Map(value);
+            rManager.hMSet("company_articleInfo_" + publishId, hMap, 0L);
+            LOGGER.info("再次编辑redis存放key[{}]的文库信息成功", "company_articleInfo_" + publishId);
+
+            rManager.hSet("company_articleInfo_Id" + companyArticleInfo.getArticleId(), "visitorCount",
+                    companyArticleInfo.getVisitorCount(), 0L);
+            rManager.hSet("company_articleInfo_Id" + companyArticleInfo.getArticleId(), "sharedCount",
+                    companyArticleInfo.getSharedCount(), 0L);
+
+        }
+
+        msg.setResult(true);
+        msg.setInfo("文章修改成功");
+        msg.setObject(resultMap);
+        LOGGER.info("文章更新完成");
+        return msg;
+    }
+
+    /**
+     * 获取文章浏览详情
+     */
+    @Override
+    public Message queryPublishedDetails(String userId, String articleId) {
+        Message msg = new Message();
+        Map<String, Object> resultMap = new HashMap<String, Object>();
+        if (StringUtils.isBlank(userId)) {
+            LOGGER.info("获取浏览详情,缺少参数userId=[{}]", userId);
+            msg.setInfo("获取浏览详情,缺少参数");
+            msg.setResult(false);
+            return msg;
+        }
+        if (StringUtils.isBlank(articleId)) {
+            LOGGER.info("获取浏览详情,缺少参数articleId=[{}]", articleId);
+            msg.setInfo("获取浏览详情,缺少参数");
+            msg.setResult(false);
+            return msg;
+        }
+        // 查询标题
+        PublishedArticleInfo articleInfo = articleQueryMapper.queryPublishedById(userId, articleId);
+        // 获取浏览详情
+        List<ArticeClickInfo> detailDTOs = articleQueryMapper.queryPublishedDetails(userId, articleId);
+        for (ArticeClickInfo articeClickInfo : detailDTOs) {
+
+            String clickUserNickname = articeClickInfo.getClickUserNickname();
+            if (StringUtils.isNotBlank(clickUserNickname)) {
+                try {
+                    clickUserNickname = new String(Base64.getDecoder().decode(clickUserNickname), "UTF-8");
+                } catch (UnsupportedEncodingException e) {
+                    throw new BusinessException("用户昵称解码异常[{" + e.getMessage() + "}]");
+                }
+                articeClickInfo.setClickUserNickname(clickUserNickname);
+            }
+
+        }
+        msg.setInfo("获取浏览详情查询成功");
+        msg.setResult(true);
+        resultMap.put("articleInfo", articleInfo);
+        resultMap.put("detaislList", detailDTOs);
+        msg.setObject(resultMap);
+        return msg;
+    }
+
+    /**
+     * 根据文章id删除文章
+     */
+    @Override
+    public Message delArticle(String id) {
+        LOGGER.info("删除文章信息的业务层方法开始！");
+
+//		String updateDate = DateUtil.currentDate();
+//		String updateTime = DateUtil.currentTime();
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String updateUser = userInfoDTO.getUserId();
+        LOGGER.info("管理员updateUser【{}】删除文章信息的业务层方法中拿到的文章的publishId【{}】", updateUser, id);
+        Message msg = new Message();
+        if (StringUtils.isBlank(id)) {
+            LOGGER.info("删除文章信息失败，缺少参数");
+            throw new ParameterException("未查询到文章信息");
+        }
+        msg.setInfo("删除失败！");
+        msg.setResult(false);
+        Boolean deleteState = true;
+        try {
+            String[] arrId = id.split(",");
+            for (String publishId : arrId) {
+                if (StringUtils.isNotBlank(publishId)) {
+                    // 先去查文库是否存在
+                    List<ArticleChannel> articleChannelList = articleChannelQueryMapper.queryByPublishId(publishId);
+                    LOGGER.info("在文库中查询到的结果【{}】", articleChannelList.size());
+                    if (articleChannelList.size() > 0) {
+                        for (ArticleChannel articleChannel : articleChannelList) {
+                            // 查看在文库中的状态 0发布 1删除 2未发布 也就是说只有等于一的才能删除;文库中没有可以直接删除
+                            if (!"1".equals(articleChannel.getArticleState())) {
+                                deleteState = false;
+                                msg.setInfo("文章【" + articleChannel.getArticleName() + "】在文库中有发布请先删除文库中版本！");
+                                msg.setResult(false);
+                                return msg;
+                            }
+                        }
+                    }
+                    if (deleteState) {
+                        if (articlePublishTrackMapper.deleteByPrimaryKey(publishId) > 0) {
+                            msg.setInfo("文章删除成功！");
+                            msg.setResult(true);
+                            LOGGER.info("管理员updateUser【{}】文章publishId【{}】删除成功！", updateUser, publishId);
+                        }
+                    }
+
+                }
+            }
+
+        } catch (Exception e) {
+            LOGGER.info("删除文章信息失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除失败，请稍候再试！");
+            msg.setResult(true);
+        }
+        LOGGER.info("删除文章信息的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 查询用户当前发布的文章，分页展示
+     */
+    @Override
+    public List<PublishedArticleInfo> queryArticle(int startRow, int rows, String articelName, String articelAuthor,
+                                                   String special, String channelId, String articleState) {
+        LOGGER.info("查询文章列表的业务层方法开始！");
+        LOGGER.info("拿到的参数 startRow【{}】，rows【{}】，文章名称【{}】，文章作者【{}】，一级分类【{}】，二级分类【{}】，文章状态【{}】", startRow, rows,
+                articelName, articelAuthor, special, channelId, articleState);
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String companyId = userInfoDTO.getCompanyId();// 公司id
+
+        List<String> list = new ArrayList<String>();
+        if (StringUtils.isBlank(articleState)) {
+            list.add("0");
+            list.add("2");
+        } else {
+            list.add(articleState);
+        }
+        if (StringUtils.isBlank(articelName)) {
+            articelName = "";
+        }
+        if (StringUtils.isBlank(articelAuthor)) {
+            articelAuthor = "";
+        }
+        if (StringUtils.isBlank(special)) {
+            special = "";
+        }
+        if (StringUtils.isBlank(channelId)) {
+            channelId = "";
+        }
+        List<PublishedArticleInfo> articleList = articleQueryMapper.selectAllWithLimit(companyId, list, startRow, rows,
+                articelName, articelAuthor, special, channelId);
+        if (articleList == null || articleList.size() < 1) {
+            LOGGER.info("根据用户查询已发布的文章，未查询到数据【{}】", JsonUtil.objectToJackson(userInfoDTO));
+            throw new BusinessException("您还没有发布过文章！");
+        }
+        for (PublishedArticleInfo publishedArticleInfo : articleList) {
+            String articleId = publishedArticleInfo.getArticleId();
+            Map<String, String> countJsonMap = rManager.hGetAll("company_articleInfo_Id" + articleId);
+            publishedArticleInfo.setVisitorCount(countJsonMap.get("visitorCount"));
+            publishedArticleInfo.setShareCount(countJsonMap.get("sharedCount"));
+        }
+        LOGGER.info("查询文章列表的业务层方法结束！");
+        return articleList;
+    }
+
+    /**
+     * 查询当前用户发布过的文章数量
+     */
+    @Override
+    public int countArticleInfoByState(String articelName, String articelAuthor, String special, String channelId,
+                                       String articleState) {
+        LOGGER.info("统计文章数量的业务层方法开始！");
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String companyId = userInfoDTO.getCompanyId();// 管理员公司id
+        ArticleInfoExample example = new ArticleInfoExample();
+        ArticleInfoExample.Criteria criteria = example.createCriteria();
+        LOGGER.info("统计文章数量的业务层方法中拿到的文章名称【{}】、文章作者【{}】、一级分类【{}】、二级分类【{}】、文章状态【{}】", articelName, articelAuthor, special,
+                channelId, articleState);
+        if (StringUtils.isBlank(articleState)) {
+            criteria.andArticleStateNotEqualTo("1");
+        } else {
+            criteria.andArticleStateEqualTo(articleState);
+        }
+        if (StringUtils.isNotBlank(special)) {
+            criteria.andSpecialEqualTo(special);
+        }
+        if (StringUtils.isNotBlank(channelId)) {
+            criteria.andChannelIdEqualTo(channelId);
+        }
+        if (StringUtils.isNotBlank(articelAuthor)) {
+            criteria.andArticleAuthorLike(articelAuthor);
+        }
+        if (StringUtils.isNotBlank(articelName)) {
+            criteria.andArticleNameLike(articelName);
+        }
+        if (StringUtils.isNotBlank(companyId)) {
+            criteria.andCompanyIdEqualTo(companyId);
+        }
+        List<ArticleInfo> articleList = null;
+        try {
+            articleList = articleMapper.selectByExample(example);
+            if (articleList == null || articleList.size() < 1) {
+                LOGGER.info("根据用户查询已发布的文章，未查询到数据【{}】", JsonUtil.objectToJackson(userInfoDTO));
+                return 0;
+            }
+        } catch (Exception e) {
+            LOGGER.info("统计文章数量的业务层方法产生异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        LOGGER.info("统计文章数量的业务层方法结束！");
+        return articleList.size();
+    }
+
+    /**
+     * 根据id查询文章信息
+     */
+    @Override
+    public ArticleInfo queryArticleByArticleId(String articleId) {
+        LOGGER.info("查询单个文章信息的业务层方法开始！");
+        LOGGER.info("查询单个文章信息的业务层方法中拿到的文章articleId【{}】", articleId);
+        if (StringUtils.isBlank(articleId)) {
+            LOGGER.info("查询文章信息失败，缺少参数");
+            throw new ParameterException("未查询到文章信息");
+        }
+        ArticleInfo articleInfo = articleMapper.selectByPrimaryKey(Integer.valueOf(articleId));
+        LOGGER.info("查询到的文章信息【{}】", JsonUtil.objectToJackson(articleInfo));
+        LOGGER.info("查询单个文章信息的业务层方法结束！");
+        return articleInfo;
+    }
+
+    /**
+     * 更新文章通过id
+     */
+    @Override
+    public Message articleUpByArticleId(ArticleInfo articleInfo) throws Exception {
+        LOGGER.info("修改文章信息的业务层方法开始！");
+        LOGGER.info("修改文章业务方法中拿到的文章信息【{}】", JsonUtil.objectToJackson(articleInfo));
+        Message msg = new Message();
+        try {
+            if (articleMapper.updateByPrimaryKeySelective(articleInfo) > 0) {
+                msg.setInfo("修改成功！");
+                msg.setResult(true);
+                LOGGER.info("修改成功！");
+
+                Long flag = rManager.delete("company_articleInfo_Id" + articleInfo.getArticleId());
+                if (flag != 0) {
+                    LOGGER.info("删除redis该条文章信息成功！");
+                }
+            }
+        } catch (Exception e) {
+            LOGGER.info("更新文章失败【{}】", e.getMessage());
+            msg.setInfo("修改失败！");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        LOGGER.info("修改文章信息的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 根据原始url爬取文章
+     */
+    @Override
+    public Message getArticleContent(String originalUrl, String author, String ids) {
+        Message msg = new Message();
+        LOGGER.info("根据文章链接获取文章内容,参数originalUrl[{}],author[{}],ids[{}]", originalUrl, author, ids);
+        OssDTO ossDTO = new OssDTO();
+        ossDTO.setBucketName(PropertiesConstants.BUCKETNAME);
+        ossDTO.setOssEndPoint(PropertiesConstants.OSSENDPOINT);
+        ossDTO.setOssId(PropertiesConstants.OSSID);
+        ossDTO.setOssKey(PropertiesConstants.OSSKEY);
+        ossDTO.setOssPath(PropertiesConstants.OSSPATH);
+        msg = GetMessageFromArticle.getArticleListFromUrl(originalUrl, ossDTO, author, ids);
+        return msg;
+    }
+
+    /**
+     * 生成静态页面路径
+     */
+    @Override
+    public Message getHtmlUrl2(Integer articleId, String shareTitle, String shareImgUrl, String shareDes,
+                               String articleContent, String ids, String publishId, String companyId, String isAuthorization,
+                               String isReserve, String automaticName, String introduction, String isJoinActive) {
+        Message msg = new Message();
+        Map<String, String> resultMap = new HashMap<String, String>();
+        /*************** 根据链接爬文章***********start ****************************/
+        LOGGER.info(
+                "调用生成静态页面参数articleId[{}],shareTitle[{}],shareImgUrl[{}],shareDes[{}],ids[{}],publishId[{}],companyId[{}],isAuthorization[{}],isReserve[{}],automaticName[{}],introduction[{}],isJoinActive[{}]",
+                articleId, shareTitle, shareImgUrl, shareDes, ids, publishId, companyId, isAuthorization, isReserve,
+                automaticName, introduction, isJoinActive);
+        try {
+            /**************************** 生成静态页开始 ************************************/
+            Configuration conf = new Configuration();
+            Map<String, Object> pageData = new HashMap<String, Object>();
+            Map<String, String> articleMap = new HashMap<String, String>();
+            ArticlePublishTrack articlePublishTrack = articlePublishTrackMapper.selectByPrimaryKey(publishId);
+            // 时间戳
+            // String versionNumber = DateUtil.currentDate(DateUtil.yyyyMMddHHmmssSSS) +
+            // RandomUtils.randomNumber(3);
+            String viewPath = articlePublishTrack.getPublishViewUrl().replace(PropertiesConstants.OSS_URL, "");
+            String editPath = articlePublishTrack.getBackgroundEditUrl().replace(PropertiesConstants.OSS_URL, "");
+            viewPath = viewPath.replace(PropertiesConstants.OSSPATH, "");
+            editPath = editPath.replace(PropertiesConstants.OSSPATH, "");
+            LOGGER.info("oss上删除的文章编辑的路径：" + articlePublishTrack.getBackgroundEditUrl());
+            LOGGER.info("oss上删除的文章的视图路径：" + articlePublishTrack.getPublishViewUrl());
+            String[] viewHtmlName = viewPath.split("/");
+            String[] editHtmlName = editPath.split("/");
+            String versionNumber = viewHtmlName[viewHtmlName.length - 1].split("b")[1].replace(".html", "");
+            // 封装数据
+            articleMap.put("shareTitle", shareTitle);
+            articleMap.put("shareImgUrl", shareImgUrl);
+            articleMap.put("shareDes", shareDes);
+            articleMap.put("articleId", String.valueOf(articleId));
+            articleMap.put("articleContent", articleContent);
+            articleMap.put("companyId", companyId);
+            articleMap.put("versionNumber", versionNumber);
+            articleMap.put("publishId", publishId);
+            articleMap.put("isAuthorization", isAuthorization);// 是否授权
+            articleMap.put("isReserve", isReserve);
+            articleMap.put("isJoinActive", isJoinActive);
+            articleMap.put("automaticName", automaticName);
+            articleMap.put("introduction", introduction);
+            if (ids == null || "".equals(ids)) {
+                articleMap.put("adId", "");
+            } else {
+                articleMap.put("adId", ids);
+            }
+            pageData.put("articleInfo", articleMap);
+
+            int indexOf = articlePublishTrack.getPublishViewUrl().indexOf(".com");
+            String ossViewUrl = articlePublishTrack.getPublishViewUrl().substring(indexOf + 5,
+                    articlePublishTrack.getPublishViewUrl().length());
+            indexOf = articlePublishTrack.getBackgroundEditUrl().indexOf(".com");
+            String ossEditUrl = articlePublishTrack.getBackgroundEditUrl().substring(indexOf + 5,
+                    articlePublishTrack.getBackgroundEditUrl().length());
+            LOGGER.info(ossViewUrl + "-------------" + ossEditUrl);
+            OSSUtil.deleteFile(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID, PropertiesConstants.OSSKEY,
+                    PropertiesConstants.BUCKETNAME, ossViewUrl);
+            OSSUtil.deleteFile(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID, PropertiesConstants.OSSKEY,
+                    PropertiesConstants.BUCKETNAME, ossEditUrl);
+
+            String delViewPath = viewPath.replace(viewHtmlName[viewHtmlName.length - 1], "");
+            String delEditPath = editPath.replace(editHtmlName[editHtmlName.length - 1], "");
+            FreemakerUtil.deleteFiles(PropertiesConstants.FILE_PATH + delViewPath,
+                    viewHtmlName[viewHtmlName.length - 1]);
+            FreemakerUtil.deleteFiles(PropertiesConstants.FILE_PATH + delEditPath,
+                    editHtmlName[editHtmlName.length - 1]);
+            LOGGER.info("本地后台删除的文章的路径：[{}]，名称：[{}]，本地后台删除的文章的编辑路径：[{}]]，名称：[{}]",
+                    PropertiesConstants.FILE_PATH + delViewPath, viewHtmlName[viewHtmlName.length - 1],
+                    PropertiesConstants.FILE_PATH + delEditPath, editHtmlName[editHtmlName.length - 1]);
+
+            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_VIEW_PATH,
+                    PropertiesConstants.FILE_PATH + viewPath, pageData);
+            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_EDIT_PATH,
+                    PropertiesConstants.FILE_PATH + editPath, pageData);
+            // 把静态页上传到oss
+            OSSUtil.uploadFileHtml(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID,
+                    PropertiesConstants.OSSKEY, PropertiesConstants.BUCKETNAME,
+                    PropertiesConstants.FILE_PATH + viewPath, PropertiesConstants.OSSPATH + viewPath);
+            OSSUtil.uploadFileHtml(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID,
+                    PropertiesConstants.OSSKEY, PropertiesConstants.BUCKETNAME,
+                    PropertiesConstants.FILE_PATH + editPath, PropertiesConstants.OSSPATH + editPath);
+
+            String articleViewUrl = PropertiesConstants.OSS_URL + PropertiesConstants.OSSPATH + viewPath; // cdn路径
+            // 生产
+//			String articleEditUrl = PropertiesConstants.OSS_URL_HTTPS +
+//		    PropertiesConstants.OSSPATH + editPath; // cdn路径
+            // 测试
+            String articleEditUrl = PropertiesConstants.OSS_URL + PropertiesConstants.OSSPATH + editPath;
+            LOGGER.info("articleEditUrl[{}]===============", articleEditUrl);
+
+            /**************************** 生成静态页结束 ************************************/
+            // 保存文章的原始静态页面路径
+            resultMap.put("articleEditUrl", articleEditUrl);
+            resultMap.put("articleViewUrl", articleViewUrl);
+            resultMap.put("versionNumber", versionNumber);
+            LOGGER.info("生成静态页面的versionNumber为{}", versionNumber);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new BusinessException("系统繁忙,请稍后再试");
+        }
+        msg.setObject(resultMap);
+        return msg;
+    }
+
+    /**
+     * 生成静态页面路径
+     */
+    @Override
+    public Message getHtmlUrl(Integer articleId, String shareTitle, String shareImgUrl, String shareDes,
+                              String articleContent, String ids, String publishId, String companyId, String isAuthorization,
+                              String isReserve, String automaticName, String introduction, String isJoinActive) {
+        Message msg = new Message();
+        Map<String, String> resultMap = new HashMap<String, String>();
+        /*************** 根据链接爬文章***********start ****************************/
+        LOGGER.info(
+                "调用生成静态页面参数articleId[{}],shareTitle[{}],shareImgUrl[{}],shareDes[{}],ids[{}],publishId[{}],companyId[{}],isAuthorization[{}],isReserve[{}],automaticName[{}],introduction[{}],isJoinActive[{}]",
+                articleId, shareTitle, shareImgUrl, shareDes, ids, publishId, companyId, isAuthorization, isReserve,
+                automaticName, introduction, isJoinActive);
+        try {
+            /**************************** 生成静态页开始 ************************************/
+            Configuration conf = new Configuration();
+            Map<String, Object> pageData = new HashMap<String, Object>();
+            Map<String, String> articleMap = new HashMap<String, String>();
+            // 时间戳
+            String versionNumber = DateUtil.currentDate(DateUtil.yyyyMMddHHmmssSSS) + RandomUtils.randomNumber(3);
+            // 封装数据
+            articleMap.put("shareTitle", shareTitle);
+            articleMap.put("shareImgUrl", shareImgUrl);
+            articleMap.put("shareDes", shareDes);
+            articleMap.put("articleId", String.valueOf(articleId));
+            articleMap.put("articleContent", articleContent);
+            articleMap.put("companyId", companyId);
+            articleMap.put("versionNumber", versionNumber);
+            articleMap.put("publishId", publishId);
+            articleMap.put("isAuthorization", isAuthorization);// 是否授权
+            articleMap.put("isReserve", isReserve);
+            articleMap.put("isJoinActive", isJoinActive);
+            articleMap.put("automaticName", automaticName);
+            articleMap.put("introduction", introduction);
+            if (ids == null || "".equals(ids)) {
+                articleMap.put("adId", "");
+            } else {
+                articleMap.put("adId", ids);
+            }
+
+            pageData.put("articleInfo", articleMap);
+            // 静态页生成路径
+            String viewPath = PathUtil.getArticleViewUrl(versionNumber, String.valueOf(articleId));
+            String editPath = PathUtil.getArticleEditUrl(versionNumber, articleId + versionNumber.substring(8, 14));
+            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_VIEW_PATH,
+                    PropertiesConstants.FILE_PATH + viewPath, pageData);
+            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_EDIT_PATH,
+                    PropertiesConstants.FILE_PATH + editPath, pageData);
+            // 把静态页上传到oss
+            OSSUtil.uploadFileHtml(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID,
+                    PropertiesConstants.OSSKEY, PropertiesConstants.BUCKETNAME,
+                    PropertiesConstants.FILE_PATH + viewPath, PropertiesConstants.OSSPATH + viewPath);
+            OSSUtil.uploadFileHtml(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID,
+                    PropertiesConstants.OSSKEY, PropertiesConstants.BUCKETNAME,
+                    PropertiesConstants.FILE_PATH + editPath, PropertiesConstants.OSSPATH + editPath);
+
+            String articleViewUrl = PropertiesConstants.OSS_URL + PropertiesConstants.OSSPATH + viewPath; // cdn路径
+            // 生产
+//			String articleEditUrl = PropertiesConstants.OSS_URL_HTTPS +
+//		    PropertiesConstants.OSSPATH + editPath; // cdn路径
+            // 测试
+            String articleEditUrl = PropertiesConstants.OSS_URL + PropertiesConstants.OSSPATH + editPath;
+            LOGGER.info("articleEditUrl[{}]===============", articleEditUrl);
+
+            /**************************** 生成静态页结束 ************************************/
+            // 保存文章的原始静态页面路径
+            resultMap.put("articleEditUrl", articleEditUrl);
+            resultMap.put("articleViewUrl", articleViewUrl);
+            resultMap.put("versionNumber", versionNumber);
+            LOGGER.info("生成静态页面的versionNumber为{}", versionNumber);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new BusinessException("系统繁忙,请稍后再试");
+        }
+        msg.setObject(resultMap);
+        return msg;
+    }
+
+    /**
+     * 检查是否有工号
+     */
+    @Override
+    public void checkJobNumber(Integer articleId, String articleName, String listPicUrl, String ids, String publishId,
+                               String companyId, String jobNumber, String userId, String createUser, String editUrl, String viewUrl,
+                               String versionNumber) {
+        String createDate = DateUtil.currentDate();
+        String createTime = DateUtil.currentTime();
+
+        if (jobNumber != null && !"".equals(jobNumber)) {
+            LOGGER.info("导入文章开始存入redis");
+            // 后台管理有userId 文章信息才存入发布表
+            ArticlePublishTrack articlePublishTrack = new ArticlePublishTrack();
+            articlePublishTrack.setPublishId(publishId);
+            articlePublishTrack.setUserId(userId);
+            articlePublishTrack.setArticleId(String.valueOf(articleId));
+            articlePublishTrack.setAdId(ids);// 广告id
+            articlePublishTrack.setPublishState("0");
+            articlePublishTrack.setBackgroundEditUrl(editUrl);
+            articlePublishTrack.setPublishViewUrl(viewUrl);
+            articlePublishTrack.setCompanyId(companyId);
+            articlePublishTrack.setCreateDate(createDate);
+            articlePublishTrack.setCreateTime(createTime);
+            articlePublishTrack.setCreateUser(createUser);
+            articlePublishTrack.setArticleVersion(versionNumber);
+            articlePublishTrack.setUpdateDate(createDate);
+            articlePublishTrack.setUpdateTime(createTime);
+            articlePublishTrack.setUpdateUser(createUser);
+            LOGGER.info("存入publishTrack表中的versionNumber为{}", articlePublishTrack.getArticleVersion());
+            int count2 = articlePublishTrackMapper.insertSelective(articlePublishTrack);
+            LOGGER.info("存入publishTrack表之后返回的数据为{},publishId为{}", Integer.valueOf(count2), publishId);
+            if (count2 == 0) {
+                LOGGER.info("根据链接发布文章,文章存入发布表失败");
+                throw new BusinessException("系统繁忙,请稍后再试");
+            }
+            /*
+             * // 存入redis RedisPublishedArticleInfo redisArticleInfo = new
+             * RedisPublishedArticleInfo(); redisArticleInfo.setPublishId(publishId);
+             * redisArticleInfo.setArticleId(String.valueOf(articleId));
+             * redisArticleInfo.setArticleName(articleName);
+             * redisArticleInfo.setListPicUrl(listPicUrl); //
+             * redisArticleInfo.setPublishEditUrl(editUrl);
+             * redisArticleInfo.setPublishViewUrl(viewUrl);
+             * redisArticleInfo.setCreateDate(createDate);
+             * redisArticleInfo.setVisitorCount("0"); redisArticleInfo.setSharedCount("0");
+             * redisArticleInfo.setAdId(ids); redisArticleInfo.setCardId(""); boolean
+             * saveAPT = false; saveAPT = redisManager.saveAPT(userId,
+             * String.valueOf(articleId), JsonUtil.objectToJackson(redisArticleInfo)); if
+             * (!saveAPT) { LOGGER.info("发布文章时，存入文章的展示记录到redis失败！"); }
+             * LOGGER.info("导入文章结束存入redis");
+             */
+        }
+    }
+
+    @SuppressWarnings({"unchecked", "rawtypes"})
+    @Override
+    public PageDTO queryBranchIdArticle(String companyId, String branchId, Integer startRow, Integer rows) {
+        List userlist = new ArrayList<>();
+        List<BranchIdArticle> balist = new ArrayList<>();
+        CmsSysUserExample example = new CmsSysUserExample();
+        CmsSysUserExample.Criteria criteria = example.createCriteria();
+        criteria.andCompanyIdEqualTo(companyId);
+        criteria.andBranchIdLike("%" + branchId + "%");
+        // 查询该渠道该公司下的后台管理用户
+        List<CmsSysUser> CmsSysUserList = cmsSysUserMapper.selectByExample(example);
+        for (CmsSysUser c : CmsSysUserList) {
+            String userId = c.getUserId();
+            LOGGER.info("分公司文章列表后台管理员userId[{}]", userId);
+            userlist.add(userId);
+        }
+        // 查该公司下所有文章版本
+        List<ArticlePublishTrack> articleIdList = articlePublishTrackQueryMapper.queryArticleIdByUserId(userlist,
+                startRow, rows);
+        for (ArticlePublishTrack ap : articleIdList) {
+            ArticleInfo articleInfo = articleMapper.selectByPrimaryKey(Integer.valueOf(ap.getArticleId()));
+            BranchIdArticle branchIdArticle = new BranchIdArticle();
+            branchIdArticle.setArticleId(ap.getArticleId());
+            branchIdArticle.setArticleName(articleInfo.getArticleName());
+            branchIdArticle.setCreateDate(articleInfo.getCreateDate());
+            branchIdArticle.setLibraryState(ap.getLibraryState());
+            branchIdArticle.setUpdateDate(articleInfo.getUpdateDate());
+            branchIdArticle.setPublishId(ap.getPublishId());
+            branchIdArticle.setName(ap.getCreateUser());
+            LOGGER.info("getArticleVersion为{}", ap.getArticleVersion());
+            branchIdArticle.setArticleVersion(ap.getArticleVersion());
+            balist.add(branchIdArticle);
+        }
+        PageDTO pageDTO = new PageDTO();
+        pageDTO.setStartRow(startRow);
+        pageDTO.setDataRows(balist);
+        int count = articlePublishTrackQueryMapper.countArticleIdByUserId(userlist);
+        pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
+        pageDTO.setRecords(count);
+
+        return pageDTO;
+    }
+
+    @Override
+    public Message delArticleInfo(String id) {
+        LOGGER.info("文章列表的删除功能的业务层方法开始！");
+        String updateDate = DateUtil.currentDate();
+        String updateTime = DateUtil.currentTime();
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String updateUser = userInfoDTO.getUserId();
+        LOGGER.info("管理员updateUser【{}】文章列表的删除功能的业务层方法中拿到的文章的id【{}】", updateUser, id);
+        Message msg = new Message();
+        if (StringUtils.isBlank(id)) {
+            LOGGER.info("文章列表的删除功能的删除文章信息失败，缺少参数");
+            throw new ParameterException("未查询到文章信息");
+        }
+        msg.setInfo("删除失败！");
+        msg.setResult(false);
+        Boolean deleteState = true;
+        try {
+            String[] arrId = id.split(",");
+            for (String articleId : arrId) {
+                if (StringUtils.isNotBlank(articleId)) {
+                    // 先查该articleid在publish表中是否有数据
+                    List<ArticlePublishTrack> list = articlePublishTrackQueryMapper.queryArticleinfo(articleId);
+                    LOGGER.info("在发布表中查询到的结果【{}】", list.size());
+                    if (list.size() > 0) {
+                        for (ArticlePublishTrack articlePublishTrack : list) {
+                            if ("0".equals(articlePublishTrack.getPublishState())) {
+                                deleteState = false;
+                                msg.setInfo("文章在创建文章中有收录,请先删除创建文章中版本！");
+                                msg.setResult(false);
+                                return msg;
+                            }
+                        }
+                    }
+                    if (deleteState) {
+                        ArticleInfo articleinfo = articleMapper.selectByPrimaryKey(Integer.valueOf(articleId));
+                        // 删除的是publish表中的publish_state
+                        articleinfo.setUpdateDate(updateDate);
+                        articleinfo.setUpdateTime(updateTime);
+                        articleinfo.setArticleState("1");
+                        if (articleMapper.updateByPrimaryKey(articleinfo) > 0) {
+                            msg.setInfo("文章删除成功！");
+                            msg.setResult(true);
+                            LOGGER.info("管理员【{}】文章articleId【{}】删除成功！", updateUser, articleId);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            LOGGER.info("删除文章信息失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除失败，请稍候再试！");
+            msg.setResult(true);
+        }
+        LOGGER.info("删除文章信息的业务层方法结束！");
+        return msg;
+    }
+
+    @Override
+    public Message articleUrlCopy(String articleId, String userId, String publishId1) {
+        LOGGER.info("生成文章链接的业务层方法开始！");
+        LOGGER.info("生成文章链接的业务层方法中拿到的文章的articleId[{}],userId[{}]", articleId, userId);
+        Message msg = new Message(true, "生成文章链接成功");
+
+        String publishId = userId + "a" + articleId;
+        ArticlePublishTrack articlePublishTrack = this.articlePublishTrackMapper.selectByPrimaryKey(publishId1);
+        String viewUrl = articlePublishTrack.getPublishViewUrl();
+
+        String companyId = "1";
+
+        String parentClickId = "0";
+        String parentPublishId = publishId;
+        String parentUserId = userId;
+        String isAuthorization = "0";
+        String from = "singlemessage";
+        String[] viewUrls = viewUrl.split("/");
+        String url = viewUrls[(viewUrls.length - 1)];
+        String[] urls = url.split("b");
+        String url1 = urls[(urls.length - 1)];
+        String versionNumber = url1.substring(0, 20);
+        String forwardTimestamp = String.valueOf(System.currentTimeMillis());
+
+        String shareViewUrl = viewUrl + "?publishId=" + publishId + "&parentClickId=" + parentClickId
+                + "&versionNumber=" + versionNumber + "&parentPublishId=" + parentPublishId + "&parentUserId="
+                + parentUserId + "&companyId=" + companyId + "&isAuthorization=" + isAuthorization + "&from=" + from
+                + "&forwardTimestamp=" + forwardTimestamp + "&articleId=" + articleId;
+        msg.setObject(shareViewUrl);
+        LOGGER.info("生成文章链接的业务层方法结束！");
+        return msg;
+    }
+
+    public String registeQyhUrl(String articleUrl) {
+        Map result = new HashMap();
+        String state = "";
+        String qyhArticleUrl = "";
+        String getUrl = PropertiesConstants.GVQYH_ARTICLE_WRITE + articleUrl;
+        try {
+            String json = HttpUtil.get(getUrl);
+            LOGGER.info("企业号注册链接接口返回报文为【{}】", json);
+            if (StringUtils.isNotBlank(json)) {
+                result = JsonUtil.jackson2Map(json);
+                if ("suc".equals(result.get("result_code"))) {
+                    String resultMsg = (String) result.get("result_msg");
+                    state = resultMsg.split("_")[1].substring(0, 5);
+                    LOGGER.info("链接标识state[{}]", state);
+                    qyhArticleUrl = PropertiesConstants.GVQYH_INDEX + state;
+                } else {
+                    state = (String) result.get("result_msg");
+                    LOGGER.info("文章企业号链接注册失败，返回信息为：【{}】", state);
+                }
+            }
+        } catch (Exception e) {
+            LOGGER.info("执行http请求，发生异常。异常信息如下：", e.getMessage());
+            throw new BusinessException("系统正在维护中，请稍后再试");
+        }
+        String json;
+        return qyhArticleUrl;
+    }
+
+    @Override
+    public Message delHTML(String ids) {
+        Message message = new Message();
+        try {
+            CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+            String updateUser = userInfoDTO.getUserId();
+            LOGGER.info("管理员updateUser【{}】删除文章信息的业务层方法中拿到的文章的publishId【{}】", updateUser, ids);
+
+            CmsSysUserExample example = new CmsSysUserExample();
+            CmsSysUserExample.Criteria criteria = example.createCriteria();
+            criteria.andUserIdLike("%" + updateUser + "%");
+
+            List<CmsSysUser> CmsSysUserList = cmsSysUserMapper.selectByExample(example);
+
+            String branchId = "";
+            for (CmsSysUser cmsSysUser : CmsSysUserList) {
+                branchId = cmsSysUser.getBranchId();
+                LOGGER.info("删除HTML的branchId为【{}】", cmsSysUser.getBranchId());
+                LOGGER.info("删除HTML的userId为【{}】", cmsSysUser.getUserId());
+            }
+            Boolean deleteState = Boolean.valueOf(true);
+            String[] split = ids.split(",");
+            for (int i = 0; i < split.length; i++) {
+                String publishId = split[i];
+
+                if (StringUtils.isNotBlank(publishId)) {
+                    List<ArticleChannel> articleChannelList = this.articleChannelQueryMapper
+                            .queryByPublishId(publishId);
+                    LOGGER.info("在文库中查询到的结果【{}】", Integer.valueOf(articleChannelList.size()));
+                    if (articleChannelList.size() > 0) {
+                        for (ArticleChannel articleChannel : articleChannelList) {
+                            if (!"1".equals(articleChannel.getArticleState())) {
+                                deleteState = Boolean.valueOf(false);
+                                message.setInfo("文章【" + articleChannel.getArticleName() + "】在文库中有发布请先删除文库中版本！");
+                                message.setResult(false);
+                                return message;
+                            }
+                        }
+                    }
+                    if (deleteState.booleanValue()) {
+                        ArticlePublishTrack selectByPrimaryKey = this.articlePublishTrackMapper
+                                .selectByPrimaryKey(publishId);
+                        String publishViewUrl = selectByPrimaryKey.getPublishViewUrl();
+                        int indexOf = publishViewUrl.indexOf(".com");
+                        String ossUrl = publishViewUrl.substring(indexOf + 5, publishViewUrl.length());
+                        LOGGER.info("删除HTML的ossUrl【{}】", ossUrl);
+                        String publishUserId2 = selectByPrimaryKey.getUserId();
+                        CmsSysUserExample example1 = new CmsSysUserExample();
+                        CmsSysUserExample.Criteria criteria1 = example1.createCriteria();
+                        CmsSysUserExample.Criteria publishAndUserIdEqualTo = criteria1.andUserIdEqualTo(publishUserId2);
+                        List<CmsSysUser> selectByExample1 = this.cmsSysUserMapper.selectByExample(example);
+                        for (CmsSysUser cmsSysUser1 : selectByExample1) {
+                            String publishBranchId = cmsSysUser1.getBranchId();
+                            if ((branchId.equals(publishBranchId)) || (publishBranchId.equals("86"))) {
+                                int deleteByPrimaryKey = this.articlePublishTrackMapper.deleteByPrimaryKey(publishId);
+                                if (deleteByPrimaryKey > 0) {
+                                    LOGGER.info("删除发布表数据成功");
+                                    OSSUtil.deleteFile(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID,
+                                            PropertiesConstants.OSSKEY, PropertiesConstants.BUCKETNAME, ossUrl);
+                                } else {
+                                    LOGGER.info("删除发布表数据失败");
+                                    message.setInfo("删除数据失败");
+                                    message.setResult(false);
+                                    return message;
+                                }
+                            } else {
+                                message.setInfo("当前用户没有权限");
+                                message.setResult(false);
+                                message.setObject("");
+                            }
+                        }
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            message.setInfo("删除数据失败");
+            message.setResult(false);
+            message.setObject(e.getMessage());
+            return message;
+        }
+        message.setInfo("删除数据成功");
+        message.setResult(true);
+        return message;
+    }
+
+    @Override
+    public Message getArticleContent(String createUser, String author, String ids, String isAuthorization,
+                                     String isReserve, String automaticName, String introduction, String labelIds, String isJoinActive,
+                                     String articleName, String shareImgUrl, String shareDes, String articleContent) {
+        Message msg = new Message();
+        Map<String, String> resultMap = new HashMap<String, String>();
+        /*************** 根据链接爬文章***********start ****************************/
+        LOGGER.info(
+                "根据文章链接获取文章内容,参数createUser[{}],author[{}],ids[{}],isAuthorization[{}],isReserve[{}],automaticName[{}],introduction[{}],isJoinActive[{}]",
+                createUser, author, ids, isAuthorization, isReserve, automaticName, introduction, isJoinActive);
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String companyId = userInfoDTO.getCompanyId();// 渠道id
+        String email = userInfoDTO.getEmail();
+        // 根据登录人查询登录信息（shiro里有缓存数据不是最新）
+        CmsSysUser cmsSysUser = cmsSysUserExMapper.queryLoginInfoByEmail(email);
+        // 此时后台管理员
+        String userId = cmsSysUser.getUserId();
+
+        String createDate = DateUtil.currentDate();
+        String createTime = DateUtil.currentTime();
+        LOGGER.info(
+                "导入文章相关信息：【listPicUrl:{},articleName:{},shareTitle:{},shareImgUrl:{},shareDes:{},articleContent:{},createDate:{},createTime:{}】",
+                new Object[]{shareImgUrl, articleName, articleName, shareImgUrl, shareDes, articleContent, createDate,
+                        createTime});
+
+        ArticleInfo article = new ArticleInfo();
+        article.setArticleAuthor(userInfoDTO.getName() + "");
+        article.setArticleName(articleName);
+        article.setOriginalUrl("0");
+        article.setShareImgUrl(shareImgUrl);
+        article.setShareTitle(articleName);
+        article.setShareDes(shareDes);
+        article.setListPicUrl(shareImgUrl);
+        article.setCreateUser(createUser);
+        article.setCompanyId(companyId);
+        article.setCreateDate(createDate);
+        article.setCreateTime(createTime);
+
+        int cont = articleMapper.insertSelective(article);
+        if (cont == 0) {
+            LOGGER.info("插入新文章失败");
+            throw new BusinessException("系统繁忙,请稍后再试");
+        }
+
+        // 文章id
+        Integer articleId = article.getArticleId();
+        // 文章的发布id
+        String publishId = userId + "a" + articleId;
+
+        msg = this.getHtmlUrl(articleId, articleName, shareImgUrl, shareDes, articleContent, ids, publishId, companyId,
+                isAuthorization, isReserve, automaticName, introduction, isJoinActive);
+        Map<String, String> resultMap1 = new HashMap<String, String>();
+        resultMap1 = (Map<String, String>) msg.getObject();
+        String modifiedEditUrl = resultMap1.get("articleEditUrl");
+        String modifiedViewUrl = resultMap1.get("articleViewUrl");
+        String versionNumber = (String) resultMap1.get("versionNumber");
+
+        resultMap.put("articleEditUrl", modifiedEditUrl);
+        resultMap.put("articleViewUrl", modifiedViewUrl);
+        // article_info 中modified两个字段自判断是否后台导入过，第一次存值后不再更新
+        article.setModifiedEditUrl(modifiedEditUrl);
+        article.setModifiedViewUrl(modifiedViewUrl);
+        LOGGER.info("存放静态页面路径modifiedEditUrl[{}],modifiedViewUrl[{}]", modifiedEditUrl, modifiedViewUrl);
+        int count1 = articleMapper.updateByPrimaryKeySelective(article);
+        if (count1 == 0) {
+            LOGGER.info("原始静态页面路径入库失败");
+            throw new BusinessException("系统繁忙,请稍后再试");
+        }
+        // 后台管理员工号
+        String jobNumber = cmsSysUser.getJobNumber();
+        LOGGER.info("当前用户工号为jobNumber【{}】", jobNumber);
+        LOGGER.info("获取到的versionNumber2为{}", versionNumber);
+        // 存文章和标签的关系
+        articleLabelServiceImpl.addlabel(String.valueOf(articleId), labelIds);
+        this.checkJobNumber(articleId, articleName, shareImgUrl, ids, publishId, companyId, jobNumber, userId,
+                userInfoDTO.getName() + "", modifiedEditUrl, modifiedViewUrl, versionNumber);
+        msg.setInfo("成功导入文章!");
+        msg.setResult(true);
+        msg.setObject(resultMap);
+        return msg;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
new file mode 100644
index 000000000..e04c8f2f7
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
@@ -0,0 +1,578 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.domain.BaseCode;
+import com.ruoyi.content.domain.BaseCodeExample;
+import com.ruoyi.content.domain.BaseCodeTree;
+import com.ruoyi.content.exception.ParameterException;
+import com.ruoyi.content.mapper.BaseCodeExMapper;
+import com.ruoyi.content.mapper.BaseCodeMapper;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.redis.RedisManager;
+import com.ruoyi.content.service.BaseCodeService;
+import com.ruoyi.content.utils.DateUtil;
+import com.ruoyi.content.utils.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 说明：基础数据查询实现
+ *
+ * @author wang.q
+ * @date 2017年8月25日
+ */
+@Service
+public class BaseCodeServiceImpl implements BaseCodeService {
+    private static final Logger logger = LoggerFactory.getLogger(BaseCodeServiceImpl.class);
+    @Autowired
+    private BaseCodeMapper baseCodeMapper;
+    @Autowired
+    private BaseCodeExMapper baseCodeExMapper;
+    @Autowired
+    private RedisManager redisManager;
+
+    /**
+     * 根据type类型查询基础数据
+     */
+    @Override
+    public List<BaseCode> queryBaseCodeByType(String codeType) {
+        logger.info("进入查询基础数据的方法");
+        String companyId = "1";//公司id
+        String branchId = "86";
+        // 首先判断代码类型是否为空
+        if (StringUtils.isBlank(codeType)) {
+            logger.info("根据代码类型数据字典--参数为空codeType【{}】", codeType);
+            return new ArrayList<BaseCode>();
+        }
+        logger.info("根据代码类型数据字典--参数codeType【{}】", codeType);
+        List<BaseCode> list = null;
+        BaseCodeExample example = new BaseCodeExample();
+        BaseCodeExample.Criteria criteria = example.createCriteria();
+        criteria.andCodeTypeEqualTo(codeType);
+        criteria.andStateEqualTo("0");
+        criteria.andCompanyIdEqualTo(companyId);
+        criteria.andBranchIdLike("%" + branchId + "%");
+        example.setOrderByClause("ORDER_NO");
+        list = baseCodeMapper.selectByExample(example);
+        logger.info("查询基础数据结束，查询到的结果为【{}】" + JsonUtil.objectToJackson(list));
+        logger.info("查询基础数据的方法结束！");
+        return list;
+    }
+
+    /**
+     * 保存栏目信息
+     */
+    @Override
+    public Message saveBaseCode(BaseCode baseCode) {
+        logger.info("进入保存栏目信息的业务方法。");
+        if (baseCode == null || StringUtils.isBlank(baseCode.getCodeType())
+                || StringUtils.isBlank(baseCode.getCodeCname())) {
+            logger.info("创建基础数据失败，参数不足【{}】", JsonUtil.objectToJackson(baseCode));
+            throw new ParameterException("创建失败，参数不足！");
+        }
+        logger.info("创建基础数据的参数【{}】", JsonUtil.objectToJackson(baseCode));
+        String companyId = "1";
+        Message msg = new Message();
+        try {
+            // 获取当前code最大值
+            BaseCodeExample example = new BaseCodeExample();
+            //Criteria criteria = example.createCriteria();
+            //criteria.andCodeTypeEqualTo(baseCode.getCodeType());
+            //criteria.andCompanyIdEqualTo(companyId);
+            logger.info("查询codecode");
+            example.setOrderByClause(" ID*1 DESC ");
+            List<BaseCode> list = baseCodeMapper.selectByExample(example);
+            logger.info("list:" + JsonUtil.objectToJackson(list));
+            if (list != null && list.size() > 0) {
+                String code = list.get(0).getId().toString();
+                baseCode.setCodeCode((Integer.parseInt(code) + 1) + "");
+            } else {
+                baseCode.setCodeCode("1");
+            }
+            //更新刚创建的栏目的序号
+            BaseCodeExample exampleOrder = new BaseCodeExample();
+            exampleOrder.createCriteria().andCodeTypeEqualTo(baseCode.getCodeType())
+                    .andCompanyIdEqualTo(companyId);
+            Integer orderNo = baseCodeMapper.countByExample(exampleOrder) + 1;
+            logger.info("查询出来的总数：" + orderNo);
+            baseCode.setOrderNo(orderNo.toString());
+            baseCode.setState("0");
+            baseCode.setCompanyId(companyId);
+            baseCode.setCreateTime(DateUtil.getDate());
+            baseCode.setCreateUser("");
+            int result = baseCodeMapper.insert(baseCode);
+            if (result > 0) {
+                if ("86".equals(baseCode.getBranchId())) {
+                    Set<byte[]> baseCodeKeys = redisManager.queryByVague("baseCode_companyId" + companyId + "_branchId" + "*");
+                    for (byte[] baseCodeKey : baseCodeKeys) {
+                        redisManager.delete(baseCodeKey);
+                    }
+                } else {
+                    String delCodeType = null;
+                    logger.info("查询到的codeType：" + baseCode.getCodeType());
+                    try {
+                        Integer.parseInt(baseCode.getCodeType());//如果codeType能转成数字说明是三级栏目
+                        BaseCodeExample example1 = new BaseCodeExample();
+                        BaseCodeExample.Criteria createCriteria = example1.createCriteria();
+                        createCriteria.andCodeCodeEqualTo(baseCode.getCodeType());
+                        List<BaseCode> basecodeEx = baseCodeMapper.selectByExample(example1);
+                        delCodeType = basecodeEx.get(0).getCodeType();
+                    } catch (Exception e) {
+                        delCodeType = baseCode.getCodeType();
+                    }
+                    logger.info("删除的redis的key是：" + "baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
+                    redisManager.delete("baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
+
+
+                    //redisManager.delete("baseCode_companyId"+companyId+"_branchId"+baseCode.getBranchId()+"_"+baseCode.getCodeType());
+                }
+                msg.setInfo("创建成功！");
+                msg.setResult(true);
+                HashMap<String, String> returnCode = new HashMap<String, String>();
+                returnCode.put("codeCode", baseCode.getCodeCode());
+                msg.setObject(returnCode);
+                // 触发更新redis
+            } else {
+                logger.info("栏目插入数据库失败");
+                msg.setInfo("创建失败！");
+                msg.setResult(false);
+            }
+        } catch (Exception e) {
+            logger.info("添加栏目异常【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("系统异常，请稍后再试！");
+            msg.setResult(false);
+        }
+        logger.info("保存栏目信息的业务方法结束。");
+        return msg;
+    }
+
+    /**
+     * 更新栏目信息
+     */
+    @Override
+    public Message updateBaseCode(BaseCode baseCode) {
+        logger.info("进入更新栏目的业务方法。");
+
+        if (baseCode == null || StringUtils.isBlank(String.valueOf(baseCode.getId())) || StringUtils.isBlank(baseCode.getCodeCname())) {
+            logger.info("更新栏目失败，数据不完整【{}】", JsonUtil.objectToJackson(baseCode));
+            throw new ParameterException("栏目更新失败，参数不足！");
+        }
+        String companyId = "1";//公司id
+        Message msg = new Message();
+        try {
+            // 查询是否存在相同类型的code值
+            BaseCodeExample example = new BaseCodeExample();
+            BaseCodeExample.Criteria criteria = example.createCriteria();
+            criteria.andCodeTypeEqualTo(baseCode.getCodeType());
+            criteria.andCodeCodeEqualTo(baseCode.getCodeCode());
+            criteria.andCompanyIdEqualTo(companyId);
+            criteria.andBranchIdEqualTo(baseCode.getBranchId());
+            criteria.andStateEqualTo("0");
+            List<BaseCode> list = baseCodeMapper.selectByExample(example);
+            if (list != null && list.size() > 0 && !list.get(0).getId().equals(baseCode.getId())) {
+                logger.info("更新栏目失败相同类型相同code已经存在有效的数据！【{}】", JsonUtil.objectToJackson(baseCode));
+                msg.setInfo("更新失败，和现有栏目存在冲突，无法更换类型！");
+                msg.setResult(false);
+                return msg;
+            }
+            baseCode.setUpdateTime(DateUtil.getDate());
+            baseCode.setUpdateUser("");
+            int result = baseCodeMapper.updateByPrimaryKeySelective(baseCode);
+            if (result > 0) {
+                if ("86".equals(baseCode.getBranchId())) {
+                    Set<byte[]> baseCodeKeys = redisManager.queryByVague("baseCode_companyId" + companyId + "_branchId" + "*");
+                    for (byte[] baseCodeKey : baseCodeKeys) {
+                        redisManager.delete(baseCodeKey);
+                    }
+                } else {
+                    String delCodeType = null;
+                    logger.info("查询到的codeType：" + baseCode.getCodeType());
+                    try {
+                        Integer.parseInt(baseCode.getCodeType());//如果codeType能转成数字说明是三级栏目
+                        BaseCodeExample example1 = new BaseCodeExample();
+                        BaseCodeExample.Criteria createCriteria = example1.createCriteria();
+                        createCriteria.andCodeCodeEqualTo(baseCode.getCodeType());
+                        List<BaseCode> basecodeEx = baseCodeMapper.selectByExample(example1);
+                        delCodeType = basecodeEx.get(0).getCodeType();
+                    } catch (Exception e) {
+                        delCodeType = baseCode.getCodeType();
+                    }
+                    logger.info("删除的redis的key是：" + "baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
+                    redisManager.delete("baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
+                    //redisManager.delete("baseCode_companyId"+companyId+"_branchId"+baseCode.getBranchId()+"_"+baseCode.getCodeType());
+                }
+                msg.setInfo("更新栏目成功！");
+                msg.setResult(true);
+                // 触发更新redis
+
+            } else {
+                logger.info("栏目更新数据库失败");
+                msg.setInfo("更新失败！");
+                msg.setResult(false);
+            }
+        } catch (Exception e) {
+            logger.info("更新栏目异常【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("更新栏目异常，请稍候再试！");
+            msg.setResult(false);
+        }
+        logger.info("更新栏目的业务方法结束。");
+        return msg;
+    }
+
+    /**
+     * 修改栏目状态
+     */
+    @Override
+    public Message queryBaseCode(String ids) {
+        String companyId = "1";
+        logger.info("进入修改栏目信息的业务方法。");
+        if (StringUtils.isBlank(ids)) {
+            logger.info("更新栏目失败，参数不足 ids【{}】", ids);
+            throw new ParameterException("栏目更新失败，参数不足！");
+        }
+        Message msg = new Message();
+        try {
+            String[] arr = ids.split(",");
+            for (String id : arr) {
+                if (StringUtils.isNotBlank(id)) {
+                    BaseCode baseCode = baseCodeMapper.selectByPrimaryKey(Integer.valueOf(id));
+                    String state = baseCode.getState();
+                    if ("0".equals(state)) {
+                        baseCode.setState("1");
+                    } else {
+                        baseCode.setState("0");
+                    }
+                    //标志位0:有效1:无效
+                    baseCode.setUpdateTime(DateUtil.getDate());
+                    baseCode.setUpdateUser("");
+                    baseCodeMapper.updateByPrimaryKey(baseCode);
+                    if (baseCodeMapper.updateByPrimaryKey(baseCode) > 0) {
+                        if ("86".equals(baseCode.getBranchId())) {
+                            Set<byte[]> baseCodeKeys = redisManager.queryByVague("baseCode_companyId" + companyId + "_branchId" + "*");
+                            for (byte[] baseCodeKey : baseCodeKeys) {
+                                redisManager.delete(baseCodeKey);
+                            }
+                        } else {
+
+                            String delCodeType = null;
+                            logger.info("查询到的codeType：" + baseCode.getCodeType());
+                            try {
+                                Integer.parseInt(baseCode.getCodeType());//如果codeType能转成数字说明是三级栏目
+                                BaseCodeExample example = new BaseCodeExample();
+                                BaseCodeExample.Criteria createCriteria = example.createCriteria();
+                                createCriteria.andCodeCodeEqualTo(baseCode.getCodeType());
+                                List<BaseCode> basecodeEx = baseCodeMapper.selectByExample(example);
+                                delCodeType = basecodeEx.get(0).getCodeType();
+                            } catch (Exception e) {
+                                delCodeType = baseCode.getCodeType();
+                            }
+
+                            logger.info("删除的redis的key是：" + "baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
+                            redisManager.delete("baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
+                            //redisManager.delete("baseCode_companyId"+companyId+"_branchId"+baseCode.getBranchId()+"_"+baseCode.getCodeType());
+                        }
+                        msg.setInfo("成功修改栏目状态。");
+                        msg.setResult(true);
+                        logger.info("成功修改栏目状态！");
+                        //"baseCode_companyId"+companyId+"_branchId"+branch+"_"+codeType
+                    } else {
+                        msg.setInfo("修改栏目状态失败。");
+                        msg.setResult(false);
+                        logger.info("修改栏目状态失败！");
+                    }
+
+                } else {
+                    msg.setInfo("修改栏目状态失败。");
+                    msg.setResult(false);
+                    logger.info("修改栏目状态失败！");
+                }
+            }
+
+        } catch (Exception e) {
+            logger.info("修改栏目状态异常【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("修改栏目状态失败！");
+            msg.setResult(false);
+        }
+        logger.info("修改栏目状态的业务方法结束。");
+        return msg;
+    }
+
+    /**
+     * 删除栏目信息
+     */
+    @Override
+    public Message delBaseCode(String ids) {
+        String companyId = "1";
+        logger.info("进入删除栏目信息的业务方法。");
+        if (StringUtils.isBlank(ids)) {
+            logger.info("删除栏目失败，参数不足 ids【{}】", ids);
+            throw new ParameterException("栏目删除失败，参数不足！");
+        }
+        Message msg = new Message();
+        try {
+            String[] arr = ids.split(",");
+            for (String id : arr) {
+                if (StringUtils.isNotBlank(id)) {
+                    BaseCode baseCode = baseCodeMapper.selectByPrimaryKey(Integer.valueOf(id));
+//					//标志位0:有效1:无效;2删除
+                    baseCode.setState("2");
+                    baseCode.setUpdateTime(DateUtil.getDate());
+                    baseCode.setUpdateUser("");
+                    baseCodeMapper.updateByPrimaryKey(baseCode);
+                    if (baseCodeMapper.updateByPrimaryKey(baseCode) > 0) {
+                        if ("86".equals(baseCode.getBranchId())) {
+                            Set<byte[]> baseCodeKeys = redisManager.queryByVague("baseCode_companyId" + companyId + "_branchId" + "*");
+                            for (byte[] baseCodeKey : baseCodeKeys) {
+                                redisManager.delete(baseCodeKey);
+                            }
+                        } else {
+                            String delCodeType = null;
+                            logger.info("查询到的codeType：" + baseCode.getCodeType());
+                            try {
+                                Integer.parseInt(baseCode.getCodeType());//如果codeType能转成数字说明是三级栏目
+                                BaseCodeExample example = new BaseCodeExample();
+                                BaseCodeExample.Criteria createCriteria = example.createCriteria();
+                                createCriteria.andCodeCodeEqualTo(baseCode.getCodeType());
+                                List<BaseCode> basecodeEx = baseCodeMapper.selectByExample(example);
+                                delCodeType = basecodeEx.get(0).getCodeType();
+                            } catch (Exception e) {
+                                delCodeType = baseCode.getCodeType();
+                            }
+                            logger.info("删除的redis的key是：" + "baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
+                            redisManager.delete("baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
+                            //redisManager.delete("baseCode_companyId"+companyId+"_branchId"+baseCode.getBranchId()+"_"+baseCode.getCodeType());
+                        }
+                        msg.setInfo("成功删除栏目状态。");
+                        msg.setResult(true);
+                        logger.info("成功删除栏目状态！");
+                    } else {
+                        msg.setInfo("删除栏目状态失败。");
+                        msg.setResult(false);
+                        logger.info("删除栏目状态失败！");
+                    }
+
+                } else {
+                    msg.setInfo("删除栏目状态失败。");
+                    msg.setResult(false);
+                    logger.info("删除栏目状态失败！");
+                }
+            }
+
+        } catch (Exception e) {
+            logger.info("删除栏目状态异常【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除栏目状态失败！");
+            msg.setResult(false);
+        }
+        logger.info("删除栏目状态的业务方法结束。");
+        return msg;
+    }
+
+    /**
+     * 分页查询栏目信息
+     */
+    @Override
+    public List<BaseCode> queryBaseCode(int startRow, int rows, String codeType, String codeCname, String orderNo) {
+        logger.info("进入查询栏目信息的业务方法。");
+        logger.info("查询栏目信息的参数startRow【{}】,rows【{}】,codeType【{}】,codeCname【{}】,orderNo【{}】", startRow, rows, codeType, codeCname, orderNo);
+        List<BaseCode> codeList = null;
+        String companyId = "1";//渠道id
+        String branchId = "86";//分支公司
+        try {
+            codeList = baseCodeExMapper.selectAllWithLimit(companyId, branchId, codeType, codeCname, orderNo, startRow, rows);
+            if (codeList == null || codeList.size() < 1) {
+                logger.info("未查询到基础数据信息【{}】", JsonUtil.objectToJackson(codeList));
+                return codeList;
+            }
+        } catch (Exception e) {
+            logger.info("查询栏目信息的业务方法异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("查询栏目信息的业务方法结束。");
+        return codeList;
+    }
+
+    /**
+     * 查询当前条件下有多少数据
+     */
+    @Override
+    public int countBaseCode(String codeType, String codeCname, String orderNo) {
+        logger.info("进入查询栏目数量的业务方法。");
+        logger.info("查询栏目数量的业务方法拿到参数codeType【{}】，codeCname【{}】，orderNo【{}】", codeType, codeCname, orderNo);
+        String companyId = "1";
+        BaseCodeExample example = new BaseCodeExample();
+        BaseCodeExample.Criteria criteria = example.createCriteria();
+//		criteria.andStateEqualTo("0");
+        List<String> statelist = new ArrayList<String>();
+        statelist.add("0");
+        statelist.add("1");
+        criteria.andStateIn(statelist);
+
+        criteria.andCompanyIdEqualTo(companyId);
+        if (StringUtils.isNotBlank(codeType)) {
+            criteria.andCodeTypeEqualTo(codeType);
+        }
+        if (StringUtils.isNotBlank(codeCname)) {
+            criteria.andCodeTypeLike(codeCname);
+        }
+        if (StringUtils.isNotBlank(orderNo)) {
+            criteria.andOrderNoEqualTo(orderNo);
+        }
+        //example.setOrderByClause(" CODE_TYPE desc,CODE_CODE desc ");
+        List<BaseCode> list = null;
+        try {
+            list = baseCodeMapper.selectByExample(example);
+            if (list == null || list.size() < 1) {
+                logger.info("未查询到栏目数量【{}】", JsonUtil.objectToJackson(list));
+                return 0;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        logger.info("查询栏目数量的业务方法结束。");
+        return list.size();
+    }
+
+    @Override
+    public List<BaseCode> queryColumn() {
+        logger.info("进入查询栏目信息的方法");
+        List<BaseCode> list = null;
+        String companyId = "1";
+        String branchId = "86";
+        BaseCodeExample example = new BaseCodeExample();
+        BaseCodeExample.Criteria criteria = example.createCriteria();
+        criteria.andStateEqualTo("0");
+        criteria.andCompanyIdEqualTo(companyId);
+        if (!"86".equals(branchId)) {
+            criteria.andBranchIdLike(branchId);
+        }
+        list = baseCodeMapper.selectByExample(example);
+        logger.info("查询栏目信息结束，查询到的结果为【{}】" + JsonUtil.objectToJackson(list));
+        logger.info("查询栏目信息的方法结束！");
+        return list;
+    }
+
+    @Override
+    public List<BaseCodeTree> columnTree(String codeCode) {
+        logger.info("进入查询栏目树的方法");
+        if (StringUtils.isBlank(codeCode)) {
+            logger.info("查询栏目树请求参数不正确codeCode【{}】", codeCode);
+            throw new ParameterException("创建失败，参数不足！");
+        }
+        List<BaseCodeTree> list = null;
+        String companyId = "1";
+        String branchId = "86";
+        String state = "0";
+        HashMap<String, String> parMap = new HashMap<String, String>();
+        parMap.put("codeCode", codeCode);
+        parMap.put("companyId", companyId);
+        parMap.put("state", state);
+        if (!"86".equals(branchId)) {
+            parMap.put("branchId", branchId);
+        }
+        list = baseCodeExMapper.columnTree(parMap);
+        logger.info("查询栏目树结束，查询到的结果为【{}】" + JsonUtil.objectToJackson(list));
+        logger.info("查询栏目信息的方法结束！");
+        return list;
+    }
+
+    @Override
+    public Message operateColumn(String columnId, String operateType) {
+        logger.info("进入操作栏目排序业务层方法，入参columnId:[{}],operateType:[{}]", columnId, operateType);
+        Message msg = new Message();
+        if (StringUtils.isEmpty(operateType) || StringUtils.isEmpty(columnId)) {
+            msg.setInfo("缺少请求参数");
+            msg.setResult(false);
+            return msg;
+        }
+        BaseCode operateBaseCode = baseCodeMapper.selectByPrimaryKey(Integer.parseInt(columnId));
+        BaseCodeExample example = new BaseCodeExample();
+        example.createCriteria().andCodeTypeEqualTo(operateBaseCode.getCodeType());
+        example.setOrderByClause("ORDER_NO*1 ASC,CREATE_TIME ASC");
+        List<BaseCode> baseCodeList = baseCodeMapper.selectByExample(example);
+        BaseCode preBaseCode = null;
+        BaseCode nextBaseCode = null;
+        BaseCode current = null;
+        logger.info("需要重排序的栏目：" + JsonUtil.objectToJackson(baseCodeList));
+        try {
+            for (int i = 0; i < baseCodeList.size(); i++) {
+                Integer orderNo = i + 1;
+                baseCodeList.get(i).setOrderNo(orderNo.toString());
+                baseCodeMapper.updateByPrimaryKey(baseCodeList.get(i));
+                if (baseCodeList.get(i).getId().equals(Integer.parseInt(columnId))) {
+                    preBaseCode = i - 1 == -1 ? baseCodeList.get(i) : baseCodeList.get(i - 1);
+                    nextBaseCode = i + 1 == baseCodeList.size() ? baseCodeList.get(i) : baseCodeList.get(i + 1);
+                    current = baseCodeList.get(i);
+                    logger.info("查询到当前操作栏目的前一个栏目：【{}】，和后一个栏目信息：【{}】，当前操作栏目信息：【{}】",
+                            preBaseCode.getId() + "--" + preBaseCode.getCodeCname(),
+                            nextBaseCode.getId() + "--" + nextBaseCode.getCodeCname(),
+                            current.getId() + "--" + current.getCodeCname());
+                }
+            }
+            if ("86".equals(current.getBranchId())) {
+                Set<byte[]> baseCodeKeys = redisManager.queryByVague("baseCode_companyId" + current.getCompanyId() + "_branchId" + "*");
+                for (byte[] baseCodeKey : baseCodeKeys) {
+                    redisManager.delete(baseCodeKey);
+                }
+            } else {
+                String delCodeType = null;
+                logger.info("查询到的codeType：" + current.getCodeType());
+                try {
+                    Integer.parseInt(current.getCodeType());//如果codeType能转成数字说明是三级栏目
+                    BaseCodeExample example1 = new BaseCodeExample();
+                    BaseCodeExample.Criteria createCriteria = example1.createCriteria();
+                    createCriteria.andCodeCodeEqualTo(current.getCodeType());
+                    List<BaseCode> basecodeEx = baseCodeMapper.selectByExample(example1);
+                    delCodeType = basecodeEx.get(0).getCodeType();
+                } catch (Exception e) {
+                    delCodeType = current.getCodeType();
+                }
+                logger.info("删除的redis的key是：" + "baseCode_companyId" + current.getCompanyId() + "_branchId" + current.getBranchId() + "_" + delCodeType);
+                redisManager.delete("baseCode_companyId" + current.getCompanyId() + "_branchId" + current.getBranchId() + "_" + delCodeType);
+            }
+            String modelOrder = null;
+            current.setUpdateTime(DateUtil.getDate());
+            current.setUpdateUser("");
+            if ("1".equals(operateType)) {
+                preBaseCode.setUpdateTime(DateUtil.getDate());
+                preBaseCode.setUpdateUser("");
+                modelOrder = preBaseCode.getOrderNo();
+                preBaseCode.setOrderNo(current.getOrderNo());
+                current.setOrderNo(modelOrder);
+                baseCodeMapper.updateByPrimaryKey(preBaseCode);
+                baseCodeMapper.updateByPrimaryKey(current);
+                logger.info("上移操作成功");
+                msg.setResult(true);
+                msg.setInfo("上移成功！");
+            } else {
+                nextBaseCode.setUpdateTime(DateUtil.getDate());
+                nextBaseCode.setUpdateUser("");
+                modelOrder = nextBaseCode.getOrderNo();
+                nextBaseCode.setOrderNo(current.getOrderNo());
+                current.setOrderNo(modelOrder);
+                baseCodeMapper.updateByPrimaryKey(nextBaseCode);
+                baseCodeMapper.updateByPrimaryKey(current);
+                logger.info("下移操作成功");
+                msg.setResult(true);
+                msg.setInfo("下移成功！");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("操作栏目排序业务层方法报错");
+            msg.setInfo("操作栏目排序业务层方法报错");
+            msg.setResult(false);
+        }
+        logger.info("操作栏目排序业务层方法结束");
+        return msg;
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
index 4bed992d3..6c98c2d13 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
@@ -1,6 +1,5 @@
 package com.ruoyi.content.service.impl;
 
-import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.content.constants.PropertiesConstants;
 import com.ruoyi.content.domain.CmsArticleAdInfo;
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsRoleAuthorityServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsRoleAuthorityServiceImpl.java
new file mode 100644
index 000000000..e92f9b923
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsRoleAuthorityServiceImpl.java
@@ -0,0 +1,228 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.domain.AuthorityExDto;
+import com.ruoyi.content.domain.CmsRoleAuthority;
+import com.ruoyi.content.domain.CmsRoleAuthorityExample;
+import com.ruoyi.content.domain.CmsSysUser;
+import com.ruoyi.content.exception.ParameterException;
+import com.ruoyi.content.mapper.AuthorityFindfExMapper;
+import com.ruoyi.content.mapper.CmsRoleAuthorityMapper;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.CmsRoleAuthorityService;
+import com.ruoyi.content.utils.GsonUtil;
+import com.ruoyi.content.utils.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class CmsRoleAuthorityServiceImpl implements CmsRoleAuthorityService {
+    private static Logger logger = LoggerFactory.getLogger(CmsRoleAuthorityService.class);
+    @Autowired
+    private AuthorityFindfExMapper authorityFindfExMapper;
+
+    @Autowired
+    private CmsRoleAuthorityMapper cmsRoleAuthorityMapper;
+
+    @Override
+    public List<?> queryUserRole() {
+        logger.info("进入查詢当前用户所有权限集合的业务方法。");
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String jsonData = "";
+        try {
+            String userLog = userInfoDTO.getEmail();
+            List<AuthorityExDto> list = authorityFindfExMapper.findAuthorityEx(userLog);
+            logger.info("查詢当前用户所有权限集合【{}】", JsonUtil.objectToJackson(list));
+            StringBuffer jsons = new StringBuffer();
+            if (list.size() > 0) {
+                for (int i = 0; i < list.size(); i++) {
+                    if (list.get(i).getLevel().equals("1") && i == 0) {
+                        jsons.append("{id:\"" + list.get(i).getId() + "\", text: \"" + list.get(i).getOperatorRoleName()
+                                + "\",pid:\"0\", url:\"\"}");
+
+                    } else if (list.get(i).getLevel().equals("1") && i != 0) {
+                        jsons.append(",{id:\"" + list.get(i).getId() + "\", text: \""
+                                + list.get(i).getOperatorRoleName() + "\",pid:\"0\", url:\"\"}");
+
+                    } else if (!list.get(i).getLevel().equals("1") && i != 0) {
+                        jsons.append(",{id: \"" + list.get(i).getId() + "\",text:\" "
+                                + list.get(i).getOperatorRoleName() + "\",pid:\"" + list.get(i).getType() + "\", url:\""
+                                + list.get(i).getOperatorRolePath() + "\"}");
+                    }
+                }
+            }
+            String str = jsons.toString();
+            logger.info("组装后的菜单集合【{}】", str);
+            String indexStr = "";
+            if (StringUtils.isNotBlank(jsons)) {
+                indexStr = (String) jsons.subSequence(0, 1);
+            }
+            if (indexStr.equals(",")) {
+                str = (String) jsons.subSequence(1, jsons.length());
+            }
+            jsonData = "[" + str + "]";
+            return GsonUtil.jsonToList(jsonData);
+        } catch (Exception e) {
+            logger.info("获取菜单失败，请重新登录【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("查詢当前用户所有权限集合的业务方法结束。");
+        return null;
+    }
+
+    /**
+     * 添加对应关系
+     */
+    @Override
+    public Message insertRoleAuthority(String selfChild, String parentChild) {
+        logger.info("添加对应关系的业务层方法开始！");
+        logger.info("添加对应关系的业务层方法拿到的参数selfChild【{}】，parentChild【{}】", selfChild, parentChild);
+        Message msg = new Message();
+        // 获取登录人信息
+        CmsSysUser roleInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String roleLog = roleInfoDTO.getEmail();
+        if (StringUtils.isBlank(selfChild) || StringUtils.isBlank(parentChild)) {
+            msg.setInfo("添加对应关系失败！");
+            msg.setResult(false);
+            logger.info("添加对应关系失败，缺少参数");
+            return msg;
+        }
+        if (roleInfoDTO == null || StringUtils.isBlank(roleLog)) {
+            logger.info("用户已离线！");
+            msg.setInfo("您已离线，请重新登录！");
+            msg.setResult(false);
+            return msg;
+        }
+        try {
+            // 添加对应关系之前先判断对应关系是否已经存在，不存在插入，存在则全部删除后再添加
+            List<?> list = queryRoleAuthority(selfChild, "");
+            if (list.size() > 0) {// 关系存在，删除
+                CmsRoleAuthorityExample example = new CmsRoleAuthorityExample();
+                CmsRoleAuthorityExample.Criteria criteria = example.createCriteria();
+                criteria.andSelfChildEqualTo(selfChild);
+                cmsRoleAuthorityMapper.deleteByExample(example);
+            }
+
+            // 循环插入对应关系
+            String[] arrId = parentChild.split(",");
+            for (String aId : arrId) {
+                if (StringUtils.isNotBlank(aId)) {
+                    CmsRoleAuthority record = new CmsRoleAuthority();
+                    SimpleDateFormat data = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式
+                    SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");// 设置时间格式
+                    record.setSelfChild(selfChild);
+                    record.setParentChild(aId);
+                    record.setCreateDate(data.format(new Date()));
+                    record.setCreateTime(time.format(new Date()));
+                    record.setCreateUser(roleLog);
+                    cmsRoleAuthorityMapper.insert(record);
+                    // if (list.size() > 0) {// 关系存在，删除
+                    // record = (CmsRoleAuthority) list.get(0);
+                    // record.setUpdateDate(data.format(new Date()));
+                    // record.setUpdateTime(time.format(new Date()));
+                    // record.setUpdateUser(roleLog);
+                    // CmsRoleAuthorityExample example = new
+                    // CmsRoleAuthorityExample();
+                    // Criteria criteria = example.createCriteria();
+                    // criteria.andParentChildEqualTo(aId);
+                    // criteria.andSelfChildEqualTo(selfChild);
+                    // cmsRoleAuthorityMapper.deleteByExample(example);
+                    // } else {// 不存在，创建关系
+                    // record.setSelfChild(selfChild);
+                    // record.setParentChild(aId);
+                    // record.setCreateDate(data.format(new Date()));
+                    // record.setCrateTime(time.format(new Date()));
+                    // record.setCreateUser(roleLog);
+                    // cmsRoleAuthorityMapper.insert(record);
+                    // }
+                    msg.setInfo("添加成功！");
+                    msg.setResult(true);
+                    logger.info("添加成功！");
+                }
+            }
+        } catch (Exception e) {
+            logger.info("对应关系创建失败【{}】", e.getMessage());
+            msg.setInfo("对应关系创建失败！");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        logger.info("添加对应关系的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 查询对应关系，添加或者删除对应关系之前先确定此关系是否存在
+     */
+    @Override
+    public List<?> queryRoleAuthority(String selfChild, String parentChild) {
+        logger.info("查询对应关系的业务层方法开始！");
+        logger.info("查询对应关系的业务层方法拿到的参数selfChild【{}】，parentChild【{}】", selfChild, parentChild);
+        if (StringUtils.isBlank(selfChild) && StringUtils.isBlank(parentChild)) {
+            logger.info("查询对应关系失败，缺少参数");
+            throw new ParameterException("查询对应关系失败，缺少参数");
+        }
+        List<CmsRoleAuthority> list = null;
+        try {
+            CmsRoleAuthorityExample example = new CmsRoleAuthorityExample();
+            CmsRoleAuthorityExample.Criteria criteria = example.createCriteria();
+            if (selfChild != "") {
+                criteria.andSelfChildEqualTo(selfChild);
+            }
+            if (parentChild != "") {
+                criteria.andParentChildEqualTo(parentChild);
+            }
+            list = cmsRoleAuthorityMapper.selectByExample(example);
+        } catch (Exception e) {
+            logger.info("查询对应关系失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("查询对应关系的业务层方法结束！");
+        return list;
+    }
+
+    /**
+     * 根据主键删除对应关系
+     */
+    @Override
+    public Message delRoleAuthority(String selfChild, String parentChild) {
+        logger.info("删除对应关系的业务层方法开始！");
+        logger.info("删除对应关系的业务层方法拿到的参数selfChild【{}】，parentChild【{}】", selfChild, parentChild);
+        Message msg = new Message();
+        if (StringUtils.isBlank(selfChild) && StringUtils.isBlank(parentChild)) {
+            msg.setInfo("删除失败！");
+            msg.setResult(false);
+            logger.info("删除对应关系失败，缺少参数");
+            throw new ParameterException("删除对应关系失败，缺少参数");
+        }
+        try {
+            CmsRoleAuthorityExample example = new CmsRoleAuthorityExample();
+            CmsRoleAuthorityExample.Criteria criteria = example.createCriteria();
+            if (selfChild != "") {
+                criteria.andSelfChildEqualTo(selfChild);
+            }
+            if (parentChild != "") {
+                criteria.andParentChildEqualTo(parentChild);
+            }
+            // 删除对应关系之前判断对应关系是否存在
+            cmsRoleAuthorityMapper.deleteByExample(example);
+            msg.setInfo("删除成功！");
+            msg.setResult(true);
+            logger.info("删除对应关系成功！");
+        } catch (Exception e) {
+            logger.info("删除对应关系失败【{}】", e.getMessage());
+            msg.setInfo("删除对应关系失败！");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        logger.info("删除对应关系的业务层方法结束！");
+        return msg;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsRoleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsRoleServiceImpl.java
new file mode 100644
index 000000000..1dbb4cd90
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsRoleServiceImpl.java
@@ -0,0 +1,287 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.domain.*;
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.exception.ParameterException;
+import com.ruoyi.content.mapper.CmsSysRoleExMapper;
+import com.ruoyi.content.mapper.CmsSysRoleMapper;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.CmsRoleAuthorityService;
+import com.ruoyi.content.service.CmsRoleService;
+import com.ruoyi.content.service.CmsUserRoleService;
+import com.ruoyi.content.utils.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class CmsRoleServiceImpl implements CmsRoleService {
+    private static Logger logger = LoggerFactory.getLogger(CmsRoleService.class);
+
+    @Autowired
+    private CmsSysRoleMapper cmsSysRoleMapper;
+
+    @Autowired
+    private CmsUserRoleService cmsUserRoleService;
+
+    @Autowired
+    private CmsRoleAuthorityService cmsRoleAuthorityService;
+
+    @Autowired
+    private CmsSysRoleExMapper cmsSysRoleExMapper;
+
+    /**
+     * 分页查询所有角色信息
+     */
+    @Override
+    public List<?> queryRole(int startRow, int rows, String name, String email) {
+        logger.info("查询角色列表信息的业务层方法开始！");
+        logger.info("查询角色列表信息的业务层拿到的参数startRow【{}】，rows【{}】，name【{}】", startRow, rows, name);
+        if (StringUtils.isBlank(((Integer) startRow).toString()) || StringUtils.isBlank(((Integer) rows).toString())) {
+            logger.info("查询角色信息失败，缺少分页数据");
+            throw new ParameterException("查询角色信息失败，缺少分页数据！");
+        }
+        if (StringUtils.isBlank(name)) {
+            name = "";
+        }
+        List<CmsUSerSysRoleDto> list = null;
+        try {
+            CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+            list = cmsSysRoleExMapper.selectuserRoleByPage(startRow, rows, userInfoDTO.getEmail(), name, email);
+            if (list == null || list.size() < 1) {
+                logger.info("还没有任何角色信息【{}】");
+            }
+        } catch (Exception e) {
+            logger.info("查询角色信息失败，系统异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("查询角色列表信息的业务层方法结束！");
+        return list;
+    }
+
+    /**
+     * 添加角色
+     */
+    @Override
+    public Message insertRole(CmsSysRole role) {
+        logger.info("添加新角色的业务层方法开始！");
+        logger.info("添加新角色的业务层方法拿到的参数role【{}】", JsonUtil.objectToJackson(role));
+        Message msg = new Message();
+        //获取登录人信息
+        String roleLog = "o43yZt9cXHtRwvNF8ZdpGw9r0RGI";
+        if (role == null) {
+            msg.setInfo("添加角色信息失败，角色为空！");
+            logger.info("添加角色信息失败，角色为空！");
+            msg.setResult(false);
+            return msg;
+        }
+        //必输项校验
+        if (StringUtils.isBlank(role.getName())) {
+            msg.setInfo("添加角色信息失败，参数不足！");
+            logger.info("添加角色信息失败，参数不足！");
+            msg.setResult(false);
+            return msg;
+        }
+        try {
+            //添加角色之前判断角色是否已经存在，不存在添加，存在不能添加
+            CmsSysRoleExample example = new CmsSysRoleExample();
+            CmsSysRoleExample.Criteria criteria = example.createCriteria();
+            criteria.andNameEqualTo(role.getName());
+            List<CmsSysRole> list = cmsSysRoleMapper.selectByExample(example);
+            if (list.size() > 0) {
+                msg.setInfo("角色已经存在，不能重复创建！");
+                msg.setResult(false);
+                logger.info("角色【{}】已经存在，不能重复创建！", JsonUtil.objectToJackson(list.get(0)));
+                return msg;
+            }
+            SimpleDateFormat data = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+            SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");//设置时间格式
+            role.setCreateDate(data.format(new Date()));
+            role.setCreateTime(time.format(new Date()));
+            role.setCreateUser(roleLog);
+            if (cmsSysRoleMapper.insert(role) > 0) {
+                msg.setInfo("角色创建成功！");
+                msg.setResult(true);
+                logger.info("角色创建成功！");
+            }
+        } catch (Exception e) {
+            logger.info("角色创建失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("角色创建失败！");
+            msg.setResult(false);
+        }
+        logger.info("添加新角色的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 删除角色
+     */
+    @Override
+    public Message delRole(String id) {
+        logger.info("删除角色的业务层方法开始！");
+        logger.info("删除角色的业务层方拿到的参数id【{}】", id);
+        Message msg = new Message();
+        if (StringUtils.isBlank(id)) {
+            msg.setInfo("删除角色信息失败，缺少参数！");
+            msg.setResult(false);
+            logger.info("删除角色信息失败，缺少参数");
+            throw new ParameterException("删除角色信息失败，缺少参数");
+        }
+        try {
+            String[] arrId = id.split(",");
+            for (String aId : arrId) {
+                if (StringUtils.isNotBlank(aId)) {
+                    //删除角色之前判断角色是否存在
+                    CmsSysRole sysRole = cmsSysRoleMapper.selectByPrimaryKey(Integer.parseInt(aId));
+                    if (sysRole != null) {
+                        //删除角色之前，如果角色已经分配了用户，则将对应的角色与用户的对应关系删除
+                        List<?> list = cmsUserRoleService.queryUserRole(sysRole.getName(), "");
+                        if (list.size() > 0) {
+                            for (int i = 0; i < list.size(); i++) {
+                                CmsUserRole cmsUserRole = (CmsUserRole) list.get(i);
+                                cmsUserRoleService.delUserRole(Integer.toString(cmsUserRole.getId()));
+                            }
+                        }
+                        //删除角色之前，如果角色已经分配了权限，则将对应的角色与权限的对应关系删除
+                        List<?> list2 = cmsRoleAuthorityService.queryRoleAuthority(sysRole.getName(), "");
+                        if (list2.size() > 0) {
+                            cmsRoleAuthorityService.delRoleAuthority(sysRole.getName(), "");
+                        }
+                        cmsSysRoleMapper.deleteByPrimaryKey(Integer.parseInt(aId));
+                        msg.setInfo("删除成功！");
+                        msg.setResult(true);
+                        logger.info("删除信息成功！");
+                    } else {
+                        msg.setInfo("删除失败，角色不存在！");
+                        msg.setResult(false);
+                        logger.info("删除失败，角色不存在！");
+                        return msg;
+                    }
+                }
+            }
+        } catch (Exception e) {
+            logger.info("删除信息失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除失败！");
+            msg.setResult(false);
+        }
+        logger.info("删除角色的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 修改角色信息
+     */
+    @Override
+    public Message updateRole(CmsSysRole role) {
+        logger.info("修改角色的业务层方法开始！");
+        logger.info("修改角色的业务层方法拿到参数role【{}】", JsonUtil.objectToJackson(role));
+        Message msg = new Message();
+        //获取登录人信息
+        CmsSysUser roleInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String roleLog = roleInfoDTO.getEmail();
+        if (role == null) {
+            logger.info("修改角色信息失败，角色为空！");
+            msg.setInfo("修改角色信息失败，角色为空！");
+            msg.setResult(false);
+            return msg;
+        }
+        if (roleInfoDTO == null || StringUtils.isBlank(roleLog)) {
+            logger.info("用户已离线！");
+            msg.setInfo("您已离线，请重新登录！");
+            msg.setResult(false);
+            return msg;
+        }
+        //必输项校验
+        if (StringUtils.isBlank(role.getName())) {
+            logger.info("修改角色信息失败，参数不足！");
+            msg.setInfo("修改角色信息失败，参数不足！");
+            msg.setResult(false);
+            return msg;
+        }
+        try {
+            SimpleDateFormat data = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+            SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");//设置时间格式
+            role.setUpdateDate(data.format(new Date()));
+            role.setUpdateTime(time.format(new Date()));
+            role.setUpdateUser(roleLog);
+            if (cmsSysRoleMapper.updateByPrimaryKey(role) > 0) {
+                msg.setInfo("角色信息修改成功！");
+                msg.setResult(true);
+                logger.info("修改角色信息成功！");
+            }
+        } catch (Exception e) {
+            logger.info("修改角色信息失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("角色信息修改失败！");
+            msg.setResult(false);
+        }
+        logger.info("修改角色的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 根据主键查询角色，修改角色信息使用
+     */
+    @Override
+    public CmsSysRole queryRoleById(String id) {
+        logger.info("根据角色id查询角色信息的业务层方法开始！");
+        logger.info("查询角色信息的业务层方法拿到参数id【{}】", id);
+        if (StringUtils.isBlank(id)) {
+            logger.info("查询角色信息失败，缺少参数");
+            throw new ParameterException("未查询到角色信息");
+        }
+        CmsSysRole role = null;
+        try {
+            role = cmsSysRoleMapper.selectByPrimaryKey(Integer.parseInt(id));
+            if (role == null) {
+                logger.info("未查询到相关角色【{}】", JsonUtil.objectToJackson(role));
+                throw new BusinessException("未查询到相关角色！");
+            }
+            logger.info("根据角id查询角色信息成功【{}】", JsonUtil.objectToJackson(role));
+        } catch (Exception e) {
+            logger.info("根据角色id查询角色信息失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("根据角色id查询角色信息的业务层方法结束！");
+        return role;
+    }
+
+    /**
+     * 统计角色数量，分页使用
+     */
+    @Override
+    public int countRole(String name) {
+        logger.info("查询角色列表信息数量的业务层方法开始！");
+        logger.info("查询角色列表信息数量的业务层方法拿到参数name【{}】", name);
+        CmsSysRoleExample example = new CmsSysRoleExample();
+        CmsSysRoleExample.Criteria criteria = example.createCriteria();
+        if (StringUtils.isNotBlank(name)) {
+            criteria.andNameLike(name);
+        }
+        int count = 0;
+        try {
+            count = cmsSysRoleMapper.countByExample(example);
+            if (count == 0) {
+                logger.info("还没有创建任何角色【{}】");
+                throw new BusinessException("还没创建角色！");
+            }
+            logger.info("查询到的角色数量count【{}】", count);
+        } catch (Exception e) {
+            logger.info("查询角色数量出错【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("查询角色列表信息数量的业务层方法结束！");
+        return count;
+    }
+
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsSysAuthorityServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsSysAuthorityServiceImpl.java
new file mode 100644
index 000000000..a748e2f4a
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsSysAuthorityServiceImpl.java
@@ -0,0 +1,384 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.domain.CmsSysAuthority;
+import com.ruoyi.content.domain.CmsSysAuthorityExample;
+import com.ruoyi.content.domain.CmsSysRoleAuthorDto;
+import com.ruoyi.content.domain.CmsSysUser;
+import com.ruoyi.content.exception.ParameterException;
+import com.ruoyi.content.mapper.CmsSysAuthorityExMapper;
+import com.ruoyi.content.mapper.CmsSysAuthorityMapper;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.CmsRoleAuthorityService;
+import com.ruoyi.content.service.CmsSysAuthorityService;
+import com.ruoyi.content.utils.DateUtil;
+import com.ruoyi.content.utils.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 说明：菜单管理实现
+ */
+@Service
+public class CmsSysAuthorityServiceImpl implements CmsSysAuthorityService {
+    private static Logger logger = LoggerFactory.getLogger(CmsSysAuthorityServiceImpl.class);
+    @Autowired
+    private CmsSysAuthorityMapper cmsSysAuthorityMapper;
+    @Autowired
+    private CmsRoleAuthorityService authorityService;
+    @Autowired
+    private CmsSysAuthorityExMapper cmsSysAuthorityExMapper;
+
+    /**
+     * 新增菜单
+     */
+    @Override
+    public Message addMenu(CmsSysAuthority authority) {
+        logger.info("添加新菜单的业务层方法开始！");
+        logger.info("添加新菜单的业务层方法拿到参数【{}】", JsonUtil.objectToJackson(authority));
+        Message msg = new Message();
+        if (authority == null || StringUtils.isBlank(authority.getId()) || StringUtils.isBlank(authority.getType())) {
+            logger.info("新建菜单失败，参数缺少参数");
+            msg.setInfo("创建菜单失败，缺少参数！");
+            msg.setResult(false);
+            return msg;
+        }
+        try {
+            CmsSysAuthorityExample example = new CmsSysAuthorityExample();
+            CmsSysAuthorityExample.Criteria criteria = example.createCriteria();
+            criteria.andIdEqualTo(authority.getId());
+            List<CmsSysAuthority> authorList = cmsSysAuthorityMapper.selectByExample(example);
+            if (authorList != null && authorList.size() > 0) {
+                msg.setInfo("菜单已经存在，不能重复创建！");
+                msg.setObject(authorList);
+                msg.setResult(false);
+                logger.info("菜单已经存在，不能重复创建！和菜单【{}】重复", authorList.get(0).getOperatorRoleName());
+            } else {
+                authority.setCreateUser("");
+                if (cmsSysAuthorityMapper.insert(authority) > 0) {
+                    msg.setInfo("创建菜单成功！");
+                    msg.setResult(true);
+                    logger.info("菜单创建成功！");
+                } else {
+                    msg.setInfo("创建菜单失败，请稍后再试！");
+                    msg.setResult(false);
+                    logger.info("菜单创建失败！");
+                }
+            }
+        } catch (Exception e) {
+            msg.setInfo("创建菜单失败，请稍后再试！");
+            msg.setResult(false);
+            e.printStackTrace();
+            logger.info("创建菜单异常【{}】,菜单信息【{}】", e.getMessage(), JsonUtil.objectToJackson(authority));
+        }
+        logger.info("添加新菜单的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 更新菜单
+     */
+    @Override
+    public Message upMenu(CmsSysAuthority authority) {
+        logger.info("修改菜单的业务层方法开始！");
+        logger.info("修改菜单的业务层方法拿到参数【{}】", JsonUtil.objectToJackson(authority));
+        Message msg = new Message();
+        if (authority == null || StringUtils.isBlank(authority.getId()) || StringUtils.isBlank(authority.getType())) {
+            logger.info("更新菜单失败，参数缺少参数");
+            msg.setInfo("更新菜单失败，缺少参数！");
+            msg.setResult(false);
+            return msg;
+        }
+        CmsSysUser roleInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        if (roleInfoDTO == null || StringUtils.isBlank(roleInfoDTO.getEmail())) {
+            logger.info("您已离线，请重新登录！");
+            msg.setInfo("您已离线，请重新登录！");
+            msg.setResult(false);
+            return msg;
+        }
+        try {
+            //先查询出菜单，判断菜单是否存在
+            CmsSysAuthorityExample example = new CmsSysAuthorityExample();
+            CmsSysAuthorityExample.Criteria criteria = example.createCriteria();
+            criteria.andIdEqualTo(authority.getId());
+            List<CmsSysAuthority> list = cmsSysAuthorityMapper.selectByExample(example);
+            if (list.size() > 0 && list != null) {
+                CmsSysAuthority authorityNew = list.get(0);
+                authorityNew.setId(authority.getId());
+                authorityNew.setType(authority.getType());
+                authorityNew.setLevel(authority.getLevel());
+                authorityNew.setOperatorRoleName(authority.getOperatorRoleName());
+                authorityNew.setOperatorRolePath(authority.getOperatorRolePath());
+                authorityNew.setUpdateDate(DateUtil.currentDate());
+                authorityNew.setUpdateTime(DateUtil.currentTime());
+                authorityNew.setUpdateUser(roleInfoDTO.getEmail());
+                if (cmsSysAuthorityMapper.updateByPrimaryKey(authorityNew) > 0) {
+                    msg.setInfo("更新菜单成功！");
+                    msg.setResult(true);
+                    logger.info("修改菜单信息成功！");
+                } else {
+                    msg.setInfo("更新菜单失败，请稍后再试！");
+                    msg.setResult(false);
+                    logger.info("修改菜单信息失败！");
+                }
+            } else {
+                logger.info("更新菜单失败，没有查询到对应菜单");
+                msg.setInfo("更新菜单失败，没有查询到对应菜单！");
+                msg.setResult(false);
+                return msg;
+            }
+        } catch (Exception e) {
+            msg.setInfo("修改菜单失败，请稍后再试！");
+            msg.setResult(false);
+            logger.info("更新菜单异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("修改菜单的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 删除菜单
+     */
+    @Override
+    public Message delMenu(String nums) {
+        logger.info("删除菜单的业务层方法开始！");
+        logger.info("删除菜单的业务层方法拿到参数nums【{}】", nums);
+        Message msg = new Message();
+        if (StringUtils.isBlank(nums)) {
+            logger.info("删除菜单失败，参数缺少参数");
+            msg.setInfo("删除菜单失败，缺少参数！");
+            msg.setResult(false);
+            return msg;
+        }
+        try {
+            String[] arrId = nums.split(",");
+            for (String aId : arrId) {
+                CmsSysAuthority authority = cmsSysAuthorityMapper.selectByPrimaryKey(Integer.parseInt(aId));
+                if (authority != null) {
+                    Message dataMsg = queryAuthoryById(authority.getId());
+                    if (dataMsg.getResult()) {// 存在下级
+                        logger.info("删除菜单失败，存在下级菜单");
+                        msg.setInfo("删除菜单失败，请先删除下级菜单！");
+                        msg.setResult(false);
+                    } else {//不存在下级菜单， 删除自己
+                        if (dataMsg.getObject().equals(0)) {
+                            //删除菜单之前先删除对应关系
+                            List<?> list = authorityService.queryRoleAuthority("", authority.getId());
+                            if (list != null && list.size() > 0) {
+                                logger.info("删除菜单和角色的对应关系！");
+                                authorityService.delRoleAuthority("", authority.getId());
+                            }
+                            if (cmsSysAuthorityMapper.deleteByPrimaryKey(Integer.parseInt(aId)) > 0) {
+                                logger.info("删除菜单成功！");
+                                msg.setInfo("删除成功！");
+                                msg.setResult(true);
+                            } else {
+                                logger.info("删除菜单失败！");
+                                msg.setInfo("删除失败！");
+                                msg.setResult(false);
+                            }
+                        } else {
+                            logger.info("删除菜单失败，查询下级菜单参数不足。");
+                            msg.setInfo("删除菜单失败，查询下级菜单参数不足！");
+                            msg.setResult(false);
+                        }
+                    }
+                } else {
+                    msg.setInfo("删除菜单失败，该菜单不存在！");
+                    msg.setResult(false);
+                }
+            }
+        } catch (Exception e) {
+            logger.info("删除菜单出错【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("删除菜单的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 查询下级菜单
+     *
+     * @return
+     */
+    @Override
+    public Message queryAuthoryById(String id) {
+        logger.info("查询下级菜单的业务层方法开始！");
+        Message msg = new Message();
+        if (StringUtils.isBlank(id)) {
+            logger.info("根据id查询下级菜单失败，参数为空！");
+            msg.setInfo("查询下级菜单失败，参数不足！");
+            msg.setResult(false);
+            return msg;
+        }
+        logger.info("查询下级菜单的业务层方法拿到参数【{}】", id);
+        try {
+            CmsSysAuthorityExample example = new CmsSysAuthorityExample();
+            CmsSysAuthorityExample.Criteria criteria = example.createCriteria();
+            criteria.andTypeEqualTo(id);
+            List<CmsSysAuthority> authorList = cmsSysAuthorityMapper.selectByExample(example);
+            if (authorList != null && authorList.size() > 0) {
+                if (authorList.size() > 1) {
+                    msg.setInfo("成功！");
+                    msg.setObject(authorList);
+                    msg.setResult(true);
+                } else {
+                    //判断id和type是否相等，也就是判断是不是一级菜单
+                    if (authorList.get(0).getId().equals(authorList.get(0).getType())) {
+                        msg.setInfo("未查询到下级菜单！");
+                        msg.setObject(0);
+                        msg.setResult(false);
+                        logger.info("未查询到下级菜单！");
+                    } else {
+                        msg.setInfo("成功！");
+                        msg.setObject(authorList);
+                        msg.setResult(true);
+                    }
+                }
+            } else {
+                msg.setInfo("未查询到下级菜单！");
+                msg.setObject(0);
+                msg.setResult(false);
+                logger.info("未查询到下级菜单！");
+            }
+        } catch (Exception e) {
+            logger.info("根据id查询下级菜单异常【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("未查询到下级菜单！");
+            msg.setResult(false);
+        }
+        logger.info("查询下级菜单的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 分页查询菜单
+     */
+    @Override
+    public Message queryMenuList(int startRow, int rows, String id, String level, String type, String operatorRoleName) {
+        logger.info("查询菜单列表信息的业务层方法开始！");
+        logger.info("查询菜单列表信息的业务层方法拿到参数startRow【{}】,rows【{}】,id【{}】,level【{}】,type【{}】,operatorRoleName【{}】", startRow, rows, id, level, type, operatorRoleName);
+        Message msg = new Message();
+        if (StringUtils.isBlank(((Integer) startRow).toString()) || StringUtils.isBlank(((Integer) rows).toString())) {
+            logger.info("查询菜单信息失败，缺少分页数据");
+            throw new ParameterException("查询菜单信息失败，缺少分页数据！");
+        }
+        if (StringUtils.isBlank(id)) {
+            id = "";
+        }
+        if (StringUtils.isBlank(level)) {
+            level = "";
+        }
+        if (StringUtils.isBlank(type)) {
+            type = "";
+        }
+        if (StringUtils.isBlank(operatorRoleName)) {
+            operatorRoleName = "";
+        }
+        try {
+            CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+            List<CmsSysAuthority> list = cmsSysAuthorityExMapper.selectAllMenuWithLimit(startRow, rows, userInfoDTO.getEmail(), id, level, type, operatorRoleName);
+            if (list != null && list.size() > 0) {
+                msg.setObject(list);
+                msg.setInfo("查询成功！");
+                msg.setResult(true);
+            } else {
+                logger.info("还没有任何菜单信息【{}】", JsonUtil.objectToJackson(list));
+                msg.setInfo("还没有创建过菜单！");
+                msg.setResult(false);
+            }
+        } catch (Exception e) {
+            logger.info("查询菜单异常【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("系统异常，请稍候再试！");
+            msg.setResult(false);
+        }
+        logger.info("查询菜单列表信息的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 查总数
+     */
+    @Override
+    public List<CmsSysAuthority> authorityList(String id, String level, String type, String operatorRoleName) {
+        logger.info("查询菜单总数的业务方法开始！");
+        logger.info("查询菜单总数的业务层方法拿到参数,id【{}】,level【{}】,type【{}】,operatorRoleName【{}】", id, level, type, operatorRoleName);
+        CmsSysAuthorityExample example = new CmsSysAuthorityExample();
+        CmsSysAuthorityExample.Criteria criteria = example.createCriteria();
+        if (StringUtils.isNotBlank(id)) {
+            criteria.andIdLike(id);
+        }
+        if (StringUtils.isNotBlank(level)) {
+            criteria.andLevelLike(level);
+        }
+        if (StringUtils.isNotBlank(type)) {
+            criteria.andTypeLike(type);
+        }
+        if (StringUtils.isNotBlank(operatorRoleName)) {
+            criteria.andOperatorRoleNameLike(operatorRoleName);
+        }
+        List<CmsSysAuthority> authorList = null;
+        try {
+            authorList = new ArrayList<CmsSysAuthority>();
+            authorList = cmsSysAuthorityMapper.selectByExample(example);
+        } catch (Exception e) {
+            logger.info("查询菜单数量出错【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        return authorList;
+    }
+
+    @Override
+    public Message queryRoleMenuList(int startRow, int rows, String id, String level, String type,
+                                     String operatorRoleName, String role) {
+        logger.info("查询菜单列表信息的业务层方法开始！");
+        logger.info("查询菜单列表信息的业务层方法拿到参数startRow【{}】,rows【{}】,id【{}】,level【{}】,type【{}】,operatorRoleName【{}】", startRow,
+                rows, id, level, type, operatorRoleName);
+        Message msg = new Message();
+        if (StringUtils.isBlank(((Integer) startRow).toString()) || StringUtils.isBlank(((Integer) rows).toString())) {
+            logger.info("查询菜单信息失败，缺少分页数据");
+            throw new ParameterException("查询菜单信息失败，缺少分页数据！");
+        }
+        if (StringUtils.isBlank(id)) {
+            id = "";
+        }
+        if (StringUtils.isBlank(level)) {
+            level = "";
+        }
+        if (StringUtils.isBlank(type)) {
+            type = "";
+        }
+        if (StringUtils.isBlank(operatorRoleName)) {
+            operatorRoleName = "";
+        }
+        try {
+            CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+            List<CmsSysRoleAuthorDto> list = cmsSysAuthorityExMapper.selectAllRoleMenuWithLimit(startRow, rows,
+                    userInfoDTO.getEmail(), id, level, type, operatorRoleName, role);
+            if (list != null && list.size() > 0) {
+                msg.setObject(list);
+                msg.setInfo("查询成功！");
+                msg.setResult(true);
+            } else {
+                logger.info("还没有任何菜单信息【{}】", JsonUtil.objectToJackson(list));
+                msg.setInfo("还没有创建过菜单！");
+                msg.setResult(false);
+            }
+        } catch (Exception e) {
+            logger.info("查询菜单异常【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("系统异常，请稍候再试！");
+            msg.setResult(false);
+        }
+        logger.info("查询菜单列表信息的业务层方法结束！");
+        return msg;
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsUserRoleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsUserRoleServiceImpl.java
new file mode 100644
index 000000000..5d8e357f3
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsUserRoleServiceImpl.java
@@ -0,0 +1,139 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.domain.CmsUserRole;
+import com.ruoyi.content.domain.CmsUserRoleExample;
+import com.ruoyi.content.exception.ParameterException;
+import com.ruoyi.content.mapper.CmsUserRoleMapper;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.CmsUserRoleService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class CmsUserRoleServiceImpl implements CmsUserRoleService {
+
+    private static Logger logger = LoggerFactory.getLogger(CmsUserRoleService.class);
+
+    @Autowired
+    private CmsUserRoleMapper cmsUserRoleMapper;
+
+    /**
+     * 添加对应关系
+     */
+    @Override
+    public Message insertUserRole(String names, String email) {
+        logger.info("添加对应关系的业务层方法开始！");
+        logger.info("添加对应关系的业务层方法拿到参数names【{}】,email【{}】", names, email);
+        Message msg = new Message();
+        //获取登录人信息
+        String roleLog = "o43yZt9cXHtRwvNF8ZdpGw9r0RGI";
+        if (StringUtils.isBlank(names) || StringUtils.isBlank(email)) {
+            msg.setInfo("添加对应关系失败！");
+            msg.setResult(false);
+            logger.info("添加对应关系失败，缺少参数");
+            return msg;
+        }
+        try {
+            //循环插入对应关系
+            String[] arrId = names.split(",");
+            List<?> list = queryUserRole("", email);
+            if (list.size() > 0) {// 关系存在，修改
+                CmsUserRoleExample example = new CmsUserRoleExample();
+                CmsUserRoleExample.Criteria criteria = example.createCriteria();
+                criteria.andAuthorityEmailEqualTo(email);
+                cmsUserRoleMapper.deleteByExample(example);
+            }
+            for (String aId : arrId) {
+                if (StringUtils.isNotBlank(aId)) {
+                    CmsUserRole record = new CmsUserRole();
+                    SimpleDateFormat data = new SimpleDateFormat("yyyy-MM-dd");// 设置日期格式
+                    SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");// 设置时间格式
+                    // 添加对应关系之前先判断对应关系是否已经存在，不存在插入，存在更新
+                    record.setAuthorityEmail(email);
+                    record.setAuthorityName(aId);
+                    record.setCreateDate(data.format(new Date()));
+                    record.setCreateTime(time.format(new Date()));
+                    record.setCreateUser(roleLog);
+                    cmsUserRoleMapper.insert(record);
+                    msg.setInfo("添加成功！");
+                    msg.setResult(true);
+                    logger.info("添加成功！");
+                }
+            }
+        } catch (Exception e) {
+            logger.info("对应关系创建失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("对应关系创建失败！");
+            msg.setResult(false);
+        }
+        logger.info("添加对应关系的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 根据主键删除对应关系
+     */
+    @Override
+    public Message delUserRole(String id) {
+        logger.info("删除对应关系的业务层方法开始！");
+        logger.info("删除对应关系的业务层方法拿到参数id【{}】", id);
+        Message msg = new Message();
+        if (StringUtils.isBlank(id)) {
+            msg.setInfo("删除失败！");
+            msg.setResult(false);
+            logger.info("删除对应关系失败，缺少参数");
+            throw new ParameterException("删除对应关系失败，缺少参数");
+        }
+        try {
+            cmsUserRoleMapper.deleteByPrimaryKey(Integer.parseInt(id));
+            msg.setInfo("删除成功！");
+            msg.setResult(true);
+            logger.info("删除对应关系成功！");
+        } catch (Exception e) {
+            logger.info("删除对应关系失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除对应关系失败！");
+            msg.setResult(false);
+        }
+        logger.info("删除对应关系的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 查询对应关系，添加或者删除对应关系之前先确定此关系是否存在
+     */
+    @Override
+    public List<?> queryUserRole(String name, String email) {
+        logger.info("查询对应关系的业务层方法开始！");
+        logger.info("查询对应关系的业务层方法拿到参数name【{}】，email【{}】", name, email);
+        if (StringUtils.isBlank(name) && StringUtils.isBlank(email)) {
+            logger.info("查询对应关系失败，缺少参数");
+            throw new ParameterException("查询对应关系失败，缺少参数");
+        }
+        List<CmsUserRole> list = null;
+        try {
+            CmsUserRoleExample example = new CmsUserRoleExample();
+            CmsUserRoleExample.Criteria criteria = example.createCriteria();
+            if (name != "") {
+                criteria.andAuthorityNameEqualTo(name);
+            }
+            if (email != "") {
+                criteria.andAuthorityEmailEqualTo(email);
+            }
+            list = cmsUserRoleMapper.selectByExample(example);
+        } catch (Exception e) {
+            logger.info("查询对应关系失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("查询对应关系的业务层方法结束！");
+        return list;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsUserServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsUserServiceImpl.java
new file mode 100644
index 000000000..9093fb6de
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsUserServiceImpl.java
@@ -0,0 +1,400 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.domain.CmsSysUser;
+import com.ruoyi.content.domain.CmsSysUserExample;
+import com.ruoyi.content.domain.CmsUserRole;
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.exception.ParameterException;
+import com.ruoyi.content.mapper.CmsSysUserExMapper;
+import com.ruoyi.content.mapper.CmsSysUserMapper;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.CmsUserRoleService;
+import com.ruoyi.content.service.CmsUserService;
+import com.ruoyi.content.utils.JsonUtil;
+import com.ruoyi.content.utils.PasswordHelper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class CmsUserServiceImpl implements CmsUserService {
+    private static Logger logger = LoggerFactory.getLogger(CmsUserService.class);
+
+    @Autowired
+    private CmsSysUserMapper cmsSysUserMapper;
+
+    @Autowired
+    private CmsUserRoleService cmsUserRoleService;
+
+    @Autowired
+    private CmsSysUserExMapper cmsSysUserExMapper;
+    @Autowired
+    private PasswordHelper passwordHelper;
+
+    /**
+     * 分页查询所有用户信息
+     */
+    @Override
+    public List<?> queryUser(int startRow, int rows, String email, String phone, String name, String companyId) {
+        logger.info("查询用户列表信息的业务层方法开始！");
+        logger.info("查询用户列表信息的业务层方法拿到参数startRow【{}】，rows【{}】，email【{}】，phone【{}】，name【{}】，companyId【{}】", startRow, rows, email, phone, name, companyId);
+        if (StringUtils.isBlank(((Integer) startRow).toString()) || StringUtils.isBlank(((Integer) rows).toString())) {
+            logger.info("查询用户信息失败，缺少分页数据");
+            throw new ParameterException("查询用户信息失败，缺少分页数据！");
+        }
+        if (StringUtils.isBlank(email)) {
+            email = "";
+        }
+        if (StringUtils.isBlank(phone)) {
+            phone = "";
+        }
+        if (StringUtils.isBlank(name)) {
+            name = "";
+        }
+        if (StringUtils.isBlank(companyId)) {
+            companyId = "";
+        }
+        List<CmsSysUser> list = null;
+        try {
+//			list = cmsSysUserExMapper.selectByPage(startRow, rows,userInfoDTO.getEmail(),emial,phone,name,companyId);
+            list = cmsSysUserExMapper.selectByPage(startRow, rows, email, phone, name, companyId);
+            if (list == null || list.size() < 1) {
+                logger.info("还没有任何用户信息【{}】", JsonUtil.objectToJackson(list));
+            }
+        } catch (Exception e) {
+            logger.info("查询用户信息失败，系统异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("查询用户列表信息的业务层方法结束！list[{}]", JsonUtil.objectToJackson(list));
+        return list;
+    }
+
+    /**
+     * 添加用户
+     */
+    @Override
+    public Message insertUser(CmsSysUser user) {
+        logger.info("添加新用户的业务层方法开始！");
+        logger.info("添加新用户的业务层方法拿到参数user【{}】", JsonUtil.objectToJackson(user));
+        Message msg = new Message();
+        //获取登录人信息
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String userLog = userInfoDTO.getEmail();
+        if (user == null) {
+            logger.info("添加用户【{}】信息失败。", JsonUtil.objectToJackson(user));
+            msg.setInfo("用户创建失败,用户信息为空！");
+            msg.setResult(false);
+            return msg;
+        }
+        if (userInfoDTO == null || StringUtils.isBlank(userLog)) {
+            logger.info("用户已离线！");
+            msg.setInfo("您已离线，请重新登录！");
+            msg.setResult(false);
+            return msg;
+        }
+        //必输项校验
+        if (StringUtils.isBlank(user.getEmail()) || StringUtils.isBlank(user.getBranchId()) || StringUtils.isBlank(user.getPhone()) || StringUtils.isBlank(user.getOpenId())) {
+            logger.info("添加用户信息失败，参数不足！");
+            msg.setInfo("用户创建失败,，参数不足！");
+            msg.setResult(false);
+            return msg;
+        }
+
+        try {
+            //新建之前判断用户是否已经存在，已经存在则不能添加
+            CmsSysUser sysUser = cmsSysUserMapper.selectByPrimaryKey(user.getEmail());
+            if (sysUser != null) {
+                logger.info("用户【{}】已经存在，不能重复创建！！", JsonUtil.objectToJackson(sysUser));
+                msg.setInfo("用户已经存在，不能重复创建！");
+                msg.setResult(false);
+                return msg;
+            }
+            SimpleDateFormat data = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+            SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");//设置时间格式
+            user.setCreateDate(data.format(new Date()));
+            user.setCreateTime(time.format(new Date()));
+            user.setCreateUser(userLog);
+            passwordHelper.encryptPassword(user);
+            if (cmsSysUserMapper.insert(user) > 0) {
+                msg.setInfo("用户创建成功！");
+                msg.setResult(true);
+                logger.info("用户创建成功！");
+            } else {
+                msg.setInfo("用户创建失败！");
+                msg.setResult(false);
+                logger.info("用户创建失败！");
+            }
+        } catch (Exception e) {
+            logger.info("用户创建失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("用户创建失败！");
+            msg.setResult(false);
+        }
+        logger.info("添加新用户的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 删除用户
+     */
+    @Override
+    public Message delUser(String email) {
+        logger.info("删除用户的业务层方法开始！");
+        logger.info("删除用户的业务层方法拿到参数email【{}】", email);
+        Message msg = new Message();
+        if (StringUtils.isBlank(email)) {
+            msg.setInfo("删除失败，缺少参数！");
+            msg.setResult(false);
+            logger.info("删除用户信息失败，缺少参数");
+            return msg;
+        }
+        try {
+            String[] arrId = email.split(",");
+            for (String aId : arrId) {
+                if (StringUtils.isNotBlank(aId)) {
+                    //删除用户之前，如果用户已经分配了角色，则将对应的用户与角色的对应关系删除
+                    CmsSysUser sysUser = cmsSysUserMapper.selectByPrimaryKey(aId);
+                    if (sysUser != null) {
+                        List<?> list = cmsUserRoleService.queryUserRole("", aId);
+                        if (list.size() > 0) {
+                            for (int i = 0; i < list.size(); i++) {
+                                CmsUserRole cmsUserRole = (CmsUserRole) list.get(i);
+                                cmsUserRoleService.delUserRole(Integer.toString(cmsUserRole.getId()));
+                            }
+                        }
+                        if (cmsSysUserMapper.deleteByPrimaryKey(aId) > 0) {
+                            msg.setInfo("删除成功！");
+                            msg.setResult(true);
+                            logger.info("删除信息成功！");
+                        }
+                    } else {
+                        msg.setInfo("删除失败，用户不存在！");
+                        msg.setResult(false);
+                        logger.info("删除失败，用户【{}】不存在！", JsonUtil.objectToJackson(sysUser));
+                    }
+                }
+            }
+        } catch (Exception e) {
+            logger.info("删除信息失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除失败！");
+            msg.setResult(false);
+        }
+        logger.info("删除用户的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 修改用户信息
+     */
+    @Override
+    public Message updateUser(CmsSysUser user) {
+        logger.info("修改用户的业务层方法开始！");
+        logger.info("修改用户的业务层方法拿到参数user【{}】", JsonUtil.objectToJackson(user));
+        Message msg = new Message();
+        //获取登录人信息
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String userLog = userInfoDTO.getEmail();
+        if (user == null) {
+            logger.info("修改用户信息失败，用户【{}】为空！", JsonUtil.objectToJackson(user));
+            msg.setInfo("修改用户信息失败，用户为空！");
+            msg.setResult(false);
+            return msg;
+        }
+        if (userInfoDTO == null || StringUtils.isBlank(userLog)) {
+            logger.info("用户已离线！");
+            msg.setInfo("您已离线，请重新登录！");
+            msg.setResult(false);
+            return msg;
+        }
+        //必输项校验
+        if (StringUtils.isBlank(user.getEmail()) || StringUtils.isBlank(user.getState())) {
+            logger.info("修改用户信息失败，参数不足！");
+            msg.setInfo("修改用户信息失败，参数不足！");
+            msg.setResult(false);
+            return msg;
+        }
+        try {
+            SimpleDateFormat data = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+            SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");//设置时间格式
+            user.setUpdateDate(data.format(new Date()));
+            user.setUpdateTime(time.format(new Date()));
+            user.setUpdateUser(userLog);
+            //passwordHelper.encryptPassword(user);
+            if (cmsSysUserMapper.updateByPrimaryKey(user) > 0) {
+                msg.setInfo("用户信息修改成功！");
+                msg.setResult(true);
+                logger.info("修改用户信息成功！");
+            }
+        } catch (Exception e) {
+            logger.info("修改用户信息失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("用户信息修改失败！");
+            msg.setResult(false);
+        }
+        logger.info("修改用户的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 根据主键查询用户，修改用户信息使用
+     */
+    @Override
+    public CmsSysUser queryUserByEmail(String email) {
+        logger.info("根据用户邮箱查询用户信息的业务层方法开始！");
+        logger.info("根据用户邮箱查询用户信息的业务层方法拿到参数email【{}】", email);
+        if (StringUtils.isBlank(email)) {
+            logger.info("查询用户信息失败，缺少参数。");
+            throw new ParameterException("未查询到用户信息");
+        }
+        CmsSysUser user = null;
+        try {
+            user = cmsSysUserMapper.selectByPrimaryKey(email);
+            if (user == null) {
+                logger.info("根据emaill【{}】未查询到相关用户【{}】", email, JsonUtil.objectToJackson(user));
+                throw new BusinessException("未查询到相关用户！");
+            }
+            logger.info("根据用户邮箱【{}】查询用户信息成功【{}】", email, JsonUtil.objectToJackson(user));
+        } catch (Exception e) {
+            logger.info("根据用户邮箱查询用户信息的业务层方法异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("根据用户邮箱查询用户信息的业务层方法结束！");
+        return user;
+    }
+
+    /**
+     * 统计用户数量，分页使用
+     */
+    @Override
+    public int countUser(String email, String phone, String name, String companyId) {
+        logger.info("查询用户列表信息数量的业务层方法开始！");
+        logger.info("查询用户列表信息数量的业务层方法拿到参数email【{}】,phone【{}】,name【{}】,companyId【{}】", email, phone, name, companyId);
+        CmsSysUserExample example = new CmsSysUserExample();
+        CmsSysUserExample.Criteria criteria = example.createCriteria();
+        if (StringUtils.isNotBlank(email)) {
+            criteria.andEmailLike(email);
+        }
+        if (StringUtils.isNotBlank(phone)) {
+            criteria.andPhoneLike(phone);
+        }
+        if (StringUtils.isNotBlank(name)) {
+            criteria.andNameLike(name);
+        }
+        if (StringUtils.isNotBlank(companyId)) {
+            criteria.andCompanyIdEqualTo(companyId);
+        }
+        int count = 0;
+        try {
+            count = cmsSysUserMapper.countByExample(example);
+            if (count == 0) {
+                logger.info("未查询到用户【{}】", count);
+            }
+            logger.info("查询到的用户数量【{}】", count);
+        } catch (Exception e) {
+            logger.info("查询用户数量出错【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        logger.info("查询用户列表信息数量的业务层方法结束！");
+        return count;
+    }
+
+
+    /**
+     * 修改当前登录人的密码
+     */
+    @Override
+    public Message updataPassword(String newPass) {
+        logger.info("修改用户密码的业务层方法开始！");
+        logger.info("修改用户密码的业务层方法拿到参数【{}】", newPass);
+        Message msg = new Message();
+        //获取登录人信息
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String userLog = userInfoDTO.getEmail();
+        if (userInfoDTO == null || StringUtils.isBlank(userLog)) {
+            logger.info("用户已离线！");
+            msg.setInfo("您已离线，请重新登录！");
+            msg.setResult(false);
+            return msg;
+        }
+        //必输项校验
+        if (StringUtils.isBlank(newPass)) {
+            logger.info("修改用户密码失败，参数【{}】不足！", newPass);
+            msg.setInfo("修改用户密码失败，参数不足！");
+            msg.setResult(false);
+            return msg;
+        }
+        try {
+            userInfoDTO.setPwd(newPass);
+            passwordHelper.encryptPassword(userInfoDTO);
+            SimpleDateFormat data = new SimpleDateFormat("yyyy-MM-dd");//设置日期格式
+            SimpleDateFormat time = new SimpleDateFormat("HH:mm:ss");//设置时间格式
+            userInfoDTO.setUpdateDate(data.format(new Date()));
+            userInfoDTO.setUpdateTime(time.format(new Date()));
+            userInfoDTO.setUpdateUser(userLog);
+            if (cmsSysUserMapper.updateByPrimaryKey(userInfoDTO) > 0) {
+                msg.setInfo("用户密码修改成功！");
+                msg.setResult(true);
+                logger.info("修改用户密码成功！");
+            }
+        } catch (Exception e) {
+            logger.info("修改用户密码失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("用户密码修改失败！");
+            msg.setResult(false);
+        }
+        logger.info("修改用户密码的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 判断原始密码是否正确
+     *
+     * @param oldPass
+     * @return
+     */
+    @Override
+    public Message checkOldPass(String oldPass) {
+        logger.info("判断原始密码是否正确的业务层方法开始！");
+        logger.info("判断原始密码是否正确的业务层方法拿到的原始密码【{}】", oldPass);
+        Message msg = new Message();
+        //获取登录人信息
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String userLog = userInfoDTO.getEmail();
+        if (userInfoDTO == null || StringUtils.isBlank(userLog)) {
+            logger.info("用户已离线！");
+            msg.setInfo("您已离线，请重新登录！");
+            msg.setResult(false);
+            return msg;
+        }
+        //必输项校验
+        if (StringUtils.isBlank(oldPass)) {
+            logger.info("判断失败，原始密码为【{}】。", oldPass);
+            msg.setInfo("判断失败，缺少原始密码。");
+            msg.setResult(false);
+            return msg;
+        }
+        CmsSysUser user = new CmsSysUser();
+        user.setPwd(oldPass);
+        user.setEmail(userLog);
+        user.setSalt(userInfoDTO.getSalt());
+        passwordHelper.encryptCkeckPassword(user);
+        if (userInfoDTO.getPwd().equals(user.getPwd())) {
+            msg.setInfo("原始密码正确！");
+            msg.setResult(true);
+        } else {
+            msg.setInfo("输入的原始密码不正确！");
+            msg.setResult(false);
+        }
+        logger.info("判断原始密码是否正确的业务层方法结束！");
+        return msg;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LdComServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LdComServiceImpl.java
new file mode 100644
index 000000000..4e43b54c3
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LdComServiceImpl.java
@@ -0,0 +1,38 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.domain.LdComParty;
+import com.ruoyi.content.domain.LdComPartyExample;
+import com.ruoyi.content.mapper.LdComPartyMapper;
+import com.ruoyi.content.service.LdComService;
+import com.ruoyi.content.utils.JsonUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class LdComServiceImpl implements LdComService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LdComServiceImpl.class);
+
+
+    @Autowired
+    private LdComPartyMapper ldComPartyMapper;
+
+    @Override
+    public List<LdComParty> queryldcomList() {
+        LOGGER.info("获取公司机构编码及企业号部门编码信息业务层方法开始");
+        String companyId = "1";// 公司id
+        String branchId = "86";//机构编码
+        LdComPartyExample example = new LdComPartyExample();
+        example.setOrderByClause("COMCODE ASC");
+        example.createCriteria().andCompanyIdEqualTo(companyId).andComcodeLike("%" + branchId + "%");
+        List<LdComParty> ldComPartylist = ldComPartyMapper.selectByExample(example);
+        LOGGER.info("机构编码与企业号部门编码信息ldComPartylist【{}】", JsonUtil.objectToJackson(ldComPartylist));
+        LOGGER.info("获取公司机构编码及企业号部门编码信息业务层方法结束");
+        return ldComPartylist;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
new file mode 100644
index 000000000..332e5fe6d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
@@ -0,0 +1,1103 @@
+package com.ruoyi.content.service.impl;
+
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.ruoyi.content.constants.PropertiesConstants;
+import com.ruoyi.content.domain.*;
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.exception.ParameterException;
+import com.ruoyi.content.mapper.*;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.redis.RedisManager;
+import com.ruoyi.content.service.ArticleService;
+import com.ruoyi.content.service.LibraryService;
+import com.ruoyi.content.service.TemplateSendService;
+import com.ruoyi.content.utils.DateUtil;
+import com.ruoyi.content.utils.HttpUtil;
+import com.ruoyi.content.utils.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class LibraryServiceImpl implements LibraryService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibraryServiceImpl.class);
+
+    @Autowired
+    private ArticleChannelMapper articleChannelMapper;
+    @Autowired
+    private BaseCodeMapper baseCodeMapper;
+    @Autowired
+    private ArticleChannelQueryMapper articleChannelQueryMapper;
+    @Autowired
+    private ArticleInfoMapper articleInfoMapper;
+    @Autowired
+    private ArticleService articleService;
+    @Autowired
+    private RedisManager redisManager;
+    @Autowired
+    private CmsSysUserExMapper cmsSysUserExMapper;
+    @Autowired
+    private TemplateSendService templateSendService;
+    @Autowired
+    private ArticlePublishTrackMapper articlePublishTrackMapper;
+    @Autowired
+    private ArticleSendUrlMapper articleSendUrlMapper;
+    @Autowired
+    private CmsSysUserMapper cmsSysUserMapper;
+    @Autowired
+    private ArticlePublishSendMapper articlePublishSendMapper;
+    @Autowired
+    private ArticleQueryMapper articleQueryMapper;
+
+
+    @Override
+    public List<HashMap<String, Object>> queryLibrary(int startRow, int rows, String articelName, String special, String channel,
+                                                      String articleState) throws Exception {
+
+        LOGGER.info("查询文章列表的业务层方法开始！");
+        LOGGER.info("拿到的参数 startRow【{}】，rows【{}】，文章名称【{}】，一级分类【{}】，二级分类【{}】，文章状态【{}】", startRow, rows, articelName,
+                special, channel, articleState);
+        String companyId = "1";// 公司id
+        String branchId = "86";
+        CmsSysUserExample example = new CmsSysUserExample();
+        CmsSysUserExample.Criteria criteria = example.createCriteria();
+        criteria.andCompanyIdEqualTo(companyId);
+        criteria.andBranchIdLike("%" + branchId + "%");
+        // 查询该渠道该公司下的后台管理用户
+        List<CmsSysUser> CmsSysUserList = cmsSysUserMapper.selectByExample(example);
+        List<String> userlist = new ArrayList<>();
+        for (CmsSysUser c : CmsSysUserList) {
+            String userId = c.getUserId();
+            LOGGER.info("分公司文章列表后台管理员userId[{}]", userId);
+            userlist.add(userId);
+        }
+        List<String> list = new ArrayList<String>();
+        list.add("1");
+        list.add("2");
+
+        if (StringUtils.isBlank(articelName)) {
+            articelName = "";
+        }
+
+        if (StringUtils.isBlank(special)) {
+            special = "";
+        }
+        if (StringUtils.isBlank(channel)) {
+            channel = "";
+        }
+        //List<ArticleChannel> libraryList = articleChannelQueryMapper.selectAllWithLimit(companyId, branchId,list, startRow, rows,
+        //articelName, special, channel);
+        HashMap<String, Object> parMap = new HashMap<String, Object>();
+        parMap.put("list", list);
+        parMap.put("startRow", startRow);
+        parMap.put("rows", rows);
+        parMap.put("articelName", articelName);
+        parMap.put("special", special);
+        parMap.put("channel", channel);
+        parMap.put("userlist", userlist);
+        List<HashMap<String, Object>> resultMap = articleChannelQueryMapper.selectByLimit(parMap);
+        List<String> publishList = new ArrayList<>();
+        if (channel != null && !channel.trim().equals("")) {
+            for (HashMap<String, Object> hashMap : resultMap) {
+                publishList.add((String) hashMap.get("publishId"));
+            }
+            LOGGER.info("所有的publishId：++++++++++++" + publishList);
+            resultMap = articleChannelQueryMapper.selectByPublishList(publishList);
+        }
+        if (resultMap == null || resultMap.size() < 1) {
+            LOGGER.info("未查询到数据");
+            throw new BusinessException("文库暂没有文章！");
+        }
+        LOGGER.info("查询文库列表的业务层方法结束！");
+        return resultMap;
+
+    }
+
+    /**
+     * 查询文库文章数量
+     */
+    @Override
+    public int countArticleInfoByState(String articelName, String special, String channel, String articleState) {
+        LOGGER.info("统计文章数量的业务层方法开始！");
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String companyId = userInfoDTO.getCompanyId();// 管理员公司id
+        ArticleChannelExample example = new ArticleChannelExample();
+
+        ArticleChannelExample.Criteria criteria = example.createCriteria();
+        example.createCriteria();
+        LOGGER.info("统计文章数量的业务层方法中拿到的文章名称【{}】、一级分类【{}】、二级分类【{}】、文章状态【{}】", articelName, special, channel, articleState);
+        if (StringUtils.isBlank(articleState)) {
+            criteria.andArticleStateNotEqualTo("1");
+        } else {
+            criteria.andArticleStateEqualTo(articleState);
+        }
+        if (StringUtils.isNotBlank(special)) {
+            criteria.andSpecialEqualTo(special);
+        }
+        if (StringUtils.isNotBlank(channel)) {
+            criteria.andChannelEqualTo(channel);
+        }
+
+        if (StringUtils.isNotBlank(articelName)) {
+            criteria.andArticleNameLike(articelName);
+        }
+        if (StringUtils.isNotBlank(companyId)) {
+            criteria.andCompanyIdEqualTo(companyId);
+        }
+        List<ArticleChannel> libraryList = null;
+        try {
+            libraryList = articleChannelMapper.selectByExample(example);
+            if (libraryList == null || libraryList.size() < 1) {
+                LOGGER.info("根据用户查询已发布的文章，未查询到数据【{}】", JsonUtil.objectToJackson(userInfoDTO));
+                return 0;
+            }
+        } catch (Exception e) {
+            LOGGER.info("统计文章数量的业务层方法产生异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        LOGGER.info("统计文章数量的业务层方法结束！");
+        return libraryList.size();
+    }
+/*
+	@Override
+	public Message addLibrary(ArticleChannel articleChannel) {
+		LOGGER.info("增加文章栏目关系的业务层方法开始！");
+		LOGGER.info("增加文章栏目关系中拿到的文章信息【{}】", JsonUtil.objectToJackson(articleChannel));
+		Message msg = new Message();
+//		Map<String, String> resultMap = new HashMap<String,String>();
+//		CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+		try {
+			// 修改文章表收录状态
+//			ArticleInfo articleInfo = articleInfoMapper.selectByPrimaryKey(articleChannel.getArticleId());
+			
+			ArticlePublishTrack apt = articlePublishTrackMapper.selectByPrimaryKey(articleChannel.getPublishId());
+			//收录成功后 将
+			apt.setLibraryState("1");
+			LOGGER.info("收录得到的文章版本号为{}",apt.getArticleVersion());
+			articleChannel.setArticleVersion(apt.getArticleVersion());
+			//手机端收录暂时注释 20180730
+//			LOGGER.info("articleInfo【{}】", JsonUtil.objectToJackson(articleInfo));
+//			String modifiedEditUrl = articleInfo.getModifiedEditUrl();
+//			String modifiedViewUrl = articleInfo.getModifiedViewUrl();
+//			String originalUrl = articleInfo.getOriginalUrl();
+//			String author = articleInfo.getArticleAuthor();
+//			Integer articleId = articleInfo.getArticleId();
+//			if(modifiedEditUrl==null || modifiedEditUrl=="") {
+//				//手机端导入文章
+//				String companyId = userInfoDTO.getCompanyId();//公司id
+//				String email = userInfoDTO.getEmail();
+//				CmsSysUser cmsSysUser = cmsSysUserExMapper.queryLoginInfoByEmail(email);
+//				String userId = cmsSysUser.getUserId();
+//				msg = articleService.getArticleContent(originalUrl, author, "");
+//				resultMap  = (Map<String, String>) msg.getObject();
+//				String listPicUrl = resultMap.get("listPicUrl");
+//				String articleName = resultMap.get("articleName");
+//				String shareTitle = resultMap.get("shareTitle");
+//				String shareImgUrl = resultMap.get("shareImgUrl");
+//				String shareDes = resultMap.get("shareDes");
+//				String articleContent = resultMap.get("articleContent");
+//				String publishId = userId+"a"+articleId;
+//				msg = articleService.getHtmlUrl(articleId, shareTitle, shareImgUrl, shareDes, articleContent, "",publishId,companyId);
+//				resultMap  = (Map<String, String>) msg.getObject();
+//				modifiedEditUrl = resultMap.get("articleEditUrl");
+//				modifiedViewUrl = resultMap.get("articleViewUrl");
+//				//将文章原始静态页路径添加到收录路径
+//				articleInfo.setModifiedEditUrl(modifiedEditUrl);
+//				articleInfo.setModifiedViewUrl(modifiedViewUrl);
+//				
+//				if (articleInfoMapper.updateByPrimaryKey(articleInfo)> 0) {
+//					LOGGER.info("修改文章表收录状态成功");
+//				}
+//				
+//				String jobNumber = cmsSysUser.getJobNumber();
+//				LOGGER.info("当前用户工号为jobNumber【{}】",jobNumber);
+//				articleService.checkJobNumber(articleId, articleName, listPicUrl, "", publishId, 
+//						companyId, jobNumber, userId, email,modifiedEditUrl,modifiedViewUrl);
+//			}
+
+			if (articlePublishTrackMapper.updateByPrimaryKeySelective(apt)> 0) {
+				LOGGER.info("修改文章发布表成功");
+			}
+			// 文库表添加数据
+			ArticleChannelExample example = new ArticleChannelExample();
+			example.createCriteria().andSpecialEqualTo(articleChannel.getSpecial()).andChannelEqualTo(articleChannel.getChannel()).andArticleIdEqualTo(articleChannel.getArticleId()).andArticleStateNotEqualTo("1");
+			List<ArticleChannel> ArticleChannels = articleChannelMapper.selectByExample(example);
+			
+			if (ArticleChannels.size()>0) {
+				LOGGER.info("添加文章关系失败，栏目channel【{}】下已存在文章article【{}】",articleChannel.getChannel(),articleChannel.getArticleId());
+				msg.setInfo("收录失败！已有其他版本的文章被收录到同一栏目下！");
+				msg.setResult(false);
+			}else {
+				if (articleChannelMapper.insertSelective(articleChannel) > 0) {
+					msg.setInfo("添加成功！");
+					msg.setResult(true);
+					LOGGER.info("添加成功！");
+					String codeType = articleChannel.getSpecial();
+					redisManager.delete("article_channel_"+codeType+"_"+articleChannel.getChannel());
+					LOGGER.info("删除原有redis文库信息成功！");
+				}
+			}
+			
+		} catch (Exception e) {
+			LOGGER.info("添加文章关系失败【{}】", e.getMessage());
+			msg.setInfo("收录失败！");
+			msg.setResult(false);
+			e.printStackTrace();
+		}
+		LOGGER.info("增加文章栏目关系的业务层方法结束！");
+		return msg;
+	}
+	*/
+
+    @Override
+    //@Transactional
+    public Message addLibrary(String companyId, String branchId, String channelId, String articleInfoList) {
+        LOGGER.info("批量添加文章到相应栏目业务层开始！");
+        Message msg = new Message();
+        List<String> articleState = new ArrayList<>();
+        articleState.add("1");
+        articleState.add("2");
+        JsonArray jsonArray = new JsonParser().parse(articleInfoList).getAsJsonArray();
+        List<ArticleChannel> batchInsertArticle = new ArrayList<>();
+        if (channelId != null && !"".equals(channelId.trim())) {
+            channelId = channelId + ",ARTICLE-2";
+        }
+        try {
+            String[] channelIdArr = channelId.split(",");
+            for (String id : channelIdArr) {
+                BaseCode baseCode = this.queryBaseCodeByChannelId(id.split("-")[1]);
+                if (baseCode == null) {
+                    continue;
+                }
+                for (JsonElement ele : jsonArray) {
+                    JsonObject article = ele.getAsJsonObject();
+                    LOGGER.info("遍历的单个文章信息：articleId：【{}】，publishId：【{}】，articleName：【{}】", article.get("articleId").getAsString(),
+                            article.get("publishId").getAsString(), article.get("articleName").getAsString());
+                    //变更文章收录状态
+                    ArticlePublishTrack apt = articlePublishTrackMapper.selectByPrimaryKey(article.get("publishId").getAsString());
+                    if (!"1".equals(apt.getLibraryState())) {
+                        apt.setLibraryState("1");
+                        int sucCount = articlePublishTrackMapper.updateByPrimaryKeySelective(apt);
+                        LOGGER.info("根据文章publishId：【{}】,更新文章发布状态成功sucCount：", article.get("publishId").getAsString(), sucCount);
+                    }
+                    ArticleChannelExample example = new ArticleChannelExample();
+                    example.createCriteria().andSpecialEqualTo(baseCode.getCodeType())
+                            .andChannelEqualTo(baseCode.getCodeCode())
+                            .andArticleIdEqualTo(article.get("articleId").getAsInt())
+                            .andArticleStateNotIn(articleState);
+                    List<ArticleChannel> ArticleChannels = articleChannelMapper.selectByExample(example);
+                    if (!(ArticleChannels.size() > 0)) {
+                        ArticleChannel articleChannel = new ArticleChannel();
+                        articleChannel.setArticleId(Integer.valueOf(article.get("articleId").getAsInt()));
+                        articleChannel.setPublishId(article.get("publishId").getAsString());
+                        articleChannel.setArticleName(article.get("articleName").getAsString());
+                        articleChannel.setSpecial(baseCode.getCodeType());
+                        articleChannel.setChannel(baseCode.getCodeCode());
+                        articleChannel.setCompanyId(companyId);
+                        articleChannel.setBranchId(branchId);
+                        articleChannel.setPublishDate(DateUtil.currentDate());
+                        articleChannel.setPublishTime(DateUtil.currentTime());
+                        articleChannel.setUpdateDate(DateUtil.currentDate());
+                        articleChannel.setUpdateTime(DateUtil.currentTime());
+                        articleChannel.setArticleState("0");
+                        articleChannel.setArticleVersion(apt.getArticleVersion());
+                        batchInsertArticle.add(articleChannel);
+                    }
+                }
+            }
+            int successCount = 0;
+            if (batchInsertArticle.size() > 0) {
+                LOGGER.info("数据库保存数据：" + batchInsertArticle);
+                successCount = articleChannelQueryMapper.batchInsertArticeChannel(batchInsertArticle);
+                LOGGER.info("批量收录【{}】篇文章成功！", successCount);
+                for (ArticleChannel ac : batchInsertArticle) {
+                    String codeType = ac.getSpecial();
+                    String channel = ac.getChannel();
+                    redisManager.delete("article_channel_" + codeType + "_" + channel);
+                    LOGGER.info("先清除相应栏目下的redis：" + "article_channel_" + codeType + "_" + channel);
+                }
+            }
+            msg.setInfo("批量收录文章成功");
+            msg.setResult(true);
+            HashMap<Object, Object> result = new HashMap<Object, Object>();
+            result.put("successNum", successCount);
+            msg.setObject(result);
+        } catch (Exception e) {
+            LOGGER.info("添加文章关系失败【{}】", e.getMessage());
+            msg.setInfo("收录失败！");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        LOGGER.info("批量收录文章到指定栏目的业务层方法结束！");
+        return msg;
+    }
+
+    @Override
+    public Message removeArticleItem(String companyId, String branchId, String channelId, String articleInfoList) {
+        LOGGER.info("批量删除相应栏目下文章业务层开始！");
+        Message msg = new Message();
+        List<Integer> batchList = new ArrayList<>();
+        JsonArray jsonArray = new JsonParser().parse(articleInfoList).getAsJsonArray();
+        List<String> articleState = new ArrayList<>();
+        articleState.add("1");
+        articleState.add("2");
+        //三级栏目的文章和二级栏目的文章分开清理
+        String[] channelIdArray = channelId.split(",");
+        try {
+            for (String id : channelIdArray) {
+                BaseCode baseCode = this.queryBaseCodeByChannelId(id.split("-")[1]);
+                if (baseCode == null) { //baseCode不存在  跳过相应的栏目
+                    continue;
+                }
+                for (JsonElement ele : jsonArray) {
+                    JsonObject article = ele.getAsJsonObject();
+                    ArticleChannelExample example = new ArticleChannelExample();
+                    example.createCriteria().andSpecialEqualTo(baseCode.getCodeType())
+                            .andChannelEqualTo(baseCode.getCodeCode())
+                            .andArticleIdEqualTo(article.get("articleId").getAsInt());
+                    List<ArticleChannel> ArticleChannels = articleChannelMapper.selectByExample(example);
+                    for (ArticleChannel articleChannel : ArticleChannels) {
+                        //如果要移除的栏目是二级栏目即文库下的直接栏目  需要判断文库相应二级栏目下
+                        //是否有三级栏目还保存着这片文章，如果有的话移除无意义  不进行移除  没有的话就移除
+                        if ("ARTICLE".equals(baseCode.getCodeType())) {
+                            ArticleChannelExample exampleSec = new ArticleChannelExample();
+                            exampleSec.createCriteria().andSpecialEqualTo(baseCode.getCodeCode())
+                                    .andArticleStateNotIn(articleState)
+                                    .andArticleIdEqualTo(articleChannel.getArticleId());
+                            List<ArticleChannel> thirdArticle = articleChannelMapper.selectByExample(exampleSec);
+                            List<Boolean> flagList = new ArrayList<>();
+                            for (ArticleChannel ac : thirdArticle) {
+                                LOGGER.info("查询的文章列表：" + ac.getArticleName());
+                                for (int i = 0; i < channelIdArray.length; i++) {
+                                    BaseCode bc = this.queryBaseCodeByChannelId(channelIdArray[i].split("-")[1]);
+                                    LOGGER.info("比较详情文章的channel：" + ac.getChannel() + "  数组的查询channel" + bc.getCodeCode());
+                                    if (ac.getChannel().equals(bc.getCodeCode())) {
+                                        flagList.add(true);
+                                        break;
+                                    }
+                                }
+                            }
+                            if (flagList.size() == thirdArticle.size()) {
+                                batchList.add(articleChannel.getId());
+                            }
+                        } else {
+                            batchList.add(articleChannel.getId());
+                        }
+                    }
+                }
+                String codeType = baseCode.getCodeType();
+                redisManager.delete("article_channel_" + codeType + "_" + baseCode.getCodeCode());
+                LOGGER.info("并清除相应栏目redis：【{}】", "article_channel_" + codeType + "_" + baseCode.getCodeCode());
+            }
+            int delCount = 0;
+            if (batchList.size() > 0) {
+                ArticleChannelExample delExample = new ArticleChannelExample();
+                delExample.createCriteria().andIdIn(batchList);
+                delCount = articleChannelMapper.deleteByExample(delExample);
+                LOGGER.info("批量移除【{}】篇文章成功！", delCount);
+            }
+            msg.setInfo("批量移除成功！");
+            msg.setResult(true);
+            HashMap<Object, Object> resultMap = new HashMap<Object, Object>();
+            resultMap.put("delCount", delCount);
+            msg.setObject(resultMap);
+        } catch (Exception e) {
+            LOGGER.info("移除文章关系失败【{}】", e.getMessage());
+            msg.setInfo("移除失败！");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        LOGGER.info("批量移除指定栏目下文章的业务层方法结束！");
+        return msg;
+    }
+
+    @Override
+    public Message changeSate(String ids, String eState, String sState, String publishId) {
+        LOGGER.info("发布文章的业务层方法开始！");
+        LOGGER.info("发布文章的业务层方法中拿到的文章的articleId【{}】,eState[{}],sState[{}],publishId[{}]", ids, eState, sState, publishId);
+        Message msg = new Message();
+        if (StringUtils.isBlank(ids)) {
+            LOGGER.info("发布文章失败，缺少参数");
+            msg.setInfo("发布文章失败！");
+            msg.setResult(false);
+            throw new ParameterException("发布文章失败，缺少参数");
+        }
+        try {
+            String[] arrId = ids.split(",");
+            for (String aId : arrId) {
+                if (StringUtils.isNotBlank(aId)) {
+                    ArticleChannel articleChannel = articleChannelMapper.selectByPrimaryKey(Integer.valueOf(aId));
+
+                    if (articleChannel != null) {
+                        LOGGER.info("文章存在【{}】，进行状态修改！", JsonUtil.objectToJackson(articleChannel));
+                        if (articleChannel.getArticleState() == "0") {// 文章已经发布
+                            LOGGER.info("文章已经发布，不进行操作！");
+                        } else {
+                            articleChannel.setArticleState("0");
+                            articleChannel.setPublishDate(DateUtil.currentDate());
+                            articleChannel.setPublishTime(DateUtil.currentTime());
+                            articleChannel.setUpdateDate(DateUtil.currentDate());
+                            articleChannel.setUpdateTime(DateUtil.currentTime());
+                            if (articleChannelMapper.updateByPrimaryKey(articleChannel) > 0) {
+                                msg.setInfo("发布文章成功。");
+                                msg.setResult(true);
+                                LOGGER.info("发布文章成功！");
+                                String codeType = articleChannel.getSpecial();
+                                redisManager.delete("article_channel_" + codeType + "_" + articleChannel.getChannel());
+                                LOGGER.info("删除原有redis文库信息成功！");
+                            } else {
+                                msg.setInfo("发布文章失败。");
+                                msg.setResult(false);
+                                LOGGER.info("发布文章失败！");
+                            }
+                        }
+                    } else {
+                        msg.setInfo("发布文章失败。");
+                        msg.setResult(false);
+                        LOGGER.info("文章不存在，发布失败！");
+                    }
+                }
+            }
+            LOGGER.info("状态修改结束！");
+        } catch (NumberFormatException e) {
+            msg.setInfo("发布文章失败，请重试！");
+            msg.setResult(false);
+            LOGGER.info("发布文章出现 异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        LOGGER.info("发布文章的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 根据文章id删除文章
+     */
+    @Override
+    public Message delArticle(String id) {
+        LOGGER.info("删除文章栏目关系的业务层方法开始！");
+        LOGGER.info("删除文章栏目关系的业务层方法中拿到的文章的id【{}】", id);
+        Message msg = new Message();
+        if (StringUtils.isBlank(id)) {
+            LOGGER.info("删除文章信息失败，缺少参数");
+            throw new ParameterException("未查询到文章信息");
+        }
+        msg.setInfo("删除失败！");
+        msg.setResult(false);
+        List<Integer> delChannel = new ArrayList<>();
+        List<String> delPublishId = new ArrayList<>();
+        try {
+            String[] publishId = id.split(",");
+            for (String pId : publishId) {
+                if (StringUtils.isNotBlank(pId)) {
+                    delPublishId.add(pId);
+                    ArticleChannelExample example = new ArticleChannelExample();
+                    ArticleChannelExample.Criteria criteria = example.createCriteria();
+                    criteria.andPublishIdEqualTo(pId);
+                    //ArticleChannel articleChannel = articleChannelMapper.selectByPrimaryKey(Integer.valueOf(aId));
+                    List<ArticleChannel> list = articleChannelMapper.selectByExample(example);
+                    for (ArticleChannel articleChannel : list) {
+                        if (articleChannel != null) {
+                            delChannel.add(articleChannel.getId());
+                            redisManager.delete("article_channel_" + articleChannel.getSpecial() + "_" + articleChannel.getChannel());
+                            LOGGER.info("删除redis文章栏目关系成功key:[{}]！", "article_channel_" + articleChannel.getSpecial() + "_" + articleChannel.getChannel());
+                        }
+                    }
+                }
+            }
+            if (delChannel != null && delChannel.size() > 0) {
+                ArticleChannelExample delChannelExample = new ArticleChannelExample();
+                delChannelExample.createCriteria().andIdIn(delChannel);
+                articleChannelMapper.deleteByExample(delChannelExample);
+            }
+            ArticlePublishTrackExample delPublishExample = new ArticlePublishTrackExample();
+            delPublishExample.createCriteria().andPublishIdIn(delPublishId);
+            articlePublishTrackMapper.deleteByExample(delPublishExample);
+            LOGGER.info("删除channel表成功，id：【{}】，删除publish表成功，publishId：【{}】", delChannel, delPublishId);
+            msg.setInfo("删除文章成功");
+            msg.setResult(true);
+        } catch (Exception e) {
+            LOGGER.info("删除文章栏目关系失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除文章栏目关系失败，请稍候再试！");
+            msg.setResult(true);
+        }
+        LOGGER.info("删除文章栏目关系的业务层方法结束！");
+        return msg;
+    }
+
+    /**
+     * 文章排序
+     */
+    @Override
+    public Message updateLibrary(String id, String orderNo) {
+        LOGGER.info("文库文章排序的业务层方法开始！");
+        LOGGER.info("文章排序参数id【{}】，orderNo【{}】", id, orderNo);
+        Message msg = new Message();
+        if (StringUtils.isBlank(orderNo) || StringUtils.isBlank(id)) {
+            LOGGER.info("文章排序失败，缺少参数");
+            msg.setInfo("文章排序失败！");
+            msg.setResult(false);
+            throw new ParameterException("文章排序失败，缺少参数");
+        }
+        try {
+            ArticleChannel articleChannel = articleChannelMapper.selectByPrimaryKey(Integer.valueOf(id));
+            if (articleChannel != null) {
+                String time = DateUtil.currentDate(DateUtil.YMDHMS);
+                articleChannel.setOrderNo(Integer.valueOf(orderNo));
+                if ("0".equals(orderNo)) {
+                    articleChannel.setTopTime("0");
+                } else {
+                    articleChannel.setTopTime(time);
+                }
+                articleChannel.setUpdateDate(DateUtil.currentDate());
+                articleChannel.setUpdateTime(DateUtil.currentTime());
+                if (articleChannelMapper.updateByPrimaryKey(articleChannel) > 0) {
+                    msg.setInfo("更新排序成功！");
+                    msg.setResult(true);
+                    LOGGER.info("更新排序成功！");
+                    redisManager.delete("article_channel_" + articleChannel.getChannel());
+                    LOGGER.info("删除redis文章栏目关系成功！");
+                }
+
+            }
+
+        } catch (Exception e) {
+            LOGGER.info("文章排序失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("文章排序失败，请稍候再试！");
+            msg.setResult(true);
+        }
+        LOGGER.info("文库文章排序的业务层方法结束！");
+        return msg;
+    }
+
+    @Override
+    public BaseCode queryBaseCodeByChannelId(String channelId) {
+        LOGGER.info("开始根据栏目id查询栏目名称！");
+        BaseCode baseCode = baseCodeMapper.selectByPrimaryKey(Integer.valueOf(channelId));
+        LOGGER.info("查询基础数据结束，查询到的结果为【{}】" + JsonUtil.objectToJackson(baseCode));
+        LOGGER.info("结束根据栏目id查询栏目名称！");
+        return baseCode;
+    }
+
+    @Override
+    public Message queryEditUrlByPublishId(String publishId) {
+        LOGGER.info("根据发布id查编辑路径开始！");
+        Message msg = new Message();
+        Map<String, String> resultMap = new HashMap<String, String>();
+        ArticlePublishTrack ap = articlePublishTrackMapper.selectByPrimaryKey(publishId);
+        LOGGER.info("接收到参数ap[{}]", JsonUtil.objectToJackson(ap));
+        String editUrl = ap.getBackgroundEditUrl();
+        if (editUrl == null || editUrl == "") {
+            msg.setResult(false);
+            msg.setInfo("预览失败！");
+            LOGGER.info("预览失败！");
+
+        } else {
+            msg.setResult(true);
+            resultMap.put("editUrl", editUrl);
+            msg.setObject(resultMap);
+        }
+        LOGGER.info("结束根据栏目id查询栏目名称！");
+        return msg;
+    }
+
+    @Override
+    public int checkCreateUser(String articleId, String originalUrl, String createUser) {
+        ArticleInfo articleInfo = articleService.queryArticleByArticleId(articleId);
+        String modifiedEditUrl = articleInfo.getModifiedEditUrl();
+        if (modifiedEditUrl == null || modifiedEditUrl == "") {
+            //msg = articleService.getArticleContentByUrl(originalUrl,createUser,createUser,"");
+            //resultMap  = (Map<String, String>) msg.getObject();
+            String articleEditUrl = articleInfo.getArticleEditUrl();
+            String articleViewUrl = articleInfo.getArticleViewUrl();
+            articleInfo.setModifiedEditUrl(articleEditUrl);
+            articleInfo.setModifiedViewUrl(articleViewUrl);
+            articleInfoMapper.updateByPrimaryKey(articleInfo);
+            return 0;//业务员创建
+        }
+        return 1;//
+    }
+
+    @SuppressWarnings({"unused", "deprecation"})
+    @Override
+    public Message articleSend(String articleId, String publishId, String agentCode, String sendType, String partyId, Integer sendId) {
+        LOGGER.info("推送文章的业务层方法开始！");
+        LOGGER.info("推送文章的业务层方法中拿到的文章的articleId【{}】,publishId[{}],agentCode[{}],sendType[{}],partyId[{}]", new Object[]{articleId, publishId, agentCode, sendType, partyId});
+        Message msg = new Message(true, "推送文章成功");
+        CmsSysUser userInfoDTO = null;
+        String companyId = null;
+        String email = null;
+        ArticlePublishSend aps = null;
+        if (sendId != null) {
+            aps = articlePublishSendMapper.selectByPrimaryKey(sendId);
+            String userId = aps.getOperateId();
+            CmsSysUserExample user = new CmsSysUserExample();
+            user.createCriteria().andUserIdEqualTo(userId);
+            userInfoDTO = cmsSysUserMapper.selectByExample(user).get(0);
+
+        } else {
+            userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        }
+        companyId = userInfoDTO.getCompanyId();
+        email = userInfoDTO.getEmail();
+        CmsSysUser cmsSysUser = this.cmsSysUserExMapper.queryLoginInfoByEmail(email);
+        String userId = cmsSysUser.getUserId();
+        String sysUserName = cmsSysUser.getName();
+        if ((StringUtils.isBlank(articleId)) || (StringUtils.isBlank(publishId))) {
+            LOGGER.info("推送文章失败，缺少参数");
+            msg.setInfo("推送文章失败！");
+            msg.setResult(false);
+            throw new ParameterException("推送文章失败，缺少参数");
+        }
+        try {
+            ArticlePublishTrackExample example = new ArticlePublishTrackExample();
+            ArticlePublishTrackExample.Criteria criteria = example.createCriteria();
+            criteria.andPublishIdEqualTo(publishId);
+            criteria.andArticleIdEqualTo(articleId);
+            List aplist = this.articlePublishTrackMapper.selectByExample(example);
+            String viewUrl = ((ArticlePublishTrack) aplist.get(0)).getPublishViewUrl();
+            ArticleInfo articleInfo = this.articleInfoMapper.selectByPrimaryKey(Integer.valueOf(articleId));
+            String articleName = articleInfo.getArticleName();
+            String picUrl = articleInfo.getListPicUrl();
+            String shareDes = articleInfo.getShareDes();
+            String[] viewUrls = viewUrl.split("/");
+            String url = viewUrls[(viewUrls.length - 1)];
+            String[] urls = url.split("b");
+            String url1 = urls[(urls.length - 1)];
+            String versionNumber = url1.substring(0, 20);
+            LOGGER.info("管理员sysUserName【{}】推送文章articleId【{}】版本号versionNumber[{}]", new Object[]{sysUserName, articleId, versionNumber});
+
+            String newClickId = "0";
+            String origin = PropertiesConstants.REDIRECT_ARTICLE_VIEW;
+            String link = "publishId=" + publishId + "&parentClickId=" + newClickId + "&versionNumber=" + versionNumber + "&parentPublishId=" + publishId + "&parentUserId=" + userId + "&companyId=" + companyId;
+
+            String articleUrl = URLEncoder.encode(origin + link);
+            LOGGER.info("请求企业号跳转文章url[{}]", articleUrl);
+            Map result = new HashMap();
+            String qyhArticleUrl = "";
+            ArticleSendUrl articleSendUrl = this.articleSendUrlMapper.selectByPrimaryKey(publishId);
+
+            String sendViewUrl = viewUrl + "?" + "companyId=" + companyId + "&parentClickId=" + newClickId + "&qyhState=1";
+            if ("1".equals(sendType)) {
+                LOGGER.info("复制文章推送链路qyhArticleUrl[{}]", sendViewUrl);
+                msg.setObject(sendViewUrl);
+                return msg;
+            }
+            LOGGER.info("开始调用消息推送方法！");
+            try {
+                msg = this.templateSendService.newArticleSend(articleName, sendViewUrl, picUrl, shareDes, agentCode, partyId);
+                if (sendId != null) {
+                    if (msg.getResult()) {
+                        aps.setSendState("1");
+                    } else {
+                        aps.setSendState("0");
+                    }
+                    articlePublishSendMapper.updateByPrimaryKey(aps);
+                    LOGGER.info("更新articlePublishSend成功");
+                } else {
+                    //发送消息成功  保存详细信息到  推送文章信息记录表
+                    ArticlePublishSend articlePublishSend = new ArticlePublishSend();
+                    articlePublishSend.setArticleId(Integer.parseInt(articleId));
+                    articlePublishSend.setPublishId(publishId);
+                    articlePublishSend.setOperateId(userId);
+                    articlePublishSend.setOperateName(sysUserName);
+                    articlePublishSend.setPublishDate(DateUtil.currentDate());
+                    articlePublishSend.setPublishTime(DateUtil.currentTime());
+                    articlePublishSend.setOperateDate(DateUtil.currentDate());
+                    articlePublishSend.setOperateTime(DateUtil.currentTime());
+                    if (msg.getResult()) {
+                        articlePublishSend.setSendState("1");
+                    } else {
+                        articlePublishSend.setSendState("0");
+                    }
+                    if (StringUtils.isBlank(agentCode)) {  //推送企业
+                        LOGGER.info("推送至企业");
+                        articlePublishSend.setSendType("0");
+                        articlePublishSend.setGroupId(partyId);
+                    } else { //推送个人
+                        LOGGER.info("推送至个人");
+                        articlePublishSend.setSendType("1");
+                        articlePublishSend.setGroupId(agentCode);
+                    }
+                    if (articlePublishSendMapper.insert(articlePublishSend) > 1) {
+                        LOGGER.info("记录推送文章详情成功，记录信息：" + JsonUtil.objectToJackson(articlePublishSend));
+                    }
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            LOGGER.info("结束调用消息推送!");
+            //消息推送类型如果是企业号  结束更新publish表
+            if (StringUtils.isBlank(agentCode)) {
+                ArticlePublishTrack publishArticle = (ArticlePublishTrack) aplist.get(0);
+                publishArticle.setUpdateDate(DateUtil.currentDate());
+                publishArticle.setUpdateTime(DateUtil.currentTime());
+                publishArticle.setUpdateUser(sysUserName);
+                articlePublishTrackMapper.updateByPrimaryKey(publishArticle);
+                //清楚相应栏目下的redis
+                ArticleChannelExample channelExample = new ArticleChannelExample();
+                channelExample.createCriteria()
+                        .andPublishIdEqualTo(publishArticle.getPublishId())
+                        .andArticleIdEqualTo(Integer.parseInt(publishArticle.getArticleId()))
+                        .andArticleStateEqualTo("0");
+                List<ArticleChannel> articleChannels = articleChannelMapper.selectByExample(channelExample);
+                for (ArticleChannel articleChannel : articleChannels) {
+                    LOGGER.info("清楚redis中key：" + "article_channel_" + articleChannel.getSpecial() + "_" + articleChannel.getChannel());
+                    redisManager.delete("article_channel_" + articleChannel.getSpecial() + "_" + articleChannel.getChannel());
+                }
+
+
+            }
+        } catch (NumberFormatException e) {
+            msg.setInfo("文章推送失败，请重试！");
+            msg.setResult(false);
+            LOGGER.info("文章推送失败 异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        LOGGER.info("文章推送的业务层方法结束！");
+        return msg;
+    }
+
+    //注册企业号链接
+    @SuppressWarnings("unchecked")
+    public String registeQyhUrl(String articleUrl) {
+        Map<String, String> result = new HashMap<>();
+        String state = "";
+        String qyhArticleUrl = "";
+        String getUrl = PropertiesConstants.GVQYH_ARTICLE_WRITE + articleUrl;
+        String json;
+        String resultMsg;
+        try {
+            json = HttpUtil.get(getUrl);
+            LOGGER.info("企业号注册链接接口返回报文为【{}】", json);
+            if (StringUtils.isNotBlank(json)) {
+                result = JsonUtil.jackson2Map(json);
+                if ("suc".equals(result.get("result_code"))) {
+                    resultMsg = result.get("result_msg");
+                    state = resultMsg.split("_")[1].substring(0, 5);
+                    LOGGER.info("链接标识state[{}]", state);
+                    qyhArticleUrl = PropertiesConstants.GVQYH_INDEX + state;
+                } else {
+                    state = result.get("result_msg");
+                    LOGGER.info("文章企业号链接注册失败，返回信息为：【{}】", state);
+                }
+            }
+        } catch (Exception e) {
+            LOGGER.info("执行http请求，发生异常。异常信息如下：", e.getMessage());
+            throw new BusinessException("系统正在维护中，请稍后再试");
+        }
+        return qyhArticleUrl;
+    }
+
+
+    @Override
+    public Message delLibraryHTML(String id) {
+        LOGGER.info("删除HTML栏目关系的业务层方法开始！");
+
+        LOGGER.info("删除HTML栏目关系的业务层方法中拿到的文章的主键id【{}】", id);
+        Message msg = new Message();
+        if (StringUtils.isBlank(id)) {
+            LOGGER.info("删除HTML信息失败，缺少参数");
+            throw new ParameterException("未查询到文章信息");
+        }
+        msg.setInfo("删除失败！");
+        msg.setResult(false);
+        try {
+            String[] arrId = id.split(",");
+            for (String aId : arrId) {
+                if (StringUtils.isNotBlank(aId)) {
+                    ArticleChannelExample example = new ArticleChannelExample();
+                    ArticleChannelExample.Criteria criteria = example.createCriteria();
+                    criteria.andArticleIdEqualTo(Integer.valueOf(aId));
+                    //ArticleChannel articleChannel = articleChannelMapper.selectByPrimaryKey(Integer.valueOf(aId));
+                    List<ArticleChannel> articleChannelList = articleChannelMapper.selectByExample(example);
+                    for (ArticleChannel articleChannel : articleChannelList) {
+                        if (articleChannel != null) {
+                            articleChannel.setArticleState("1");
+                            articleChannel.setUpdateDate(DateUtil.currentDate());
+                            articleChannel.setUpdateTime(DateUtil.currentTime());
+                            if (articleChannelMapper.updateByPrimaryKey(articleChannel) > 0) {
+                                msg.setInfo("删除成功！");
+                                msg.setResult(true);
+                                LOGGER.info("删除文章栏目关系成功！");
+                                redisManager.delete("article_channel_ARTICLE_" + articleChannel.getChannel());
+                                LOGGER.info("删除redis文章栏目关系成功！");
+                            }
+                        }
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            LOGGER.info("删除文章栏目关系失败【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除文章栏目关系失败，请稍候再试！");
+            msg.setResult(true);
+            return msg;
+        }
+        LOGGER.info("删除文章栏目关系的业务层方法结束！");
+        return msg;
+    }
+
+    @Override
+    public int countArticleByParam(String articelName, String special, String channel, String articleState) {
+        LOGGER.info("查询文章列表总数的业务层方法开始！");
+        LOGGER.info("拿到的参数 文章名称【{}】，一级分类【{}】，二级分类【{}】，文章状态【{}】", articelName,
+                special, channel, articleState);
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String companyId = userInfoDTO.getCompanyId();// 公司id
+        String branchId = userInfoDTO.getBranchId();
+        CmsSysUserExample example = new CmsSysUserExample();
+        CmsSysUserExample.Criteria criteria = example.createCriteria();
+        criteria.andCompanyIdEqualTo(companyId);
+        criteria.andBranchIdLike("%" + branchId + "%");
+        // 查询该渠道该公司下的后台管理用户
+        List<CmsSysUser> CmsSysUserList = cmsSysUserMapper.selectByExample(example);
+        List<String> userlist = new ArrayList<>();
+        for (CmsSysUser c : CmsSysUserList) {
+            String userId = c.getUserId();
+            LOGGER.info("分公司文章列表后台管理员userId[{}]", userId);
+            userlist.add(userId);
+        }
+        List<String> list = new ArrayList<String>();
+        list.add("1");
+        list.add("2");
+
+        if (StringUtils.isBlank(articelName)) {
+            articelName = "";
+        }
+
+        if (StringUtils.isBlank(special)) {
+            special = "";
+        }
+        if (StringUtils.isBlank(channel)) {
+            channel = "";
+        }
+        HashMap<String, Object> parMap = new HashMap<String, Object>();
+        parMap.put("list", list);
+        parMap.put("articelName", articelName);
+        parMap.put("special", special);
+        parMap.put("channel", channel);
+        parMap.put("userlist", userlist);
+        List<HashMap<String, Object>> resultMap = articleChannelQueryMapper.selectCountByParam(parMap);
+        if (resultMap == null || resultMap.size() < 1) {
+            LOGGER.info("未查询到数据【{}】", JsonUtil.objectToJackson(userInfoDTO));
+            throw new BusinessException("文库暂没有文章！");
+        }
+        LOGGER.info("查询文库列表的业务层方法结束！");
+        return resultMap.size();
+    }
+
+    @Override
+    public Message onkeyExChange(String from, String to, String companyId, String branchId) {
+        LOGGER.info("批量转换文章栏目关系的业务层方法开始！");
+        String special = to.split("-")[0];
+        String codeTypeTo = to.split("-")[1];
+        Message msg = new Message();
+        Integer fall = 0;
+        Integer suc = 0;
+        try {
+            String[] codeType = from.split(",");
+            for (int i = 0; i < codeType.length; i++) {
+                ArticleChannelExample example = new ArticleChannelExample();
+                example.createCriteria().andSpecialEqualTo("ARTICLE").andChannelEqualTo(codeType[i])
+                        .andArticleStateEqualTo("0").andCompanyIdEqualTo(companyId).andBranchIdEqualTo(branchId);
+                List<ArticleChannel> ArticleChannels = articleChannelMapper.selectByExample(example);
+                for (ArticleChannel articleChannel : ArticleChannels) {
+                    ArticleChannelExample example2 = new ArticleChannelExample();
+                    example2.createCriteria().andArticleIdEqualTo(articleChannel.getArticleId()).andSpecialEqualTo(special).
+                            andChannelEqualTo(codeTypeTo).andArticleStateEqualTo("0");
+                    List<ArticleChannel> result = articleChannelMapper.selectByExample(example2);
+                    if (result.size() > 0) {
+                        LOGGER.info("文章：" + result.get(0).getId() + result.get(0).getArticleName() + "在" + codeTypeTo + "发布过");
+                        fall++;
+                    } else {
+                        articleChannel.setId(null);
+                        articleChannel.setUpdateDate(DateUtil.currentDate());
+                        articleChannel.setUpdateTime(DateUtil.currentTime());
+                        articleChannel.setSpecial(special);
+                        articleChannel.setChannel(codeTypeTo);
+                        if (articleChannelMapper.insertSelective(articleChannel) > 0) {
+                            suc++;
+                        }
+                    }
+                }
+            }
+            redisManager.delete("article_channel_" + special + "_" + codeTypeTo);
+            LOGGER.info("删除原有redis文库信息成功！key:" + "article_channel_" + special + "_" + codeTypeTo);
+            msg.setInfo("成功");
+            msg.setResult(true);
+            HashMap<String, Object> resultMap = new HashMap<>();
+            resultMap.put("fall", fall);
+            resultMap.put("suc", suc);
+            msg.setObject(resultMap);
+        } catch (Exception e) {
+            LOGGER.info("添加文章关系失败【{}】", e.getMessage());
+            msg.setInfo("收录失败！");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        LOGGER.info("增加文章栏目关系的业务层方法结束！");
+        return msg;
+    }
+
+    @Override
+    public Message onTimeSend(String articleId, String publishId, String agentCode, String sendType, String partyId,
+                              String sendTime) {
+        LOGGER.info("定时推送文章的业务层方法开始！");
+        LOGGER.info("接收到的参数：articleId【{}】,publishId[{}],agentCode[{}],sendType[{}],partyId[{}],sendTime[{}]",
+                new Object[]{articleId, publishId, agentCode, sendType, partyId, sendTime});
+        Message msg = new Message(true, "推送文章成功");
+        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        String companyId = userInfoDTO.getCompanyId();
+        String email = userInfoDTO.getEmail();
+        CmsSysUser cmsSysUser = this.cmsSysUserExMapper.queryLoginInfoByEmail(email);
+        String userId = cmsSysUser.getUserId();
+        String sysUserName = cmsSysUser.getName();
+        if ((StringUtils.isBlank(articleId)) || (StringUtils.isBlank(publishId)) || StringUtils.isBlank(sendTime)) {
+            LOGGER.info("设置定时文章推送失败，缺少参数");
+            msg.setInfo("设置定时文章推送失败，缺少请求参数！");
+            msg.setResult(false);
+            throw new ParameterException("设置定时文章推送失败，缺少参数");
+        }
+        try {
+            long currentTimeMillis = System.currentTimeMillis();
+            long setTimeMillis = DateUtil.convertStringToDate(sendTime, DateUtil.YMDHMS).getTime();
+            LOGGER.info("currentTimeMillis:[{}],setTimeMillis:[{}]", currentTimeMillis, setTimeMillis);
+            if (currentTimeMillis >= setTimeMillis) {
+                LOGGER.info("时间设置异常！");
+                msg.setResult(false);
+                msg.setInfo("设置时间异常");
+                return msg;
+            }
+            ArticlePublishSend articlePublishSend = new ArticlePublishSend();
+            articlePublishSend.setArticleId(Integer.parseInt(articleId));
+            articlePublishSend.setPublishId(publishId);
+            articlePublishSend.setOperateId(userId);
+            articlePublishSend.setOperateName(sysUserName);
+            articlePublishSend.setPublishDate(sendTime.split(" ")[0]);
+            articlePublishSend.setPublishTime(sendTime.split(" ")[1]);
+            articlePublishSend.setOperateDate(DateUtil.currentDate());
+            articlePublishSend.setOperateTime(DateUtil.currentTime());
+            articlePublishSend.setSendState("2");
+            if ("0".equals(sendType)) {  //推送企业
+                LOGGER.info("推送至企业");
+                articlePublishSend.setSendType("0");
+                articlePublishSend.setGroupId(partyId);
+            } else { //推送个人
+                LOGGER.info("推送至个人");
+                articlePublishSend.setSendType("1");
+                articlePublishSend.setGroupId(agentCode);
+            }
+            if (articlePublishSendMapper.insert(articlePublishSend) > 1) {
+                LOGGER.info("记录定时推送文章信息成功，记录详情为：" + JsonUtil.objectToJackson(articlePublishSend));
+                msg.setResult(true);
+                msg.setInfo("文章设置定时推送成功！");
+            }
+        } catch (NumberFormatException e) {
+            msg.setInfo("文章设置定时推送失败，请重试！");
+            msg.setResult(false);
+            LOGGER.info("定时推送设置失败【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        LOGGER.info("文章定时推送业务层方法结束！");
+        return msg;
+    }
+
+    @Override
+    public PageDTO noSendPublishArticle(String articleId, int startRow, int rows, String publishId) {
+        LOGGER.info("查询未定时推送的文章列表，入参   articleId：【{}】，startRow：【{}】，rows：【{}】，publishId【{}】"
+                , articleId, startRow, rows, publishId);
+        HashMap<String, Object> paramMap = new HashMap<>();
+        paramMap.put("articleId", articleId);
+        paramMap.put("publishId", publishId);
+        paramMap.put("startRow", startRow);
+        paramMap.put("rows", rows);
+
+        List<ArticlePublishSend> daoList = articleQueryMapper.noSendPublishArticle(paramMap);
+        List<ArticlePublishSendDTO> resultDTO = new ArrayList<ArticlePublishSendDTO>();
+        LOGGER.info("查询的结果集：" + JsonUtil.objectToJackson(daoList));
+        for (ArticlePublishSend aps : daoList) {
+            ArticlePublishSendDTO apsd = new ArticlePublishSendDTO();
+            apsd.setId(aps.getId());
+            if ("0".equals(aps.getSendType())) {
+                apsd.setSendType("公司");
+            } else {
+                apsd.setSendType("个人");
+            }
+            apsd.setOperateName(aps.getOperateName());
+            if (StringUtils.isBlank(aps.getOperateTime())) {
+                apsd.setOperateTime(aps.getPublishDate() + " " + aps.getPublishTime());
+            } else {
+                apsd.setOperateTime(aps.getOperateDate() + " " + aps.getOperateTime());
+            }
+            apsd.setPublishTime(aps.getPublishDate() + " " + aps.getPublishTime());
+            apsd.setGroupId(aps.getGroupId());
+
+
+            switch (aps.getSendState()) {
+                case "1":
+                    apsd.setSendState("成功");
+                    break;
+                case "2":
+                    apsd.setSendState("待推送");
+                    break;
+                default:
+                    apsd.setSendState("失败");
+                    break;
+            }
+            resultDTO.add(apsd);
+        }
+        LOGGER.info("返回列表拼接完成");
+        ArticlePublishSendExample ex = new ArticlePublishSendExample();
+        ex.createCriteria().andArticleIdEqualTo(Integer.parseInt(articleId)).andPublishIdEqualTo(publishId);
+        int count = articlePublishSendMapper.countByExample(ex);
+        PageDTO pageDTO = new PageDTO();
+        pageDTO.setStartRow(startRow);
+        pageDTO.setDataRows(resultDTO);
+        pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
+        pageDTO.setRecords(count);
+        return pageDTO;
+    }
+
+    @Override
+    public Message delOnTimeTask(String delId) {
+        LOGGER.info("删除置顶定时任务业务层方法开始！入参delId：", delId);
+        Message msg = new Message();
+        if (StringUtils.isBlank(delId)) {
+            LOGGER.info("删除失败，缺少参数");
+            msg.setInfo("删除失败，缺少参数");
+            msg.setResult(false);
+            return msg;
+        }
+        try {
+            int result = articlePublishSendMapper.deleteByPrimaryKey(Integer.parseInt(delId));
+            msg.setInfo("删除成功");
+            msg.setResult(true);
+            LOGGER.info("删除定时任务返回结果：" + result);
+        } catch (Exception e) {
+            LOGGER.info("删除失败，业务层抛异常  【{}】", e.getMessage());
+            e.printStackTrace();
+            msg.setInfo("删除失败");
+            msg.setResult(false);
+            return msg;
+        }
+        LOGGER.info("删除文章栏目关系的业务层方法结束！");
+        return msg;
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java
new file mode 100644
index 000000000..844016ebd
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java
@@ -0,0 +1,149 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.domain.*;
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.mapper.*;
+import com.ruoyi.content.service.StaffArticleManageService;
+import com.ruoyi.content.utils.JsonUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+@Service
+public class StaffArticleManageServiceimpl implements StaffArticleManageService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ArticleServiceImpl.class);
+
+    @Autowired
+    private UserInfoMapper userInfoMapper;
+    @Autowired
+    private ArticleInfoMapper articleInfoMapper;
+    @Autowired
+    private ArticlePublishTrackQueryMapper articlePublishTrackQueryMapper;
+    @Autowired
+    private ClickTrackInfoMapper clickTrackInfoMapper;
+    @Autowired
+    private ArticlePublishTrackMapper articlePublishTrackMapper;
+    @Autowired
+    private ClickTrackInfoQueryMapper clickTrackInfoQueryMapper;
+
+
+    @Override
+    public ClickTrackInfo articleSharingTrackInfo(String clickId) {
+        return clickTrackInfoMapper.selectByPrimaryKey(clickId);
+    }
+
+    @Override
+    public UserInfo queryPublishUserInfo(String publishUserId) {
+        return userInfoMapper.selectByPrimaryKey(Integer.valueOf(publishUserId));
+    }
+
+    @Override
+    public ArticleInfo queryModifiedViewUrl(String articleId) {
+        return articleInfoMapper.selectByPrimaryKey(Integer.valueOf(articleId));
+    }
+
+    @Override
+    public PageDTO querySalesmanByArticleId(String articleId, int startRow, int rows) {
+        List<ArticlePublishTrack> list = articlePublishTrackQueryMapper.queryPublishUserInfo(articleId, startRow, rows);
+        List<YwyForwardUserInfo> ywyList = new ArrayList<>();
+
+        if (list.size() > 0) {
+            for (ArticlePublishTrack apt : list) {
+                YwyForwardUserInfo ywyForwardUserInfo = new YwyForwardUserInfo();
+                String publishUserId = apt.getUserId();
+                LOGGER.info("业务员publishUserId【{}】", publishUserId);
+                //如果不包含后台默认管理员字段则查userInfo表
+                if (!publishUserId.contains("cofms")) {
+                    UserInfo userInfo = userInfoMapper.selectByPrimaryKey(Integer.valueOf(publishUserId));
+                    ywyForwardUserInfo.setArticleId(articleId);
+                    ywyForwardUserInfo.setCreateDate(apt.getCreateDate());
+                    ywyForwardUserInfo.setHeadImgUrl(userInfo.getHeadImgUrl());
+                    ywyForwardUserInfo.setUserId(publishUserId);
+                    if (StringUtils.isBlank(apt.getCreateUser())) {
+                        ywyForwardUserInfo.setCreateUser("");
+                    } else {
+                        ywyForwardUserInfo.setCreateUser(apt.getCreateUser());
+                    }
+                    String nickName = userInfo.getNickName();
+                    try {
+                        if (StringUtils.isBlank(nickName)) {
+                            ywyForwardUserInfo.setNickName("匿名");
+                        } else {
+                            ywyForwardUserInfo.setNickName(new String(Base64.getDecoder().decode(nickName), "UTF-8"));
+                        }
+
+                    } catch (UnsupportedEncodingException e) {
+                        throw new BusinessException("业务员昵称解码异常[{" + e.getMessage() + "}]");
+                    }
+                } else {
+                    ywyForwardUserInfo.setNickName("后台管理员");
+                    ywyForwardUserInfo.setArticleId(articleId);
+                    ywyForwardUserInfo.setCreateDate(apt.getCreateDate());
+                    ywyForwardUserInfo.setHeadImgUrl("/static/common/image/logo.png");
+                    ywyForwardUserInfo.setUserId(publishUserId);
+                }
+                ywyList.add(ywyForwardUserInfo);
+            }
+        }
+
+        LOGGER.info("业务员列表ywyList【{}】", ywyList.size());
+        ArticlePublishTrackExample example = new ArticlePublishTrackExample();
+        ArticlePublishTrackExample.Criteria criteria = example.createCriteria();
+        criteria.andArticleIdEqualTo(articleId);
+        int count = articlePublishTrackMapper.countByExample(example);
+        PageDTO pageDTO = new PageDTO();
+        pageDTO.setStartRow(startRow);
+        pageDTO.setDataRows(ywyList);
+        pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
+        pageDTO.setRecords(count);
+        return pageDTO;
+    }
+
+    @Override
+    public PageDTO queryClickInfoByUserId(String userId, String articleId, int startRow, int rows) {
+
+        List<ClickTrackInfo> list = clickTrackInfoQueryMapper.queryClickInfoByUserId(userId, articleId, startRow, rows);
+        List<YwyPublishInfo> YwyPublishInfolList = new ArrayList<>();
+        if (list.size() > 0) {
+            for (ClickTrackInfo ct : list) {
+                YwyPublishInfo ywyPublishInfo = new YwyPublishInfo();
+
+                ywyPublishInfo.setClickDate(ct.getCreateDate());
+                ywyPublishInfo.setClickId(ct.getClickId());
+                ywyPublishInfo.setClickTime(ct.getCreateTime());
+                ywyPublishInfo.setClientHeadImgurl(ct.getClickUserHeadimgurl());
+                ywyPublishInfo.setShareState(ct.getShareState());
+                ywyPublishInfo.setWatchTime(ct.getWatchTime());
+                ywyPublishInfo.setOpenId(ct.getClickOpenId());
+                try {
+                    ywyPublishInfo.setClientNickName(new String(Base64.getDecoder().decode(ct.getClickUserNickname()), "UTF-8"));
+                } catch (UnsupportedEncodingException e) {
+                    throw new BusinessException("业务员昵称解码异常[{" + e.getMessage() + "}]");
+                }
+                YwyPublishInfolList.add(ywyPublishInfo);
+            }
+        }
+
+        LOGGER.info("业务员【{}】,的客户列表YwyPublishInfolList【{}】", userId, JsonUtil.objectToJackson(YwyPublishInfolList));
+
+        ClickTrackInfoExample example = new ClickTrackInfoExample();
+        ClickTrackInfoExample.Criteria criteria = example.createCriteria();
+        criteria.andPublishUserIdEqualTo(userId);
+        criteria.andArticleIdEqualTo(articleId);
+        int count = clickTrackInfoMapper.countByExample(example);
+        PageDTO pageDTO = new PageDTO();
+        pageDTO.setStartRow(startRow);
+        pageDTO.setDataRows(YwyPublishInfolList);
+        pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
+        pageDTO.setRecords(count);
+        return pageDTO;
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/TemplateSendServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/TemplateSendServiceImpl.java
new file mode 100644
index 000000000..129357f4d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/TemplateSendServiceImpl.java
@@ -0,0 +1,147 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.constants.PropertiesConstants;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.TemplateSendService;
+import com.ruoyi.content.utils.JsonUtil;
+import com.ruoyi.content.utils.Notify;
+import com.ruoyi.content.utils.RandomUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+@Service
+public class TemplateSendServiceImpl implements TemplateSendService {
+
+    private static final Logger logger = LoggerFactory.getLogger(TemplateSendServiceImpl.class);
+
+    //测试
+/*	private static final String UID = "pyqzs";
+	private static final String KEY = "a12dadf_12asdinktn0091d1fzxpyqzs1da249kk";
+	private static final String URL = "http://uat-notify.ihxlife.com/notify/api/v1/qyh/img/send";
+	private static final String AGENTID = "1000024";*/
+    //生产
+    private static final String UID = PropertiesConstants.NOTIFY_UID;
+    private static final String KEY = PropertiesConstants.NOTIFY_KEY;
+    private static final String URL = PropertiesConstants.NOTIFY_URL;
+    private static final String AGENTID = PropertiesConstants.NOTIFY_AGENTID;//朋友圈助手外勤118
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Message newArticleSend(String articleName, String url, String picurl, String shareDes, String agentCode, String partyId) throws Exception {
+        String nonce = RandomUtils.generateRandomCharAndNumber(10);   //10位随机字符串
+        Message msg = new Message();
+        //封装推送数据
+        String description = shareDes + "\n快来转发朋友圈>>";
+        description = description.replaceAll("\\\\x0a", "\n");
+
+        //生产
+//    	String toparty = "8|18121";
+//		String touser = "110013545";
+        //测试
+//		String toparty = "858";
+//		String touser = "150012282";
+        String toparty = null;
+        String touser = null;
+        if (StringUtils.isNotBlank(agentCode)) {
+            touser = agentCode;
+        } else {
+            toparty = partyId;
+        }
+        String msgtype = "news";//消息类型
+        String agentid = AGENTID;//企业应用的id
+        String msg_id = UID + nonce;
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("title", articleName);
+        map.put("picurl", picurl);
+        map.put("description", description);
+        map.put("url", url);
+//		map.put("toparty", toparty);
+//		map.put("touser", touser);
+        if (StringUtils.isNotBlank(touser)) {
+            map.put("touser", touser);
+        } else {
+            map.put("toparty", toparty);
+        }
+        map.put("msgtype", msgtype);
+        map.put("agentid", agentid);
+        map.put("msg_id", msg_id);
+        String data = buidMailReq(map);//请求报文
+        long start = System.currentTimeMillis();
+        String respStr = "";
+        try {
+            respStr = Notify.sendMessage(URL, UID, KEY, data);
+        } catch (Exception e) {
+            logger.info("文章推送，调用中台接口异常，请求参数【{}】,异常信息【{}】", data, e.getMessage());
+            e.printStackTrace();
+        }
+        long end = System.currentTimeMillis();
+        logger.info("文章推送，根据请求地址【{}】，请求参数【{}】，返回信息【{}】，请求耗时【{}】", URL, data, respStr, end - start);
+        Map<String, String> result = JsonUtil.jackson2Map(respStr);
+        String info = result.get("result");
+        if ("succ".equals(info)) {
+            msg.setResult(true);
+            msg.setInfo("文章推送成功");
+
+        } else {
+            msg.setResult(false);
+            msg.setInfo("文章推送失败");
+        }
+        return msg;
+    }
+
+    //组装接口请求报文
+    private static String buidMailReq(Map<String, String> map) {
+        String title = map.get("title");
+        String description = map.get("description");
+        String url = map.get("url");
+        String toparty = map.get("toparty");
+        String touser = map.get("touser");
+        String msgtype = map.get("msgtype");//消息类型
+        String agentid = map.get("agentid");//企业应用的id
+        String msg_id = map.get("msg_id");
+        String picurl = map.get("picurl");//
+
+        Map<String, String> articlesMap = new HashMap<>();//图文消息内容
+        articlesMap.put("title", title);
+        articlesMap.put("description", description);
+        articlesMap.put("url", url);
+        articlesMap.put("picurl", picurl);
+
+        List<Map<String, String>> articlesList = new ArrayList<Map<String, String>>();
+        articlesList.add(articlesMap);
+
+        Map<String, List<Map<String, String>>> newsMap = new HashMap<String, List<Map<String, String>>>();
+        newsMap.put("articles", articlesList);
+
+        //data放在Object的map里
+        Map<String, Object> dataMap = new HashMap<String, Object>();
+        //模板信息
+        Map<String, Object> busiDataMap = new HashMap<String, Object>();
+//		busiDataMap.put("toparty", toparty);
+//		busiDataMap.put("touser", touser);
+        if (StringUtils.isNotBlank(touser)) {
+            busiDataMap.put("touser", touser);
+        } else {
+            busiDataMap.put("toparty", toparty);
+        }
+        busiDataMap.put("msgtype", msgtype);
+        busiDataMap.put("news", newsMap);
+        busiDataMap.put("agentid", agentid);
+
+        dataMap.put("msg_id", msg_id);
+        dataMap.put("busi_data", busiDataMap);
+        //将map转化成json
+        String data = JsonUtil.objectToJackson(dataMap);
+        System.out.println("读取到的请求报文为：" + data);
+        return data;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/UserServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/UserServiceImpl.java
new file mode 100644
index 000000000..6ec573799
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/UserServiceImpl.java
@@ -0,0 +1,109 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.domain.UserInfo;
+import com.ruoyi.content.domain.UserInfoExample;
+import com.ruoyi.content.domain.WxUserInfoDto;
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.mapper.UserInfoMapper;
+import com.ruoyi.content.service.UserService;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Base64;
+import java.util.Base64.Encoder;
+import java.util.List;
+
+@Service
+public class UserServiceImpl implements UserService {
+
+    @Autowired
+    private UserInfoMapper userInfoMapper;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(UserServiceImpl.class);
+
+    @Override
+    public String getUserId(WxUserInfoDto wxUserInfoDto) {
+        UserInfoExample example = new UserInfoExample();
+        String userid = "";
+        UserInfoExample.Criteria criteria = example.createCriteria();
+        String openid = wxUserInfoDto.getOpenid();
+        String subscribe = wxUserInfoDto.getSubscribe();
+        if (StringUtils.isBlank(openid)) {
+            LOGGER.info("获取用户userid时,从网关回掉回来的openid为空");
+            throw new BusinessException("回掉回来的微信用户信息有误,openid为空");
+        }
+        if (StringUtils.isBlank(subscribe)) {
+            subscribe = "0";
+        }
+        criteria.andOpenidEqualTo(openid);
+        List<UserInfo> userInfos = userInfoMapper.selectByExample(example);
+        if (null != userInfos && userInfos.size() > 0) {
+            UserInfo userInfo = new UserInfo();
+            Integer userId = userInfos.get(0).getUserId();
+            userid = userId.toString();
+            if (!"1".equals(subscribe)) {    //没有关注公众号
+                LOGGER.info("该用户未关注公众号,已在本项目中注册,入库信息openid[{}],nickname[{}],headimgurl[{}]", openid, wxUserInfoDto.getNickName(), wxUserInfoDto.getHeadImgUrl());
+                userInfo.setUserId(userId);
+                userInfo.setNickName("");
+                userInfo.setHeadImgUrl("");
+                int cont = userInfoMapper.updateByPrimaryKeySelective(userInfo);
+                if (cont != 1) {
+                    LOGGER.info("根据用户微信信息失败");
+                }
+            } else {
+                //已经关注公众号
+                LOGGER.info("该用户已注公众号,已在本项目中注册,入库信息openid[{}],nickname[{}],headimgurl[{}]", openid, wxUserInfoDto.getNickName(), wxUserInfoDto.getHeadImgUrl());
+                userInfo.setUserId(userId);
+                Encoder encoder = Base64.getEncoder();
+                try {
+                    userInfo.setNickName(encoder.encodeToString(wxUserInfoDto.getNickName().getBytes("UTF-8")));
+                } catch (UnsupportedEncodingException e) {
+                    LOGGER.info("保存用户微信信息时,用户昵称转码异常");
+                }
+//				userInfo.setNickName(wxUserInfoDto.getNickName());
+                userInfo.setHeadImgUrl(wxUserInfoDto.getHeadImgUrl());
+                int cont = userInfoMapper.updateByPrimaryKeySelective(userInfo);
+                if (cont != 1) {
+                    LOGGER.info("更新用户微信信息失败");
+                }
+            }
+            return userid;
+        } else {
+            UserInfo userInfo = new UserInfo();
+            try {
+                if (!"1".equals(subscribe)) { //没有关注公众号
+                    LOGGER.info("该用户未关注公众号,还未在本项目中注册,入库信息openid[{}],nickname[{}],headimgurl[{}]", openid, wxUserInfoDto.getNickName(), wxUserInfoDto.getHeadImgUrl());
+                    userInfo.setOpenid(openid);
+                    int cont = userInfoMapper.insertSelective(userInfo);
+                    if (cont != 1) {
+                        throw new BusinessException("用户微信信息入库失败,openid===" + openid);
+                    } else {
+                        return userInfo.getUserId().toString();
+                    }
+                } else {
+                    //已经关注公众号
+                    LOGGER.info("该用户已经关注公众号,还未在本项目中注册,入库信息openid[{}],nickname[{}],headimgurl[{}]", openid, wxUserInfoDto.getNickName(), wxUserInfoDto.getHeadImgUrl());
+                    userInfo.setOpenid(openid);
+                    Encoder encoder = Base64.getEncoder();
+                    userInfo.setNickName(encoder.encodeToString(wxUserInfoDto.getNickName().getBytes("UTF-8")));
+//					userInfo.setNickName(wxUserInfoDto.getNickName());
+                    userInfo.setHeadImgUrl(wxUserInfoDto.getHeadImgUrl());
+                    int cont = userInfoMapper.insertSelective(userInfo);
+                    if (cont != 1) {
+                        throw new BusinessException("用户微信信息入库失败,openid===" + openid);
+                    } else {
+                        return userInfo.getUserId().toString();
+                    }
+                }
+            } catch (Exception e) {
+                throw new BusinessException("用户微信信息入库异常,异常信息[{" + e.getMessage() + "}]");
+            }
+
+        }
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/WechatIMGServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/WechatIMGServiceImpl.java
new file mode 100644
index 000000000..e90c021d2
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/WechatIMGServiceImpl.java
@@ -0,0 +1,212 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.constants.PropertiesConstants;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.WechatIMGService;
+import com.ruoyi.content.utils.JsonUtil;
+import com.ruoyi.content.utils.OSSUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Map;
+
+@Service
+public class WechatIMGServiceImpl implements WechatIMGService {
+//	@Autowired
+//	private WeChatGatewayInterface chatGatewayInterface;
+//	@Autowired
+//	private BaseConstantService baseConstantService;
+//	@Autowired
+//	private WxImageRecordService imagerecordService;
+//	@Autowired
+//	private WeChatPlatInterface weChatPlatInterface;
+
+    private final static Logger logger = LoggerFactory.getLogger(WechatIMGService.class);
+
+    /**
+     * 根据serverId从微信获取图片并返回流信息
+     */
+    @Override
+    public InputStream getInputStream(String mediaId, InputStream ins) {
+        // TODO Auto-generated method stub
+        try {
+            String access_token = "";
+
+            // 从redis里查access_token
+//			Map<String, String> map = chatGatewayInterface.getToken();
+            Map<String, String> map = null;
+            if (null == map || map.size() == 0) {
+                logger.info("获取微信图片失败,access_token获取失败map【{}】", JsonUtil.objectToJackson(map));// 错误信息
+                return null;
+            }
+            String result = map.get("result");
+            if (result.equals(PropertiesConstants.I_SUCC)) {
+                access_token = map.get("access_token");
+            }
+            logger.info("对外接口获取微信用户基本信息,从接口里查access_token【{}】", access_token);
+            if (StringUtils.isBlank(access_token)) {
+                logger.info("获取微信图片失败,access_token获取失败access_token【{}】", access_token);// 错误信息
+                return null;
+            }
+            String url = "http://file.api.weixin.qq.com/cgi-bin/media/get?access_token=" + access_token + "&media_id=" + mediaId;
+            logger.info("执行获取微信图片请求地址【{}】", url);
+            URL urlGet = new URL(url);
+            HttpURLConnection http = (HttpURLConnection) urlGet.openConnection();
+            http.setRequestMethod("GET"); // 必须是get方式请求
+            http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            http.setDoOutput(true);
+            http.setDoInput(true);
+            System.setProperty("sun.net.client.defaultConnectTimeout", "30000");// 连接超时30秒
+            System.setProperty("sun.net.client.defaultReadTimeout", "30000"); // 读取超时30秒
+            http.connect();
+            // 获取文件转化为byte流
+            ins = http.getInputStream();
+            String contentType = http.getHeaderField("Content-Type");
+            logger.info("获取返回的contentType【{}】", contentType);
+            if (contentType.indexOf("image") < 0 && contentType.indexOf("jpeg") < 0 && contentType.indexOf("audio") < 0 && contentType.indexOf("amr") < 0) {
+                String data = readStream(ins);
+                logger.info("获取微信图片失败返回data【{}】", JsonUtil.objectToJackson(data));
+                return null;
+            }
+            return ins;
+        } catch (Exception e) {
+            // TODO: handle exception
+            logger.info("从微信下载指定图片异常：【{}】", e.getMessage());
+            e.printStackTrace();
+            return null;
+        }
+
+    }
+
+    private String readStream(InputStream in) {
+        char[] buf = new char[1024];
+        int size = 0;
+        String data = new String();
+        InputStreamReader reader = new InputStreamReader(in);
+        try {
+            while ((size = reader.read(buf, 0, 1024)) > 0) {
+                data = data + String.copyValueOf(buf, 0, size);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return data;
+    }
+
+	/*@Override
+	@LogServiceAnnotation(description = "图片上传")
+	public Message IdIdentify(IdentityImageUploadDto imgUploadReq,String propertyCode) throws IOException {
+		Message result = new Message();
+		result.setResult(false);
+		if (StringUtils.isBlank(imgUploadReq.getPolicyNo()) || StringUtils.isBlank(imgUploadReq.getFaceIdImgUrl()) || StringUtils.isBlank(imgUploadReq.getWholeIdImgUrl()) || StringUtils.isBlank(imgUploadReq.getEdorType()) || StringUtils.isBlank(imgUploadReq.getChannel())
+				|| StringUtils.isBlank(imgUploadReq.getOrderNo())) {
+			logger.info("影像缺少数据【{}】,propertyCode【{}】",JsonUtil.objectToJackson(imgUploadReq),propertyCode);
+			throw new ParameterException("影像上传失败，缺少参数");
+		}
+		InputStream in = null;
+		WxImageRecord imagerecord = new WxImageRecord();
+		imagerecord.setPolicyNo(imgUploadReq.getPolicyNo());
+		imagerecord.setSource(imgUploadReq.getChannel());// 这个是接口需要的
+		imagerecord.setBussiType(imgUploadReq.getEdorType());
+		imagerecord.setNoticeState("0");// 默认状态
+		imagerecord.setCreateDate(DateUtil.currentDate());
+		imagerecord.setCreateTime(DateUtil.currentDate() + " " + DateUtil.currentDate(DateUtil.HHMMSS));
+		imagerecord.setRemark("数据存储");
+		imagerecord.setNoticeNum(0);
+		imagerecord.setServiceId(imgUploadReq.getOrderNo()); // 工单号
+		imagerecord.setFileUrl(imgUploadReq.getPolicyNo() + imgUploadReq.getEdorType() + "/");// 保单号加业务类型作为文件夹名称防止重复
+		String fileName = "";
+		try {
+			if (StringUtils.isNotBlank(imgUploadReq.getFaceIdImgUrl())) {
+				in = getInputStream(imgUploadReq.getFaceIdImgUrl(), in);
+				fileName = imgUploadReq.getPolicyNo() + "f" + ".jpg";// 正面例如：888888f.jpg
+				result = ossFileUpload(imagerecord.getFileUrl() + fileName, in);// 图片名称，流
+				if (!result.getResult()) {
+					return new Message(false, "请拍照上传指定照片！");
+				}
+				imagerecord.setImgurl1(fileName);
+			}
+			if (StringUtils.isNotBlank(imgUploadReq.getWholeIdImgUrl())) {
+				fileName = imgUploadReq.getPolicyNo() + "w" + ".jpg";// 手持
+				in = getInputStream(imgUploadReq.getWholeIdImgUrl(), in);
+				result = ossFileUpload(imagerecord.getFileUrl() + fileName, in);
+				if (!result.getResult()) {
+					return new Message(false, "请拍照上传指定照片！");
+				}
+				imagerecord.setImgurl3(fileName);// 手持
+			}
+			if (StringUtils.isNotBlank(imgUploadReq.getBackIdImgUrl())) {
+				fileName = imgUploadReq.getPolicyNo() + "b" + ".jpg";// 反面
+				in = getInputStream(imgUploadReq.getBackIdImgUrl(), in);
+				result = ossFileUpload(imagerecord.getFileUrl() + fileName, in);
+				if (!result.getResult()) {
+					return new Message(false, "请拍照上传指定照片！");
+				}
+				imagerecord.setImgurl2(fileName);
+			}
+			// 存储
+			String recordid = imagerecordService.insertRecord(imagerecord);
+			if (StringUtils.isBlank(recordid)) {
+				return new Message(false, "系统异常，请稍后再试");
+			} else {
+				// 通知中转站
+				Map<String, String> noticeResult = weChatPlatInterface.ftpUploadSynchro(recordid, "/" + imagerecord.getFileUrl(), propertyCode);
+				if (!CodeTable.I_SUCCESS.equals(noticeResult.get("code"))) {
+					return new Message(false, "系统发生异常，请稍后再试");
+				} else {
+					// 更新状态
+					imagerecord.setNoticeState("1");// 通知中转站成功
+					imagerecord.setUpdateDate(DateUtil.currentDate());
+					imagerecord.setUpdateTime(DateUtil.currentDate() + " " + DateUtil.currentDate(DateUtil.HHMMSS));
+					imagerecord.setUpdateRemark("通知中转站成功");
+					if (!imagerecordService.updateRecord(imagerecord).getResult()) {
+						return new Message(false, "系统发生异常，请稍后再试");
+					}
+					return new Message(true, "图片处理成功");
+				}
+			}
+		} catch (Exception e) {
+			logger.info("上传图片出现异常【{}】", e.getMessage());
+			e.printStackTrace();
+			result.setResult(false);
+			result.setInfo("系统繁忙");
+		} finally {
+			if (in != null) {
+				in.close();
+			}
+		}
+		return result;
+	}
+*/
+
+    /**
+     * 上传图片到阿里云服务器
+     *
+     * @param fileName
+     * @param in
+     * @return
+     */
+    public Message ossFileUpload(String fileName, InputStream in) {
+        try {
+            if (in == null) {
+                logger.info("从微信端下载图片失败");
+                return new Message(false, "图片上传失败，请重新上传图片信息");
+            }
+            String flag = OSSUtil.uploadFileByInputStream(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID, PropertiesConstants.OSSKEY, PropertiesConstants.BUCKETNAME, in, PropertiesConstants.OSSPATH + fileName);
+            if ("success".equals(flag)) {
+                return new Message(true, "阿里云上传成功");
+            }
+            return new Message(false, "阿里云上传失败");
+        } catch (Exception ex) {
+            logger.info("系统异常【{}】", ex);
+            return new Message(false, "系统发生异常");
+        }
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/WmsUserOperatorImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/WmsUserOperatorImpl.java
new file mode 100644
index 000000000..5a688021b
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/WmsUserOperatorImpl.java
@@ -0,0 +1,22 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.content.domain.CmsSysUser;
+import com.ruoyi.content.mapper.CmsSysUserMapper;
+import com.ruoyi.content.service.WmsOperatorService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class WmsUserOperatorImpl implements WmsOperatorService {
+    @Autowired
+    private CmsSysUserMapper cmsSysUserMapper;
+    private final static Logger logger = LoggerFactory.getLogger(WmsUserOperatorImpl.class);
+
+    @Override
+    public CmsSysUser findTblWmsOperatorByEmail(String email) {
+        return cmsSysUserMapper.selectByPrimaryKey(email);
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/task/OnTimeSendMsg.java b/ruoyi-content/src/main/java/com/ruoyi/content/task/OnTimeSendMsg.java
new file mode 100644
index 000000000..866730735
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/task/OnTimeSendMsg.java
@@ -0,0 +1,58 @@
+package com.ruoyi.content.task;
+
+import com.ruoyi.content.domain.ArticlePublishSend;
+import com.ruoyi.content.domain.ArticlePublishSendExample;
+import com.ruoyi.content.mapper.ArticlePublishSendMapper;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.LibraryService;
+import com.ruoyi.content.utils.DateUtil;
+import com.ruoyi.content.utils.JsonUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+public class OnTimeSendMsg {
+    private static final Logger LOGGER = LoggerFactory.getLogger(OnTimeSendMsg.class);
+
+    @Autowired
+    private ArticlePublishSendMapper articlePublishSendMapper;
+    @Autowired
+    private LibraryService libraryService;
+
+    public void onTimeSend() {
+        try {
+            LOGGER.info("批量处理定时推送消息开始！");
+            String currentDate = DateUtil.currentDate();
+            String currentTime = DateUtil.currentTime();
+            String currentMin = currentTime.substring(0, currentTime.length() - 2);
+            ArticlePublishSendExample example = new ArticlePublishSendExample();
+            example.createCriteria().andPublishDateEqualTo(currentDate).
+                    andSendStateEqualTo("2").
+                    andPublishTimeLike(currentMin + "%");
+            List<ArticlePublishSend> onTimeSendList = articlePublishSendMapper.selectByExample(example);
+            LOGGER.info("数据库入参查询条件：currentDate【{}】,currentMin【{}】，查询的结果：【{}】", currentDate, currentMin, JsonUtil.objectToJackson(onTimeSendList));
+            for (ArticlePublishSend articlePublishSend : onTimeSendList) {
+                new Thread() {
+                    @Override
+                    public void run() {
+                        Message resultMsg = null;
+                        if ("1".equals(articlePublishSend.getSendType())) { //个人
+                            resultMsg = libraryService.articleSend(articlePublishSend.getArticleId().toString(), articlePublishSend.getPublishId(),
+                                    articlePublishSend.getGroupId(), "0", null, articlePublishSend.getId());
+                        } else {
+                            resultMsg = libraryService.articleSend(articlePublishSend.getArticleId().toString(), articlePublishSend.getPublishId(),
+                                    null, "0", articlePublishSend.getGroupId(), articlePublishSend.getId());
+                        }
+                        LOGGER.info("返回的结果信息：【{}】，调取方法的入参信息：【{}】", JsonUtil.objectToJackson(resultMsg), JsonUtil.objectToJackson(articlePublishSend));
+                    }
+                }.start();
+            }
+        } catch (Exception e) {
+            LOGGER.info("批量处理定时推送消息异常【{}】", e.getMessage());
+        }
+        LOGGER.info("批量处理定时推送消息结束！");
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/CheckUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/CheckUtil.java
new file mode 100644
index 000000000..47a8d05a0
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/CheckUtil.java
@@ -0,0 +1,46 @@
+package com.ruoyi.content.utils;
+
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.redis.RedisManager;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 用户信息请求检查
+ *
+ * @author qbh
+ */
+@Component
+public class CheckUtil {
+
+    @Autowired
+    private RedisManager redisManager;
+
+    /**
+     * 检查30s内同一用户是否存在重复请求
+     *
+     * @param id
+     * @param data
+     * @return
+     */
+    public boolean isRepeat(String id, String method, String data) {
+
+        String lastValue = null;
+        try {
+            lastValue = redisManager.query("contentMKTCms-repeatcheck" + "_" + id + "_" + method);
+        } catch (Exception e) {
+            throw new BusinessException("获取redis里的repeatcheck值异常!");
+        }
+        String md5data = EncoderUtil.Md5_32(data).toUpperCase();
+        if (StringUtils.isBlank(lastValue)) {
+            redisManager.save("contentMKTCms-repeatcheck" + "_" + id + "_" + method, md5data, 30);
+            return false;
+        } else if (lastValue.equals(md5data)) {
+            return true;
+        } else {
+            redisManager.save("contentMKTCms-repeatcheck" + "_" + id + "_" + method, md5data);
+            return false;
+        }
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/Data.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/Data.java
new file mode 100644
index 000000000..253af168d
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/Data.java
@@ -0,0 +1,344 @@
+package com.ruoyi.content.utils;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.ResourceBundle;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+
+/**
+ * 常用方法管理 ■ 判断值是否不为空值 ■ 过滤跨站脚本关键字 ■ 读取网页内容 ■ 获取项目物理路径 ■ 全角转半角 ■ 半角转全角 ■ 收集页面参数 ■
+ * GB2312编码转换成Unicode编码 ■ Unicode编码转换成GB2312编码 ■ 打印1维数组 ■ 打印2维数组
+ * 
+ * @author sinosoft
+ * @version 1.0 2009-10-27 新建
+ */
+
+public final class Data {
+
+	private Data() {
+	}
+
+	/**
+	 * 判断值是否不为空值
+	 * 
+	 * @param value
+	 *            被判断的值
+	 * @return true-value不为空值，false-value为空值
+	 */
+	public static boolean hasValue(String value) {
+		if (value == null || value.equals("")) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 * 过滤跨站脚本关键字
+	 * 
+	 * @param src
+	 *            输入的字符串
+	 * @return 过滤后的字符串
+	 */
+	public static String filterStr(String src) {
+		if (Data.hasValue(src)) {
+			src = src.replaceAll("<", "");
+			src = src.replaceAll(">", "");
+			src = src.replaceAll("'", "");
+			src = src.replaceAll("&", "＆");
+			src = src.replaceAll("#", "＃");
+			src = src.replaceAll("%", "％");
+			src = src.replaceAll("\"", "");
+			src = src.trim();
+			return src;
+		} else {
+			return "";
+		}
+	}
+
+	/**
+	 * 读取网页内容
+	 * 
+	 * @param str
+	 *            网页地址，例：http://wwww.baidu.com
+	 * @return 网页内容
+	 * @throws java.io.IOException
+	 */
+	public static String getHtmlCodeByURL(String str) throws java.io.IOException {
+		URL url = new URL(str);
+		HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+		InputStream in = urlConnection.getInputStream();
+		byte[] data = new byte[in.available()];
+		in.read(data);
+		return new String(data);
+	}
+
+	public static String getProjectWebPath() throws UnsupportedEncodingException {
+		String webPath = ToolUtil.getProperties("/properties/cms/cms.properties", "webPath");
+		if (hasValue(webPath)) {
+			return webPath;
+		}
+		return null;
+	}
+
+	/**
+	 * 获取项目物理路径
+	 * 
+	 * @return 项目路径
+	 * @throws Exception
+	 *             未找到路径
+	 */
+	public static String getProjectLocalPath() throws UnsupportedEncodingException {
+//		ResourceBundle rb = ResourceBundle.getBundle("/properties/cms/cms");
+//		String generatePath = rb.getString("generatePath");
+		return "C:/work/tool/tomcat/tomcatbug81/webapps/micro-cms";
+		//return generatePath;
+		// if(hasValue(generatePath)){
+		// return generatePath;
+		// }
+		// String path = Data.class.getResource("").getFile();
+		// String path = Data.class.getClassLoader().getResource("").getFile();
+		// if(path.indexOf("/target") > -1) {
+		// path = path.substring(0,path.indexOf("/target")) + "/" +
+		// generatePath;
+		// }
+		// path = URLDecoder.decode(path, "UTF-8");
+		// path = (path.substring(0,
+		// path.lastIndexOf("/WEB-INF"))).replace("//", "/");
+		// String temp = path.substring(0, 5);
+		// if ("file:".equalsIgnoreCase(temp)) {
+		// path = path.substring(5);
+		// }
+		// return path;
+
+	}
+
+	// 仅得到本地路径
+	public static String getRealPath(String filePath) {
+		try {
+			ResourceBundle rb = ResourceBundle.getBundle("/properties/cms/cms");
+			String generatePath = rb.getString("generatePath");
+			String templateDir = rb.getString("templateDir");
+			String filepa = generatePath + templateDir;// Data.class.getClassLoader().getResource("")+"template";
+			File file = new File(filepa);
+			System.out.println(file.isDirectory() + "====" + file.exists());
+			if (!file.isDirectory()) {
+				file.mkdir();
+			}
+			String path = generatePath;
+			// String path =
+			// Data.class.getClassLoader().getResource("/template").getFile();
+			// if (path.indexOf("/target")>-1) {
+			//
+			// path = path.substring(0,
+			// path.indexOf("/target"))+"/"+generatePath;
+			// }
+			// path = (path.substring(0, path.lastIndexOf("/WEB-INF")));
+			path = path + "/" + filePath;
+			String temp = path.substring(0, 5);
+			if ("file:".equalsIgnoreCase(temp)) {
+				path = path.substring(5);
+			}
+			path.replace("\\", "/");
+			return path.replace("//", "/");
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
+			return null;
+		}
+	}
+
+	/**
+	 * 方法名称: getPublishPath<br>
+	 * 描述：获得项目的静态页面的发布路径 作者: gao 修改日期：2013年11月21日下午8:11:16
+	 * 
+	 * @param filePath
+	 * @return
+	 */
+	public static String getPublishPath() {
+		String path = null;
+		ResourceBundle rb = ResourceBundle.getBundle("/properties/cms/cms");
+		String publishPath = rb.getString("publishPath");
+		try {
+			path = Data.getProjectLocalPath() + "/" + publishPath + "/";
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		return path;
+	}
+
+	/**
+	 * 半角转全角 半角空格为32，全角空格为12288 其他字符半角(33-126)与全角(65281-65374)的对应关系为：相差65248
+	 * 
+	 * @param src
+	 *            待转换的字符串
+	 * @return 转换后的全角字符串
+	 */
+	public static String toSBC(String src) {
+		char[] c = src.toCharArray();
+		for (int i = 0; i < c.length; i++) {
+			if (c[i] == 32) {
+				c[i] = 12288;
+			} else if (c[i] >= 33 && c[i] <= 126) {
+				c[i] += 65248;
+			}
+		}
+		return new String(c);
+	}
+
+	/**
+	 * 全角转半角 半角空格为32，全角空格为12288 其他字符半角(33-126)与全角(65281-65374)的对应关系为：相差65248
+	 * 
+	 * @param src
+	 *            待转换的字符串
+	 * @return 转换后的半角字符串
+	 */
+	public static String toDBC(String src) {
+		char[] c = src.toCharArray();
+		for (int i = 0; i < c.length; i++) {
+			if (c[i] == 12288) {
+				c[i] = 32;
+			} else if (c[i] >= 65281 && c[i] <= 65374) {
+				c[i] -= 65248;
+			}
+		}
+		return new String(c);
+	}
+
+	/**
+	 * 收集页面参数
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @return session和request中的所有参数
+	 */
+	public static IndexMap getParameters(HttpServletRequest request) {
+		IndexMap hm = new IndexMap();
+		Enumeration en = null;
+		HttpSession session = request.getSession();
+		if (request != null) {
+			en = request.getParameterNames();
+			while (en.hasMoreElements()) {
+				String tempName = (String) en.nextElement();
+				hm.put(tempName, filterStr(request.getParameter(tempName)));
+			}
+		}
+		if (session != null) {
+			en = session.getAttributeNames();
+			while (en.hasMoreElements()) {
+				String tempName = (String) en.nextElement();
+				hm.put(tempName, session.getAttribute(tempName));
+			}
+		}
+		return hm;
+	}
+
+	/**
+	 * 收集参数
+	 * 
+	 * @param request
+	 *            HttpServletRequest
+	 * @return request中的所有参数
+	 */
+	public static Map getParametersFromRequest(HttpServletRequest request) {
+		Map hm = new HashMap();
+		Enumeration en = null;
+		if (request != null) {
+			en = request.getParameterNames();
+			while (en.hasMoreElements()) {
+				String tempName = (String) en.nextElement();
+				hm.put(tempName, filterStr(request.getParameter(tempName)));
+			}
+		}
+		return hm;
+	}
+
+	/**
+	 * Unicode编码转换成ISO-8859-1编码
+	 * 
+	 * @param src
+	 *            Unicode编码的字符串
+	 * @return ISO-8859-1编码的字符串
+	 * @throws UnsupportedEncodingException
+	 *             编码转换错误
+	 */
+	public static String UnicodeToGB(String src) throws UnsupportedEncodingException {
+		if (Data.hasValue(src)) {
+			return new String(src.getBytes("utf-8"), "ISO-8859-1");
+		} else {
+			return src;
+		}
+	}
+
+	/**
+	 * ISO-8859-1编码转换成Unicode编码
+	 * 
+	 * @param src
+	 *            ISO-8859-1编码的字符串
+	 * @return Unicode编码的字符串
+	 * @throws UnsupportedEncodingException
+	 *             编码转换错误
+	 */
+	public static String GBToUnicode(String src) throws UnsupportedEncodingException {
+		if (Data.hasValue(src)) {
+			return new String(src.getBytes("ISO-8859-1"), "utf-8");
+		} else {
+			return src;
+		}
+	}
+
+	public static void printArray1(String[] src) {
+		System.out.println("============start，每一个元素之后接一个结束标志^==============");
+		if (src == null) {
+			System.out.println("src=null");
+			return;
+		}
+		for (int i = 0; i < src.length; i++) {
+			System.out.print(src[i] + "^");
+		}
+		System.out.println("\n========================end============================");
+	}
+
+	public static void printArray2(String[][] src) {
+		System.out.println("============start，每一个元素之后接一个结束标志^==============");
+		if (src == null) {
+			System.out.println("src=null");
+			return;
+		}
+		for (int i = 0; i < src.length; i++) {
+			for (int j = 0; j < src[i].length; j++) {
+				System.out.print(src[i][j] + "^");
+			}
+			System.out.println();
+		}
+		System.out.println("========================end============================");
+	}
+
+	/**
+	 * 百分数转换
+	 * 
+	 * @param Str
+	 *            待转换字符串
+	 * @return
+	 */
+	public static String String2Percent(String str) {
+		BigDecimal bd = new BigDecimal(str);
+		String percent = bd.multiply(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_HALF_UP).toString() + "%";
+		return percent;
+
+	}
+
+	public static void main(String[] args) {
+		System.out.println(Data.String2Percent("3"));
+	}
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/DateUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/DateUtil.java
new file mode 100644
index 000000000..0f999bb9e
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/DateUtil.java
@@ -0,0 +1,641 @@
+package com.ruoyi.content.utils;
+
+import com.ruoyi.content.constants.PropertiesConstants;
+import org.apache.commons.lang3.StringUtils;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.StringTokenizer;
+import java.util.regex.Pattern;
+
+/**
+ * 描述：日期工具类<br>
+ */
+public class DateUtil {
+
+    public static final String YYYY_MM_DD = "yyyy-MM-dd";
+    public static final String YYYYMMDD = "yyyyMMdd";
+    public static final String YMDHMS = "yyyy-MM-dd HH:mm:ss";
+    public static final String YYYY_year_MM_month_DD_day = "yyyy年MM月dd日";
+    public static final String HHMMSS = "HH:mm:ss";
+    public static final String timeFormat = "HHmmss";
+    public static final String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+    public static final String yyyyMMddHHmmssSSS = "yyyyMMddHHmmssSSS";
+    public static final String month_DD_HH = "MM月dd日HH点";
+    public static final String month_DD = "MM月dd日";
+    public static final String month_DD_HH_MM = "MM月dd日 HH:mm";
+    public static final String MM_DD_HH = "MM-dd HH";
+    public static final String YEAR = "year";
+    public static final String MONTH = "month";
+    public static final String DAY = "day";
+    public static final SimpleDateFormat yyyy_mm_dd_Format = new SimpleDateFormat(YYYY_MM_DD);
+    public static final SimpleDateFormat yyyymmdd_Format = new SimpleDateFormat(YYYYMMDD);
+    public static final SimpleDateFormat month_DD_HH_Format = new SimpleDateFormat(month_DD_HH);
+    public static final SimpleDateFormat month_DD_Format = new SimpleDateFormat(month_DD);
+    public static final SimpleDateFormat mm_dd_HH_Format = new SimpleDateFormat(YMDHMS);
+    public static final SimpleDateFormat month_DD_HH_MM_Format = new SimpleDateFormat(month_DD_HH_MM);
+
+    /**
+     * 描述：字符串转换时间类型 作者: LIFEILONG 修改日期：2014-07-02下午03:13:35
+     *
+     * @param str        时间字符串
+     * @param dateFormat 格式 "yyyy-MM-dd"
+     * @return
+     */
+    public static Date convertStringToDate(String str, String dateFormat) {
+        if (StringUtils.isNotBlank(str)) {
+            SimpleDateFormat sf = new SimpleDateFormat(dateFormat);
+            try {
+                Date birthDate = sf.parse(str);
+                return birthDate;
+            } catch (ParseException e) {
+                e.printStackTrace();
+                return null;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 描述：获取当前日期 作者: LIFEILONG 修改日期：2014-07-02上午10:22:50
+     *
+     * @return 返回当前日期 日期格式 yyyy-MM-dd
+     */
+    public static String currentDate() {
+        return currentDate(YYYY_MM_DD);
+    }
+
+    /**
+     * 获取当前时间
+     *
+     * @return 返回日期时间格式HH:mm:ss
+     */
+    public static String currentTime() {
+        return currentDate(HHMMSS);
+    }
+
+    /**
+     * 描述：获取当前日期 作者: LIFEILONG 修改日期：2014-07-02上午10:23:26
+     *
+     * @param dateFormat 日期格式
+     * @return 返回当前日期
+     */
+    public static String currentDate(String dateFormat) {
+        try {
+            SimpleDateFormat sf = new SimpleDateFormat(dateFormat);
+            String currentDate = sf.format(new Date());
+            return currentDate;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 描述：把java.util.date 转换成String类型 作者: LIFEILONG 修改日期：2014-07-02上午10:46:04
+     *
+     * @param date 日期
+     * @return 格式化成yyyy-MM-dd格式的字符串类型日期
+     */
+    public static String convertDate(Date date) {
+        if (date == null) {
+            return null;
+        }
+        return convertDate(date, YYYY_MM_DD);
+    }
+
+    /**
+     * 描述：把java.util.date 转换成String类型 作者: LIFEILONG 修改日期：2014-07-02上午10:46:56
+     *
+     * @param date       日期
+     * @param dateFormat 日期格式
+     * @return 格式化成特定格式的字符串类型日期
+     */
+    public static String convertDate(Date date, String dateFormat) {
+        try {
+            SimpleDateFormat sf = new SimpleDateFormat(dateFormat);
+            String currentDate = sf.format(date);
+            return currentDate;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取当前日期的前一天
+     *
+     * @param dateFormat
+     * @return
+     */
+    public static String getBeforeDay(String dateFormat) {
+        try {
+            SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+            Calendar calendar = Calendar.getInstance();
+            calendar.add(Calendar.DAY_OF_YEAR, -1);
+            Date date = calendar.getTime();
+            return sdf.format(date);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取当前日期的前一天
+     *
+     * @return
+     */
+    public static Date getBeforeDayDate() {
+        try {
+
+            Calendar calendar = Calendar.getInstance();
+            calendar.add(Calendar.DAY_OF_YEAR, -1);
+            Date date = calendar.getTime();
+            return date;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 描述：获取当前日期的后一天 date类型<br>
+     * 作者: LIFEILONG<br>
+     * 修改日期：2014-07-02上午10:46:56
+     *
+     * @return 格式化成特定格式的字符串类型日期
+     */
+    public static Date getNextDayDate() {
+        try {
+            Calendar calendar = Calendar.getInstance();
+            calendar.add(Calendar.DAY_OF_YEAR, 1);
+            return calendar.getTime();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 描述：获取当前日期的后一天 yyyy-MM-dd格式<br>
+     * 作者: LIFEILONG<br>
+     * 修改日期：2014-07-02上午10:46:56
+     *
+     * @return 格式化成特定格式的字符串类型日期
+     */
+    public static String getNextDay() {
+        try {
+            Calendar calendar = Calendar.getInstance();
+            calendar.add(Calendar.DAY_OF_YEAR, 1);
+            Date date = calendar.getTime();
+            return yyyy_mm_dd_Format.format(date);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 描述：获取当前日期的后一天（传入日期格式）<br>
+     *
+     * @param dateFormat 日期格式<br>
+     *                   <p>
+     *                   作者: LIFEILONG<br>
+     *                   修改日期：2014-07-02上午10:46:56
+     * @return 格式化成特定格式的字符串类型日期
+     */
+    public static String getNextDay(String dateFormat) {
+        try {
+            Calendar calendar = Calendar.getInstance();
+            SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+            calendar.add(Calendar.DAY_OF_YEAR, 1);
+            Date date = calendar.getTime();
+            return sdf.format(date);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 描述：获取当前日期的下一年(yyyy-MM-dd格式)<br>
+     * <p>
+     * 作者: LIFEILONG<br>
+     * 修改日期：2014-07-02上午10:46:56<br>
+     *
+     * @return 格式化成特定格式的字符串类型日期
+     */
+    public static String getNextYear() {
+        try {
+            Calendar calendar = Calendar.getInstance();
+            calendar.add(Calendar.YEAR, 1);
+            Date date = calendar.getTime();
+            return yyyy_mm_dd_Format.format(date);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 描述：获取当前日期的下一年<br>
+     *
+     * @param dateFormat 日期格式<br>
+     *                   作者: LIFEILONG<br>
+     *                   修改日期：2014-07-02上午10:46:56<br>
+     * @return 格式化成特定格式的字符串类型日期
+     */
+    public static String getNextYear(String dateFormat) {
+        try {
+            Calendar calendar = Calendar.getInstance();
+            SimpleDateFormat sdf = new SimpleDateFormat(dateFormat);
+            calendar.add(Calendar.YEAR, 1);
+            Date date = calendar.getTime();
+            return sdf.format(date);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 描述：获取指定日期的下一年(yyyy-MM-dd格式)<br>
+     * <p>
+     * 日期格式<br>
+     * 作者: LIFEILONG<br>
+     * 修改日期：2014-07-02上午10:46:56<br>
+     */
+    public static String getNextYearByDate(String date) {
+        try {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(yyyy_mm_dd_Format.parse(date));
+            calendar.add(Calendar.YEAR, 1);
+            calendar.add(Calendar.DAY_OF_YEAR, -1);
+            return yyyy_mm_dd_Format.format(calendar.getTime());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 获取指定日期相差N天的日期(yyyy-MM-dd格式)
+     *
+     * @param date 指定日期
+     * @param days 相差天数，正数是向前N天，负数是向后N天
+     * @return
+     */
+    public static String getAfterDays(String date, int days) {
+        try {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(yyyy_mm_dd_Format.parse(date));
+            calendar.add(Calendar.DAY_OF_YEAR, days);
+            return yyyy_mm_dd_Format.format(calendar.getTime());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 描述：获取当前时间 作者: LIFEILONG 修改日期：2014-07-02上午11:09:20
+     *
+     * @return
+     */
+    public static Date getDate() {
+        Date date = new Date();
+        return date;
+    }
+
+    /**
+     * 描述：将传入的时间转化成秒数 作者: LIFEILONG 修改日期：2014-07-02下午19:09:20
+     *
+     * @return 秒数
+     */
+    public static int getSecond(String value) {
+        StringTokenizer s = new StringTokenizer(value, ":");
+        int type = s.countTokens() - 1;
+        int result = 0;
+        Pattern p = Pattern.compile(":");
+        if (type == 0)// ss
+            result = Integer.parseInt(value);
+        if (type == 1) {// mm:ss
+            String strValue[] = p.split(value);
+            result = Integer.parseInt(strValue[0]) * 60 + Integer.parseInt(strValue[1]);
+        }
+        if (type == 2) {// hh:mm:ss
+            String strValue[] = p.split(value);
+            result = Integer.parseInt(strValue[0]) * 3600 + Integer.parseInt(strValue[1]) * 60
+                    + Integer.parseInt(strValue[2]);
+        }
+        return result;
+    }
+
+    /**
+     * 描述：根据日期获取年、月、日 作者: LIFEILONG 修改日期：2014-07-02下午03:18:40
+     *
+     * @param birthday
+     * @param flag
+     * @return
+     */
+    public static String getNumByBirthday(Date birthday, String flag) {
+        String Num = null;
+        String birthdayStr = convertDate(birthday, YYYY_MM_DD);
+        if (StringUtils.isNotBlank(birthdayStr)) {
+            String[] birthdaySplit = birthdayStr.split("-");
+            if (birthdaySplit != null) {
+                if (birthdaySplit.length == 3) {
+                    if (YEAR.equals(flag)) {
+                        Num = birthdaySplit[0];
+                    }
+                    if (MONTH.equals(flag)) {
+                        Num = birthdaySplit[1];
+                    }
+                    if (DAY.equals(flag)) {
+                        Num = birthdaySplit[2];
+                    }
+                }
+            }
+        }
+        return Num;
+    }
+
+    /**
+     * 描述：转换日期格式，把日期字符串从yyyy-MM-dd格式转换成toDateFormat格式 作者: LIFEILONG
+     * 修改日期：2014-07-02上午10:46:56
+     *
+     * @param dateString   日期
+     * @param toDateFormat 日期格式
+     * @return 格式化成特定格式的字符串类型日期
+     */
+    public static String convertDate(String dateString, String toDateFormat) {
+        return convertDate(dateString, YYYY_MM_DD, toDateFormat);
+    }
+
+    /**
+     * 描述：转换日期格式，把日期字符串从fromDateFormat格式转换成toDateFormat格式 作者: LIFEILONG
+     * 修改日期：2014-07-02上午10:46:56
+     *
+     * @param dateString     日期
+     * @param fromDateFormat 日期格式
+     * @param toDateFormat   日期格式
+     * @return 格式化成特定格式的字符串类型日期
+     */
+    public static String convertDate(String dateString, String fromDateFormat, String toDateFormat) {
+        try {
+            SimpleDateFormat sf = new SimpleDateFormat(fromDateFormat);
+            Date date = sf.parse(dateString);
+            SimpleDateFormat sf1 = new SimpleDateFormat(toDateFormat);
+            String currentDate = sf1.format(date);
+            return currentDate;
+        } catch (ParseException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 描述：把时间戳转化成指定格式的时间 作者: LIFEILONG 修改日期：2014-07-02上午10:46:56
+     *
+     * @param timestamp    时间戳
+     * @param toDateFormat 转化成的时间格式
+     * @return 指定格式的日期字符串
+     */
+    public static String getTimeFromTimestamp(String timestamp, String toDateFormat) {
+        try {
+            // 时间戳转化为Sting或Date
+            SimpleDateFormat format = new SimpleDateFormat(toDateFormat);
+            Long time = new Long(timestamp);
+            String d = format.format(new Date(time * 1000));
+            return d;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 描述：把时间戳转化成时间 作者: LIFEILONG 修改日期：2014-07-02上午10:46:56
+     *
+     * @param timestamp 时间戳
+     * @return 日期
+     */
+    public static Date getTimeFromTimestamp(String timestamp) {
+        try {
+            // 时间戳转化为Date
+            Long time = new Long(timestamp);
+            return new Date(time * 1000);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 如果是年份加减cal.add(1, i); 如果是月份加减cal.add(2, i); 如果是星期加减cal.add(3, i);
+     * 如果是每日加减cal.add(5, i); 如果是小时加减cal.add(10, i); 如果是分钟加减cal.add(12, i);
+     * 如果是秒的加减cal.add(13, i);
+     *
+     * @param date
+     * @param i
+     * @param type
+     * @return
+     * @throws Exception
+     */
+    public static Date addOrMinusYear(Date date, int type, int i) {
+        Date rtn = null;
+        GregorianCalendar cal = new GregorianCalendar();
+        cal.setTime(date);
+        cal.add(type, i);
+        rtn = cal.getTime();
+        return rtn;
+    }
+
+    /**
+     * 日期格式yyyyMMdd转成yyyy-MM-dd
+     *
+     * @param date
+     * @return
+     */
+    public static String daySeparate(String date) {
+        String newDate = "";
+        if (StringUtils.isBlank(date)) {
+            return newDate;
+        }
+        if (date.length() == 8) {
+            try {
+                Date beforeDate = yyyymmdd_Format.parse(date);
+                newDate = yyyy_mm_dd_Format.format(beforeDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        } else {
+            return date;
+        }
+        return newDate;
+    }
+
+    /**
+     * 把日期字符串中的“-”去掉
+     *
+     * @param date
+     * @return
+     */
+    public static String dayNoSeparate(String date) {
+        if (StringUtils.isNotBlank(date)) {
+            return date.replace("-", PropertiesConstants.IS_NULL2);
+        }
+        return PropertiesConstants.IS_NULL2;
+    }
+
+    /**
+     * 日期格式yyyyMMddhhmmss转成yyyy-MM-dd hh:mm:ss
+     *
+     * @param date
+     * @return
+     * @throws ParseException
+     */
+    public static String dayTimeSeparate(String date) {
+        String newDate = "";
+        if (date.length() == 14) {
+            SimpleDateFormat before = new SimpleDateFormat(YYYYMMDDHHMMSS);
+            try {
+                Date beforeDate = before.parse(date);
+                SimpleDateFormat after = new SimpleDateFormat(YMDHMS);
+                newDate = after.format(beforeDate);
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        } else {
+            return date;
+        }
+        return newDate;
+    }
+
+    /**
+     * 获得指定月份的日期
+     *
+     * @param date 日期
+     * @param n    前后几个月的时间
+     * @return
+     */
+    public static String getAppointMonth(Date date, int n) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date); // 设置时间为当前时间
+        calendar.add(Calendar.MONTH, n);// 月份减1
+        Date resultDate = calendar.getTime(); // 结果
+        return yyyy_mm_dd_Format.format(resultDate);
+    }
+
+    /**
+     * 查询两个日期相隔天数
+     *
+     * @param Startdate
+     * @param Enddate
+     * @return
+     * @throws ParseException
+     */
+    public static int DateDifference(String Startdate, String Enddate) throws ParseException {
+        // SimpleDateFormat newdata = new SimpleDateFormat(YYYY_MM_DD);
+        Date smdate = yyyy_mm_dd_Format.parse(Startdate);
+        Date bdate = yyyy_mm_dd_Format.parse(Enddate);
+        // SimpleDateFormat sdf = new SimpleDateFormat(YYYY_MM_DD);
+        smdate = yyyy_mm_dd_Format.parse(yyyy_mm_dd_Format.format(smdate));
+        bdate = yyyy_mm_dd_Format.parse(yyyy_mm_dd_Format.format(bdate));
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(smdate);
+        long time1 = cal.getTimeInMillis();
+        cal.setTime(bdate);
+        long time2 = cal.getTimeInMillis();
+        long between_days = (time2 - time1) / (1000 * 3600 * 24);
+        int parseInt = Integer.parseInt(String.valueOf(between_days));
+        return parseInt;
+    }
+
+    /**
+     * 描述：计算两个时间相差的秒数 作者: yinshuhan 修改日期：2016-05-30
+     */
+    public static long seconddiffer(Date date1, Date date2) {
+        // return date1.getTime() / (24*60*60*1000) - date2.getTime() /
+        // (24*60*60*1000);
+        long differ = date2.getTime() - date1.getTime();// 用立即数，减少乘法计算的开销
+        return differ;
+    }
+
+    /**
+     * 描述：计算两个日期相差的天数 作者: yinshuhan 修改日期：2016-05-18
+     */
+    public static long differ(Date date1, Date date2) {
+        // return date1.getTime() / (24*60*60*1000) - date2.getTime() /
+        // (24*60*60*1000);
+        long differ = date2.getTime() / 86400000 - date1.getTime() / 86400000;// 用立即数，减少乘法计算的开销
+        return differ;
+    }
+
+    /**
+     * 获取指定日期相差N天的日期(月日点格式)
+     *
+     * @param date 指定日期
+     * @param days 相差天数，正数是向前N天，负数是向后N天
+     * @return
+     */
+    public static String getAfterTimes(String date, int days) {
+        try {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(mm_dd_HH_Format.parse(date));
+            calendar.add(Calendar.DAY_OF_YEAR, days);
+            return month_DD_HH_Format.format(calendar.getTime());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    /**
+     * 根据出生日期计算年龄
+     *
+     * @param birth
+     * @return
+     */
+    public static int getAge(String birth) {
+        int age = 0;
+        try {
+            Date dateOfBirth = (Date) yyyy_mm_dd_Format.parse(birth);
+            Calendar born = Calendar.getInstance();
+            Calendar now = Calendar.getInstance();
+            if (dateOfBirth != null) {
+                now.setTime(new Date());
+                born.setTime(dateOfBirth);
+                if (born.after(now)) {
+                    throw new IllegalArgumentException("Can't be born in the future");
+                }
+                age = now.get(Calendar.YEAR) - born.get(Calendar.YEAR);
+                if (now.get(Calendar.DAY_OF_YEAR) < born.get(Calendar.DAY_OF_YEAR)) {
+                    age -= 1;
+                }
+            }
+        } catch (Exception e) {
+            // TODO: handle exception
+            e.printStackTrace();
+        }
+        return age;
+    }
+
+    /**
+     * 将当期日期重置为指定的某时某分某秒
+     *
+     * @return
+     */
+    public static Date getCustomeDate(int hour, int minute, int second) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(new Date());
+        calendar.set(Calendar.HOUR_OF_DAY, hour);
+        calendar.set(Calendar.MINUTE, minute);
+        calendar.set(Calendar.SECOND, second);
+        return calendar.getTime();
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/EncoderUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/EncoderUtil.java
new file mode 100644
index 000000000..d77a2d776
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/EncoderUtil.java
@@ -0,0 +1,177 @@
+package com.ruoyi.content.utils;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.Map;
+
+public class EncoderUtil {
+    private static final String ALGORITHM = "MD5";
+
+    private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+    /**
+     * 字符串签名
+     *
+     * @param algorithm 签名方式，如MD5,SHA1
+     * @param str       字符串参数
+     * @return String 签名串
+     */
+    public static String encode(String algorithm, String str) {
+        if (str == null) {
+            return null;
+        }
+        try {
+            MessageDigest messageDigest = MessageDigest.getInstance(algorithm);
+            messageDigest.update(str.getBytes());
+            return getFormattedText(messageDigest.digest());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 对字符串进行MD5签名
+     *
+     * @param str
+     * @return String
+     */
+    public static String encodeByMD5(String str) {
+        if (str == null) {
+            return null;
+        }
+        try {
+            MessageDigest messageDigest = MessageDigest.getInstance(ALGORITHM);
+            messageDigest.update(str.getBytes("UTF-8"));
+            return getFormattedText(messageDigest.digest());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 对字符串进行MD5签名,截取8到24
+     *
+     * @param str
+     * @return String
+     */
+    public static String encodeByMD5Substring(String str) {
+        if (str == null) {
+            return null;
+        }
+        try {
+            MessageDigest messageDigest = MessageDigest.getInstance(ALGORITHM);
+            messageDigest.update(str.getBytes());
+            return getFormattedText(messageDigest.digest()).substring(8, 24).toUpperCase();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 对字符串进行SHA1签名
+     *
+     * @param str
+     * @return String
+     */
+    public static String encodeBySHA1(String str) {
+        if (str == null) {
+            return null;
+        }
+        try {
+            MessageDigest messageDigest = MessageDigest.getInstance("SHA1");
+            messageDigest.update(str.getBytes());
+            return getFormattedText(messageDigest.digest());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Takes the raw bytes from the digest and formats them correct.
+     *
+     * @param bytes the raw bytes from the digest.
+     * @return the formatted bytes.
+     */
+    private static String getFormattedText(byte[] bytes) {
+        int len = bytes.length;
+        StringBuilder buf = new StringBuilder(len * 2);
+        // 把密文转换成十六进制的字符串形式
+        for (int j = 0; j < len; j++) {
+            buf.append(HEX_DIGITS[(bytes[j] >> 4) & 0x0f]);
+            buf.append(HEX_DIGITS[bytes[j] & 0x0f]);
+        }
+        return buf.toString();
+    }
+
+    /**
+     * @param plainText
+     * @return String
+     * @description Md5加密32位
+     */
+    public static String Md5_32(String plainText) {
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            try {
+                md.update(plainText.getBytes("utf-8"));
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            byte b[] = md.digest();
+            int i;
+            StringBuffer buf = new StringBuffer("");
+            for (int offset = 0; offset < b.length; offset++) {
+                i = b[offset];
+                if (i < 0) {
+                    i += 256;
+                }
+                if (i < 16) {
+                    buf.append("0");
+                }
+                buf.append(Integer.toHexString(i));
+            }
+            return buf.toString();// 32位的加密
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    /**
+     * 对参数加密
+     *
+     * @param signMap
+     * @param privateKey
+     * @return
+     */
+    public static String createSignBykey(Map<String, String> signMap, String privateKey) {
+        String sign_temp = "";
+        if (signMap == null || signMap.size() == 0) {
+            return "";
+        }
+        if (privateKey == null || privateKey.equals("")) {
+            return "";
+        }
+        int i = 0;
+        String[] keys = new String[signMap.size()];
+        for (String key : signMap.keySet()) {
+            keys[i] = key;
+            i++;
+        }
+        // 参数排序A-Z
+        Arrays.sort(keys);
+        for (String key : keys) {
+            // 空值不参与签名
+            if (signMap.get(key) == null) {
+                continue;
+            }
+            // 组装待签名字符串
+            sign_temp += key + "=" + signMap.get(key) + "&";
+        }
+        // 生成sign=URL+私钥 转大写
+        sign_temp = sign_temp + "key=" + privateKey;
+        return EncoderUtil.encodeBySHA1(sign_temp).toUpperCase();
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/FileUploadUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/FileUploadUtil.java
new file mode 100644
index 000000000..6a6112076
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/FileUploadUtil.java
@@ -0,0 +1,157 @@
+package com.ruoyi.content.utils;
+
+import com.ruoyi.content.domain.OssDTO;
+import com.ruoyi.content.message.Message;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * 说明：文件上传
+ *
+ * @author wang.q
+ * @date 2017年8月18日
+ */
+public class FileUploadUtil {
+    private final static Logger logger = LoggerFactory.getLogger(FileUploadUtil.class);
+
+    /**
+     * 文件上传处理-上传到本地
+     *
+     * @param request
+     * @return
+     */
+    @SuppressWarnings("rawtypes")
+    public Message fileUploadTOLocal(HttpServletRequest request) {
+        Message msg = new Message();
+        try {
+            // 将当前上下文初始化给 CommonsMutipartResolver （多部分解析器）
+            CommonsMultipartResolver multipartResolver = new CommonsMultipartResolver(
+                    request.getSession().getServletContext());
+            // 检查form中是否有enctype="multipart/form-data"
+            if (multipartResolver.isMultipart(request)) {
+                // 将request变成多部分request
+                MultipartHttpServletRequest multiRequest = (MultipartHttpServletRequest) request;
+                // 获取multiRequest 中所有的文件名
+                Iterator iter = multiRequest.getFileNames();
+                while (iter.hasNext()) {
+                    // 一次遍历所有文件
+                    MultipartFile file = multiRequest.getFile(iter.next().toString());
+                    if (file != null) {
+                        String path = "" + file.getOriginalFilename();
+                        // 上传
+                        file.transferTo(new File(path));
+                    }
+                }
+                msg.setResult(true);
+            } else {
+                logger.info("文件上传失败，form表单没有文件信息");
+                msg.setInfo("文件上传失败，没有获取到上传文件信息！");
+                msg.setResult(false);
+            }
+        } catch (Exception e) {
+            logger.info("文件上传失败,失败原因【{}】", e.getMessage());
+            msg.setInfo("文件上传失败，请稍后再试！");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        return msg;
+    }
+
+    /**
+     * 上传文件到OSS上
+     *
+     * @return
+     */
+    @SuppressWarnings("rawtypes")
+    public static Message filesUploadTOOSS(String path, MultipartHttpServletRequest multiRequest, OssDTO ossDTO) {
+        Message msg = new Message();
+        try {
+            // 将当前上下文初始化给 CommonsMutipartResolver （多部分解析器）
+            // 检查form中是否有enctype="multipart/form-data"
+            Map<String, String> map = new HashMap<String, String>();
+            // 将request变成多部分request
+            // 获取multiRequest 中所有的文件名
+            Iterator iter = multiRequest.getFileNames();
+            while (iter.hasNext()) {
+                // 一次遍历所有文件
+                MultipartFile file = multiRequest.getFile(iter.next().toString());
+                if (file != null) {
+                    Message fileMsg = new Message();
+                    String fileName = file.getOriginalFilename();
+                    String ext = fileName.substring(fileName.lastIndexOf("."), fileName.length());
+                    fileName = path + "/" + DateUtil.convertDate(new Date(), DateUtil.yyyyMMddHHmmssSSS) + ext;
+                    fileMsg = ossFileUpload(fileName, file.getInputStream(), ossDTO);
+                    if (fileMsg.getResult()) {
+                        map.put(file.getOriginalFilename(), fileMsg.getInfo());
+                    }
+                    // String path = "" + file.getOriginalFilename();
+                    // 上传到本地临时
+                    // file.transferTo(new File(path));
+                }
+            }
+            msg.setResult(true);
+        } catch (Exception e) {
+            logger.info("文件上传失败,失败原因【{}】", e.getMessage());
+            msg.setInfo("文件上传失败，请稍后再试！");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        return msg;
+    }
+
+    /**
+     * 上传图片到阿里云服务器
+     *
+     * @param fileName
+     * @param in
+     * @return
+     */
+    public static Message ossFileUpload(String fileName, InputStream in, OssDTO ossDTO) {
+        Message msg = new Message();
+        try {
+            if (in == null) {
+                logger.info("从微信端下载图片失败");
+                return new Message(false, "图片上传失败，请重新上传图片信息");
+            }
+            String path = ossDTO.getOssPath() + fileName;
+            logger.info("文件上传OSS路径【{}】", path);
+
+            msg = OSSUtil.uploadFileByInputStreamReturnUrl(ossDTO.getOssEndPoint(), ossDTO.getOssId(),
+                    ossDTO.getOssKey(), ossDTO.getBucketName(), in, path);
+        } catch (Exception ex) {
+            logger.info("系统异常【{}】", ex);
+        }
+        return msg;
+    }
+
+    /**
+     * 单文件上传
+     *
+     * @param path
+     * @return
+     */
+    public static Message fileUploadTOOSS(String path, InputStream inp, OssDTO ossDTO) {
+        Message msg = new Message();
+        try {
+            msg = ossFileUpload(path, inp, ossDTO);
+        } catch (Exception e) {
+            logger.info("文件上传失败,失败原因【{}】", e.getMessage());
+            msg.setInfo("文件上传失败，请稍后再试！");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        return msg;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/FreemakerUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/FreemakerUtil.java
new file mode 100644
index 000000000..31cdd4685
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/FreemakerUtil.java
@@ -0,0 +1,160 @@
+package com.ruoyi.content.utils;
+
+import com.ruoyi.content.constants.PropertiesConstants;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.io.*;
+import java.util.Map;
+
+public class FreemakerUtil {
+    private static Log logger = LogFactory.getLog(FreemakerUtil.class);
+
+    /**
+     * 生成静态文件
+     *
+     * @param conf
+     * @param templateName 模板名称
+     * @param filePath     文件路径
+     * @return
+     */
+    public static boolean generateStaticPage(Configuration conf, String templateName, String filePath,
+                                             Map<String, Object> data) {
+        Writer out = null;
+        try {
+            logger.info("开始生成静态文件：" + filePath);
+            long time = System.currentTimeMillis();
+            templateName = templateName.replaceAll("//", "/");
+            conf.setDirectoryForTemplateLoading(new File(PropertiesConstants.PROJECT_LOCALPATH));
+            Template template = conf.getTemplate(templateName, "UTF-8");
+            filePath = filePath.replaceAll("//", "/");
+            logger.info("打印1【" + filePath + "】");
+            File contentFileDir = new File(filePath.substring(0, filePath.lastIndexOf("/")));
+
+            if (!contentFileDir.exists()) {
+                contentFileDir.mkdirs();
+            }
+            contentFileDir = new File(filePath);
+            if (!contentFileDir.exists()) {
+                logger.info(contentFileDir.createNewFile());
+                contentFileDir.createNewFile();
+            }
+            logger.info("文件位置" + filePath);
+            out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(contentFileDir), "UTF-8"));
+            // out = new BufferedWriter(new OutputStreamWriter(new
+            // FileOutputStream(contentFileDir),"UTF-8"));
+            template.process(data, out);
+            time = System.currentTimeMillis() - time;
+            logger.info("成功生成静态文件，耗时(ms)：" + time);
+            return true;
+        } catch (IOException e) {
+            e.printStackTrace();
+            logger.error("模板文件未找到", e);
+            return false;
+        } catch (TemplateException e) {
+            logger.error("生成静态文件异常", e);
+            return false;
+        } catch (Exception e) {
+            logger.error(e);
+            return false;
+        } finally {
+            if (out != null) {
+                try {
+                    out.close();
+                    out = null;
+                } catch (IOException e) {
+                    logger.error(e);
+                }
+            }
+        }
+    }
+
+    /**
+     * 删除目录下的所有物理文件
+     *
+     * @param filePath 文件目录
+     * @return
+     */
+    public static boolean deleteAllFile(String filePath) {
+        File dir = new File(filePath);
+        if (dir.exists()) {
+            for (File file : dir.listFiles()) {
+                if (!file.delete()) {
+                    return false;
+                }
+            }
+            return true;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * 删除指定文件
+     *
+     * @param filePath
+     * @param fileNames
+     * @return
+     */
+    public static boolean deleteFiles(String filePath, String fileNames) {
+        File dir = new File(filePath);
+        if (dir.exists()) {
+            for (File file : dir.listFiles()) {
+                if (file.getName().contains(fileNames)) {
+                    if (!file.delete()) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        } else {
+            return true;
+        }
+    }
+
+    public static boolean archivePageCommonData(Map<String, Object> data) {
+        // data.put(TemplateTagConstant.SITE_ROOT, "");
+        return true;
+    }
+
+    public static void main(String[] args) {
+        // Configuration conf=new Configuration();
+        // Map<String, Object> pageData = new HashMap<String, Object>();
+        // CmsChannel4Page channel4Page = new CmsChannel4Page();
+        // channel4Page.setTitle("健康热点");
+        // channel4Page.setChannelDes("channeldes");
+        // channel4Page.setChannelDetailPageFileName("channelDetailPage");
+        // channel4Page.setChannelId("10163");
+        // channel4Page.setChannelUrl("/financial");
+        // channel4Page.setMakeDate(new Date());
+        // channel4Page.setChannelName("名称");
+        // channel4Page.setPageSize(0);
+        // CmsContent4Page content4Page = new CmsContent4Page();
+        // CmsContent content=new CmsContent();
+        // content.setChannelId("10886");
+        // content.setTitle("健康热点");
+        // content4Page = content4Page.copyproperty(content);
+        // content4Page.setFileExt(".html");
+        // content4Page.setContentHtml("<div
+        // class=\"article_container\"><h2>老年人“华夏慈善基金”成立</h2><div><span>2016-08-23</span><i>华夏保险</i></div><img
+        // src=\"gv/marketing_zone/images/img_picture.png\"><p>华夏保险是一家全国性、股份制人寿保险公司。注册资本金153亿元人民币，总资产近4000亿元。公司以全方位产品线满足客户需求，树立了“华夏福”“富贵竹”“常青藤”等产品线的良好市场口碑，是“亚洲品牌500强”企业、“稳健经营保险公司”。服务热线：95300</p></div>");
+        //
+        //
+        //
+        // pageData.put("channelID", "10163");
+        // pageData.put("onlineHome", "D:\\");//online的发布路径
+        // pageData.put("ctx", "D:/cms");
+        // pageData.put("publishPath", "/publish");//发布路径
+        // pageData.put("site", "D:/cms/test");
+        // pageData.put("quotePage", "/publish/product");
+        // pageData.put("systemConfig", SystemConfig.getConfig());
+        // pageData.put("ctx_resource", "ctx");
+        // pageData.put("channel", channel4Page);
+        // pageData.put("content", content4Page);
+        //
+        // generateStaticPage(conf, "/WEB-INF/template/20170816/100000.flt", "C:/work/tool/tomcat/tomcatbug81/webapps/test/a.html", pageData);
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/GetMessageFromArticle.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/GetMessageFromArticle.java
new file mode 100644
index 000000000..00040439e
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/GetMessageFromArticle.java
@@ -0,0 +1,570 @@
+package com.ruoyi.content.utils;
+
+import com.gargoylesoftware.htmlunit.*;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.ruoyi.content.constants.PropertiesConstants;
+import com.ruoyi.content.domain.OssDTO;
+import com.ruoyi.content.message.Message;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.select.Elements;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 爬虫获取文章内容和图片
+ *
+ * @author ZMN
+ */
+
+public class GetMessageFromArticle {
+    private final static Logger logger = LoggerFactory.getLogger(GetMessageFromArticle.class);
+
+    public static Message getArticleListFromUrl(String listurl, OssDTO ossDTO, String author, String ids) {
+        Message msg = new Message();
+        Map<String, String> resultMap = new HashMap<String, String>();
+        msg.setResult(true);
+        msg.setInfo("抓取文章成功！");
+        Document doc = null;
+        try {
+//			doc = Jsoup.connect(listurl).userAgent("Mozilla/5.0").timeout(3000).post();
+            doc = Jsoup.connect(listurl).userAgent("Mozilla/5.0").timeout(3000).get();
+            //doc= Jsoup.parse(httpMethod(listurl));
+            //doc = getDocument(listurl);
+            logger.info("-----------:" + doc);
+            Thread.sleep(2000);
+        } catch (Exception e) {
+            logger.info("获取文章地址错误【{}】,url【{}】", e.getMessage(), listurl);
+            e.printStackTrace();
+            msg.setResult(false);
+            msg.setInfo("获取文章信息失败！");
+            return msg;
+        }
+        // 如果通过传过来的地址拿不到文章，直接返回
+        if (doc == null) {
+            logger.info("创建文章，没有拿到远程文章内容，文章url【{}】", listurl);
+            msg.setResult(false);
+            msg.setInfo("没有获取到相应的文章内容，请重试！");
+            return msg;
+        }
+        //去掉临时链接标签
+        doc.select("div.rich_media_global_msg").remove();
+        doc.select("#js_article").attr("class", "rich_media");
+        //去掉原文章中的 ‘阅读原文’
+//		doc.getElementById("js_toobar3").remove();
+//		Elements remove = doc.getElementsByClass("rich_media_tool").remove();
+        //替换阅读原文跳转地址
+        String docString = doc.getAllElements().get(0).toString();
+        String msg_source_url = docString.split("var msg_source_url = '")[1].split("';")[0];
+        doc.select("#js_view_source").attr("href", msg_source_url).attr("style", "font-size: 14px");
+        //去掉原文章中的‘文章已于...修改’
+        doc.select("div.article_modify_area.tips_global_primary.article_modify_area_primary").remove();
+        //获取分享信息和标题信息
+        resultMap = getArticleTitle(doc, ossDTO);
+        Element element = doc.getElementById("js_article");//获取文章内容,包含标题
+//		String title = doc.getElementById("activity-name").toString();
+        Element contentElement = doc.getElementById("js_content");// 只要正文，不要标题
+        System.out.println(contentElement);
+        contentElement.attr("style", "");
+        // Elements spans = element.getElementsByTag("span");// 找到所有xx标签 ，以便拿文字
+        // 判断是否有正文内容
+        if (element == null) {
+            logger.info("创建文章，没有拿到文章内容，文章url【{}】", listurl);
+            msg.setResult(false);
+            msg.setInfo("没有获取到文章内容，请重试！");
+            return msg;
+        }
+//		element.getElementById("post-user").textNodes().get(0).text(author);	//设置作者
+//		element.getElementById("post-user").removeAttr("href");			//移除属性
+//		element.getElementById("post-user").attr("href", "");			//设置属性
+        Elements imgs = element.getElementsByTag("img");// 拿到所有的图片，以便保存
+        Elements style = doc.getElementsByTag("style");// 拿到所有的图片，以便保存
+        // 判断是否有视频
+        Elements mpvoice = element.getElementsByTag("iframe");// 拿到所有的视频
+        if (mpvoice != null) {
+//		if (null != null) {
+            logger.info("当前存在视频");
+            for (Element ele : mpvoice) {
+                try {
+                    String videoUrls = "";
+                    String dataSrc = ele.attr("data-src");// 拿到视频的链接
+                    logger.info("拿到视频的链接" + dataSrc);
+                    if (dataSrc.indexOf("vid=") > -1) {
+
+
+//						String[] arr = dataSrc.split("&");
+//						String src = arr[0];
+//						String width = arr[0].split("=")[1];
+//						String height = arr[1];
+
+
+                        HashMap hashMap = new HashMap();
+                        int indexOf = dataSrc.indexOf("?");
+                        String dataSrcData = dataSrc.substring(indexOf + 1, dataSrc.length());
+                        String[] dataSplit = dataSrcData.split("&");
+                        for (int i = 0; i < dataSplit.length; i++) {
+                            String string = dataSplit[i];
+                            String[] split = string.split("=");
+                            hashMap.put(split[0], split[1]);
+                        }
+                        String width = "" + hashMap.get("width");
+                        String height = "" + hashMap.get("height");
+//						if(StringUtils.isBlank(width) && StringUtils.isBlank(height) && width.equals("null") && height.equals("null")) {
+//							width = "10000px";
+//							height = "10000px";
+//						}
+                        //height= heightArr[1]
+                        if (StringUtils.isNotBlank(dataSrcData)) {
+//							String[] widthArr = width.split("=");
+//							String[] heightArr = height.split("=");
+//							String[] urlArr = src.split("vid=");
+//							String[] urlArr = src.split("=");
+                            String vid = "" + hashMap.get("vid");
+
+                            String videoSrc = "https://v.qq.com/iframe/player.html?vid=";
+                            //默认视频连接为.html ，存在mp4 的改为php的视频连接
+                            if (vid.indexOf("wxv") > -1) {
+//								videoSrc = "https://mp.weixin.qq.com/mp/readtemplate?t=pages/video_player_tmpl&action=mpvideo&vid=";
+                                videoSrc = "http://video.kmphp.kuaizhanye.com/video.php?vid=";
+                            }
+
+                            logger.info("视频页面地址为：" + videoSrc);
+                            String js = "<script type=\"text/javascript\"> var iframe = document.getElementsByTagName(\"iframe\");"
+                                    + "for (var i = 0; i < iframe.length; i++) {"
+                                    + " iframe[i].style.width = document.body.clientWidth + \"px\";"
+                                    + " iframe[i].style.height = document.body.clientWidth * 0.5625 + \"px\";}</script>";
+                            String videoUrl = "<iframe frameborder=\"0\" width=\"" + width + "\" height=\""
+                                    + height + "\" src=\"" + videoSrc + vid
+//									+ hashMap.get("height") + "\" src=\"https://v.qq.com/iframe/player.html?vid=" +  hashMap.get("vid")
+                                    + "&tiny=0&auto=0\" allowfullscreen></iframe>";
+                            logger.info("截取文章视频vid【{}】，生成后的视频地址【{}】", vid, videoUrl);
+                            videoUrls = js + videoUrl;
+                            // 替换原来的视频链接
+                            ele.before(videoUrls);
+                            ele.remove();
+                        }
+                    }
+                } catch (Exception e) {
+                    logger.info("文章获取视频异常【{}】", e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+        } else {
+            logger.info("不存在视频");
+            msg.setResult(true);
+            msg.setInfo("抓取文章成功！");
+        }
+
+        logger.info("音频处理中");
+        Elements voiceEle = element.getElementsByTag("mpvoice");// 拿到所有的音频
+        if (voiceEle != null) {
+            // if (null != null) {
+            logger.info("当前存在音频");
+            for (Element ele : voiceEle) {
+                String downloadSrc = "https://res.wx.qq.com/voice/getvoice?mediaid=";
+                String ossUrl = "";
+                String mediaid = ele.attr("voice_encode_fileid");
+                //播放长度
+                String playLength = ele.attr("play_length");
+                if (StringUtils.isBlank(playLength)) {
+                    playLength = "0";
+                }
+                //音频名称
+                String name = ele.attr("name");
+				/*if (!name.contains(".mp3")) {
+					name = name + ".mp3";
+				}*/
+                if (StringUtils.isNotBlank(mediaid)) {
+                    try {
+                        logger.info("下载音频到oss:【{}】【{}】", ossDTO.getBucketName(), ossDTO.getOssPath());
+                        ossUrl = download(downloadSrc + mediaid, name, "voice/", ossDTO);
+                        logger.info("oss返回音频地址：" + ossUrl);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    String tag = "<div class=\"audio_box_\">" +
+                            "  <h3>" + name + "</h3>" +
+                            "<audio id=\"audio_\" style=\"width: 0;height: 0\" src=\"" + ossUrl + "\" controls=\"controls\"></audio>" +
+                            "  <div class=\"ProcessAllBox\">" +
+                            "    <div class=\"Process\">" +
+                            "      <div class=\"ProcessAll\">" +
+                            "        <div class=\"ProcessNow\">" +
+                            "        </div>" +
+                            "        <div class=\"ProcessNow_circular\">" +
+                            "        </div>" +
+                            "      </div>" +
+                            "      <div class=\"play_\" id=\"play_\">" +
+                            "        <span aria-labelledby=\"播放开关\" class=\"audio_card_switch\"><em class=\"article_audio_btn\" role=\"button\"></em></span>" +
+                            "      </div>" +
+                            "    </div>" +
+                            "    <div class=\"show_time_\">" +
+                            "      <span class=\"real_time\">00:00</span>" +
+                            "      <span class=\"all_time\">" + playLength + "</span>" +
+                            "    </div>" +
+                            "  </div>";
+//					String tag = "<div class=\"audio_box_\"><h3>" + name + "</h3><audio src=\""+ ossUrl +"\" controls=\"controls\" ></audio></div>";
+                    ele.before(tag);
+                    ele.remove();
+                }
+            }
+        }
+        logger.info("音频处理结束");
+
+
+        // 判断是否有图片
+        String body = style + element.toString().replace("amp;", "");
+
+        if (imgs != null) {
+//		if (null != null) {
+            // 循环存储拿到的图片
+            for (Element img : imgs) {
+                try {
+                    // 原文中的data-src
+                    String oldImg = "data-src=\"" + img.attr("data-src") + "\"";
+
+                    // 判断图片的格式
+                    int begin = img.attr("data-src").indexOf("_") + 1;
+                    int end = img.attr("data-src").indexOf("_") + 4;
+                    String styles = img.attr("data-src").substring(begin, end);
+
+                    String imgType = ".jpg";
+                    if (styles.equals("jpg")) {
+                        imgType = ".jpg";
+                    } else if (styles.equals("png")) {
+                        imgType = ".png";
+                    } else if (styles.equals("gif")) {
+                        imgType = ".gif";
+                    } else if (styles.equals("bmp")) {
+                        imgType = ".bmp";
+                    } else if (styles.equals("jpeg")) {
+                        imgType = ".jpeg";
+                    } else if (styles.equals("svg")) {
+                        imgType = ".svg";
+                    }
+
+                    // 保持原图片名字不变
+                    String str = "";
+                    String strEnd = "";
+                    String imageName = "";
+                    if (img.toString().contains("?")) {
+
+                        str = img.toString().substring(0, img.toString().indexOf("?"));
+                        strEnd = str.toString().substring(0, str.toString().lastIndexOf("/"));
+                        imageName = strEnd.substring(strEnd.lastIndexOf("/") + 1, strEnd.length());
+                    } else {
+                        str = img.toString().substring(0, img.toString().lastIndexOf("/"));
+                        imageName = str.substring(str.lastIndexOf("/") + 1, str.length());
+                    }
+                    // 开始保存
+                    String imgUrl = download(img.attr("data-src"), imageName + imgType, PropertiesConstants.ONLINE_IMG_PATH,
+                            ossDTO);
+                    if (StringUtils.isNotBlank(imgUrl)) {
+                        // 最后生成可访问的src
+                        String newImgUrl = " src=\"" + imgUrl + "\" ";
+                        body = body.replace(oldImg, newImgUrl);
+
+//						String[] split = body.split("<script");
+//						for (String string : split) {
+//							int endIndex = string.indexOf("/script>");
+//							if (endIndex!=-1) {
+//								endIndex+=8;
+//								String substring = "<script"+string.substring(0,endIndex);
+//								body.replace(substring, "");
+//							}
+//						}
+                        if (body.indexOf(img.attr("data-src")) > -1) {
+                            logger.info("当前还存在相同图片地址的数据，可能为图片放盗，再次替换");
+                            body = body.replace(img.attr("data-src"), imgUrl);// 替换可能存在图片验证的地址
+                        }
+                    }
+                } catch (Exception e) {
+                    logger.info("保存图片失败！！！【{}】", e.getMessage());
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        // Elements mpvoice = element.getElementsByTag("embed");// 拿到所有的视频
+        // 处理样式中存在的图片
+        Elements section = element.getElementsByTag("section");// 拿到所有的图片，以便保存
+        if (section != null) {
+            for (Element ele : section) {
+                String styles = ele.attr("style");
+                String regEx = "http(s)?://(.)*(gif|png|jpg|bmp|jpeg)";
+                Pattern p = Pattern.compile(regEx);
+                Matcher m = p.matcher(styles);
+                if (m.find()) {
+                    String imgUrl = m.group();
+                    logger.info("imgUrl的值【{}】", imgUrl);
+
+                    String imgType = "";
+                    if (imgUrl.indexOf("=") > -1) {
+                        // 保持原图片名字不变
+                        imgType = imgUrl.substring(imgUrl.lastIndexOf("="), imgUrl.length()).substring(1);
+                        logger.info("imgType的值【{}】", imgType);
+                    }
+                    String imageName = "";
+                    if (imgUrl.toString().indexOf("?") > -1) {
+                        String str = imgUrl.toString().substring(0, imgUrl.toString().indexOf("?"));
+                        String strEnd = str.toString().substring(0, str.toString().lastIndexOf("/"));
+                        imageName = strEnd.substring(strEnd.lastIndexOf("/") + 1, strEnd.length());
+                    }
+
+                    // 开始保存
+                    try {
+                        if (StringUtils.isNotBlank(imgType) && StringUtils.isNotBlank(imageName)) {
+                            String bgImgUrl = download(imgUrl, imageName + imgType,
+                                    PropertiesConstants.ONLINE_IMG_PATH, ossDTO);
+                            logger.info("bgImgUrl的值【{}】", bgImgUrl);
+                            if (StringUtils.isNotBlank(bgImgUrl)) {
+                                body = body.replace(imgUrl, bgImgUrl);
+                            }
+                        } else {
+                            continue;
+                        }
+                    } catch (Exception e) {
+                        logger.info("保存样式中的图片异常【{}】", e.getMessage());
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        String regEx = "http(s)?://(.)*(wx_fmt=png)";
+        Pattern p = Pattern.compile(regEx);
+        Matcher m = p.matcher(body);
+        if (m.find()) {
+            String imgUrl = m.group();
+            // 保持原图片名字不变
+            String imgType = imgUrl.substring(imgUrl.lastIndexOf("."), imgUrl.length());
+            // 开始保存
+            try {
+                String bgImgUrl = download(imgUrl, RandomUtils.generateRandomCharAndNumber(8) + imgType,
+                        PropertiesConstants.ONLINE_IMG_PATH, ossDTO);
+                if (StringUtils.isNotBlank(bgImgUrl)) {
+                    body = body.replace(imgUrl, bgImgUrl);
+                }
+            } catch (Exception e) {
+                logger.info("保存样式中的图片异常【{}】", e.getMessage());
+                e.printStackTrace();
+            }
+        }
+
+//		File file = new File("D:\\a.html");
+//		try {
+//			FileOutputStream fileOutputStream = new FileOutputStream(file);
+//			try {
+//				fileOutputStream.write(body.getBytes());
+//			} catch (IOException e) {
+//				// TODO Auto-generated catch block
+//				e.printStackTrace();
+//			}
+//		} catch (FileNotFoundException e) {
+//			// TODO Auto-generated catch block
+//			e.printStackTrace();
+//		}
+//		body = title + body;
+
+
+        try {
+            body = HtmlCompressor.compress(body);
+            resultMap.put("articleContent", body);
+            resultMap.put("originalUrl", listurl);
+            resultMap.put("adId", ids);
+            msg.setObject(resultMap);
+        } catch (Exception e) {
+            logger.info("压缩html异常【{}】", e.getMessage());
+            e.printStackTrace();
+        }
+        return msg;
+    }
+
+    // 保存图片到本地
+    @SuppressWarnings("unchecked")
+    public static String download(String urlString, String filename, String savePath, OssDTO ossDTO) throws Exception {
+        String imgUrl = "";
+        // 构造URL
+        URL url = new URL(urlString);
+        // 打开连接
+        URLConnection conn = url.openConnection();
+        // 设置请求超时为5s
+        conn.setConnectTimeout(5 * 1000);
+        // 通过输入流获取图片数据
+        InputStream inStream = null;
+        try {
+            inStream = conn.getInputStream();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        // 文件上传OSS并生成可访问的链接
+        Message msg = new Message();
+        msg = FileUploadUtil.ossFileUpload(savePath + filename, inStream, ossDTO);
+        // 关闭输入流
+        inStream.close();
+        if (msg.getResult()) {
+            Map<String, Object> map = new HashMap<String, Object>();
+            map = (Map<String, Object>) msg.getObject();
+            imgUrl = map.get("url") + "";
+        }
+        logger.info("原始地址【{}】,保存图片后返回地址【{}】", urlString, imgUrl);
+        return imgUrl;
+    }
+
+    public static Map<String, String> getArticleTitle(Document doc, OssDTO ossDTO) {
+        Map<String, String> resultMap = new HashMap<String, String>();
+        String element = doc.getAllElements().get(0).toString();
+        String msg_title = element.split("var msg_title = '")[1].split("'.html")[0];
+        String msg_desc = element.split("var msg_desc = \"")[1].split("\";")[0];
+        if (msg_desc.contains("\\x0a")) {
+            msg_desc = msg_desc.replace("\\x0a", "\n");
+        }
+        String msg_cdn_url = element.split("var msg_cdn_url = \"")[1].split("\";")[0];
+
+        int begin = msg_cdn_url.indexOf("_") + 1;
+        int end = msg_cdn_url.indexOf("_") + 4;
+        String styles = msg_cdn_url.substring(begin, end);
+        String imgType = ".jpg";
+        if (styles.equals("jpg")) {
+            imgType = ".jpg";
+        } else if (styles.equals("png")) {
+            imgType = ".png";
+        } else if (styles.equals("gif")) {
+            imgType = ".gif";
+        } else if (styles.equals("bmp")) {
+            imgType = ".bmp";
+        } else if (styles.equals("jpeg")) {
+            imgType = ".jpeg";
+        }
+        String str = msg_cdn_url.toString().substring(0, msg_cdn_url.toString().lastIndexOf("/"));
+        String imageName = str.substring(str.lastIndexOf("/") + 1, str.length());
+        try {
+            String imgUrl = download(msg_cdn_url, imageName + imgType, PropertiesConstants.ONLINE_IMG_PATH,
+                    ossDTO);
+            if (StringUtils.isNotBlank(imgUrl)) {
+                resultMap.put("shareImgUrl", imgUrl);
+                resultMap.put("listPicUrl", imgUrl);
+            }
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        resultMap.put("shareTitle", msg_title);
+        resultMap.put("shareDes", msg_desc);
+        resultMap.put("articleName", msg_title);
+        return resultMap;
+    }
+
+    @SuppressWarnings({"unused", "unchecked"})
+    public static void main(String[] args) {
+        OssDTO ossDTO = new OssDTO();
+        ossDTO.setBucketName("hx-cdn-int");
+        ossDTO.setOssEndPoint("oss-cn-szfinance.aliyuncs.com");
+        ossDTO.setOssEndPointOut("oss-cn-szfinance-internal.aliyuncs.com");
+        ossDTO.setOssId("LTAIsVIQ8j9WueV2");
+        ossDTO.setOssKey("Il5Y1tugBi9u8giGi9n4lQhAWwkcih");
+        ossDTO.setOssPath("gv/YXPT");
+//		msg = GetMessageFromArticle.getArticleListFromUrl(url,ossDTO);
+//		String url = "https://mp.weixin.qq.com/s/ufsPXRlbmronWpAKnkSwNg";
+//		String url = "http://mp.weixin.qq.com/s/neU3nXAj7EGVCLDyI8sZHA";
+        String url = "https://mp.weixin.qq.com/s/kHx-OJ6BVHE7MXWFReUGGw";
+        Message msg = getArticleListFromUrl(url, ossDTO, "", "");
+        logger.info("返回的msg【{}】", JsonUtil.objectToJackson(msg));
+//		JsonArray json = JsonUtil.objectToJackson(msg). 
+        Map<String, String> resultMap = new HashMap<String, String>();
+        resultMap = (Map<String, String>) msg.getObject();
+    }
+
+
+    public static Document getDocument(String url) throws IOException, InterruptedException {
+		         /*String url="https://www.marklines.com/cn/vehicle_sales/search_country/search/?searchID=587200";
+		         Connection connect = Jsoup.connect(url).userAgent("")
+		                  .header("Cookie", "PLAY_LANG=cn; _plh=b9289d0a863a8fc9c79fb938f15372f7731d13fb; PLATFORM_SESSION=39034d07000717c664134556ad39869771aabc04-_ldi=520275&_lsh=8cf91cdbcbbb255adff5cba6061f561b642f5157&csrfToken=209f20c8473bc0518413c226f898ff79cd69c3ff-1539926671235-b853a6a63c77dd8fcc364a58&_lpt=%2Fcn%2Fvehicle_sales%2Fsearch&_lsi=1646321; _ga=GA1.2.2146952143.1539926675; _gid=GA1.2.1032787565.1539926675; _plh_notime=8cf91cdbcbbb255adff5cba6061f561b642f5157")
+		                 .timeout(360000000);
+		         Document document = connect.get();*/
+        WebClient wc = new WebClient(BrowserVersion.CHROME);
+        //启用JS解释器，默认为true
+        wc.getOptions().setJavaScriptEnabled(true);
+        //禁用CSS
+        wc.getOptions().setCssEnabled(false);
+        //js运行错误时，是否抛出异常
+        wc.getOptions().setThrowExceptionOnScriptError(false);
+        //状态码错误时，是否抛出异常
+        wc.getOptions().setThrowExceptionOnFailingStatusCode(false);
+        //是否允许使用ActiveX
+        wc.getOptions().setActiveXNative(false);
+        //等待js时间
+        wc.waitForBackgroundJavaScript(6000 * 1000);
+        //设置Ajax异步处理控制器即启用Ajax支持
+        wc.setAjaxController(new NicelyResynchronizingAjaxController());
+        //设置超时时间
+        wc.getOptions().setTimeout(1000000);
+        //不跟踪抓取
+        wc.getOptions().setDoNotTrackEnabled(false);
+        WebRequest request = new WebRequest(new URL(url));
+        request.setAdditionalHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:62.0) Gecko/20100101 Firefox/62.0");
+        try {
+            //模拟浏览器打开一个目标网址
+            HtmlPage htmlPage = wc.getPage(request);
+            //为了获取js执行的数据 线程开始沉睡等待
+            Thread.sleep(7000);//这个线程的等待 因为js加载需要时间的
+            //以xml形式获取响应文本
+            String xml = htmlPage.asXml();
+            //并转为Document对象return
+            return Jsoup.parse(xml);
+            //System.out.println(xml.contains("结果.xls"));//false
+        } catch (FailingHttpStatusCodeException e) {
+            e.printStackTrace();
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+
+    public static String httpMethod(String url) {
+        try {
+            //创建client实例
+            HttpClient client = HttpClients.createDefault();
+            //创建httpget实例
+            HttpGet httpGet = new HttpGet(url);
+            Thread.sleep(3000);
+            //执行 get请求
+            HttpResponse response = client.execute(httpGet);
+            Thread.sleep(3000);
+            //返回获取实体
+            HttpEntity entity = response.getEntity();
+            Thread.sleep(3000);
+            //获取网页内容，指定编码
+            String web = EntityUtils.toString(entity, "UTF-8");
+            //输出网页
+            return web;
+
+
+        } catch (Exception e) {
+
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/GsonUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/GsonUtil.java
new file mode 100644
index 000000000..6172cb5b8
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/GsonUtil.java
@@ -0,0 +1,63 @@
+package com.ruoyi.content.utils;
+
+import com.google.gson.Gson;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+public class GsonUtil {
+
+    private static Gson gson = null;
+
+    static {
+        if (gson == null) {
+            gson = new Gson();
+        }
+    }
+
+    /**
+     * 将对象转换成json格式
+     *
+     * @param ts
+     * @return
+     */
+    public static String objectToJson(Object ts) {
+        String jsonStr = null;
+        if (gson != null) {
+            jsonStr = gson.toJson(ts);
+        }
+        return jsonStr;
+    }
+
+    /**
+     * 将json格式转换成list对象
+     *
+     * @param jsonStr
+     * @return
+     */
+    public static List<?> jsonToList(String jsonStr) {
+        List<?> objList = null;
+        if (gson != null) {
+            java.lang.reflect.Type type = new com.google.gson.reflect.TypeToken<List<?>>() {
+            }.getType();
+            objList = gson.fromJson(jsonStr, type);
+        }
+        return objList;
+    }
+
+    /**
+     * 将json转换成bean对象
+     *
+     * @param jsonStr
+     * @return
+     */
+    public static Object jsonToBean(String jsonStr, Class<?> cl) {
+        Object obj = null;
+        if (gson != null) {
+            obj = gson.fromJson(jsonStr, cl);
+        }
+        return obj;
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/HtmlCompressor.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/HtmlCompressor.java
new file mode 100644
index 000000000..89d4c204c
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/HtmlCompressor.java
@@ -0,0 +1,263 @@
+package com.ruoyi.content.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class HtmlCompressor {
+	private static String tempPreBlock = "%%%HTMLCOMPRESS~PRE&&&";
+	private static String tempTextAreaBlock = "%%%HTMLCOMPRESS~TEXTAREA&&&";
+	private static String tempScriptBlock = "%%%HTMLCOMPRESS~SCRIPT&&&";
+	private static String tempStyleBlock = "%%%HTMLCOMPRESS~STYLE&&&";
+	private static String tempJspBlock = "%%%HTMLCOMPRESS~JSP&&&";
+
+	private static Pattern commentPattern = Pattern.compile("<!--\\s*[^\\[].*?-->",
+			Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+	private static Pattern itsPattern = Pattern.compile(">\\s+?<",
+			Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+	private static Pattern prePattern = Pattern.compile("<pre[^>]*?>.*?</pre>",
+			Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+	private static Pattern taPattern = Pattern.compile("<textarea[^>]*?>.*?</textarea>",
+			Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+	private static Pattern jspPattern = Pattern.compile("<%([^-@][\\w\\W]*?)%>",
+			Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+	// <script></script>
+	private static Pattern scriptPattern = Pattern.compile(
+			"(?:<script\\s*>|<script type=['\"]text/javascript['\"]\\s*>)(.*?)</script>",
+			Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+	private static Pattern stylePattern = Pattern.compile("<style[^>()]*?>(.+)</style>",
+			Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+
+	// 单行注释，
+	private static Pattern signleCommentPattern = Pattern.compile("//.*");
+	// 字符串匹配
+	private static Pattern stringPattern = Pattern.compile("(\"[^\"\\n]*?\"|'[^'\\n]*?')");
+	// trim去空格和换行符
+	private static Pattern trimPattern = Pattern.compile("\\n\\s*", Pattern.MULTILINE);
+	private static Pattern trimPattern2 = Pattern.compile("\\s*\\r", Pattern.MULTILINE);
+	// 多行注释
+	private static Pattern multiCommentPattern = Pattern.compile("/\\*.*?\\*/",
+			Pattern.DOTALL | Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+
+	private static String tempSingleCommentBlock = "%%%HTMLCOMPRESS~SINGLECOMMENT&&&"; // //占位符
+	private static String tempMulitCommentBlock1 = "%%%HTMLCOMPRESS~MULITCOMMENT1&&&"; // /*占位符
+	private static String tempMulitCommentBlock2 = "%%%HTMLCOMPRESS~MULITCOMMENT2&&&"; // */占位符
+
+	public static String compress(String html) throws Exception {
+		if (html == null || html.length() == 0) {
+			return html;
+		}
+
+		List<String> preBlocks = new ArrayList<String>();
+		List<String> taBlocks = new ArrayList<String>();
+		List<String> scriptBlocks = new ArrayList<String>();
+		List<String> styleBlocks = new ArrayList<String>();
+		List<String> jspBlocks = new ArrayList<String>();
+
+		String result = html;
+
+		// preserve inline java code
+		Matcher jspMatcher = jspPattern.matcher(result);
+		while (jspMatcher.find()) {
+			jspBlocks.add(jspMatcher.group(0));
+		}
+		result = jspMatcher.replaceAll(tempJspBlock);
+
+		// preserve PRE tags
+		Matcher preMatcher = prePattern.matcher(result);
+		while (preMatcher.find()) {
+			preBlocks.add(preMatcher.group(0));
+		}
+		result = preMatcher.replaceAll(tempPreBlock);
+
+		// preserve TEXTAREA tags
+		Matcher taMatcher = taPattern.matcher(result);
+		while (taMatcher.find()) {
+			taBlocks.add(taMatcher.group(0));
+		}
+		result = taMatcher.replaceAll(tempTextAreaBlock);
+
+		// preserve SCRIPT tags
+		Matcher scriptMatcher = scriptPattern.matcher(result);
+		while (scriptMatcher.find()) {
+			scriptBlocks.add(scriptMatcher.group(0));
+		}
+		result = scriptMatcher.replaceAll(tempScriptBlock);
+
+		// don't process inline css
+		Matcher styleMatcher = stylePattern.matcher(result);
+		while (styleMatcher.find()) {
+			styleBlocks.add(styleMatcher.group(0));
+		}
+		result = styleMatcher.replaceAll(tempStyleBlock);
+
+		// process pure html
+		result = processHtml(result);
+
+		// process preserved blocks
+		result = processPreBlocks(result, preBlocks);
+		result = processTextareaBlocks(result, taBlocks);
+		result = processScriptBlocks(result, scriptBlocks);
+		result = processStyleBlocks(result, styleBlocks);
+		result = processJspBlocks(result, jspBlocks);
+
+		preBlocks = taBlocks = scriptBlocks = styleBlocks = jspBlocks = null;
+
+		return result.trim();
+	}
+
+	private static String processHtml(String html) {
+		String result = html;
+
+		// remove comments
+		// if(removeComments) {
+		result = commentPattern.matcher(result).replaceAll("");
+		// }
+
+		// remove inter-tag spaces
+		// if(removeIntertagSpaces) {
+		result = itsPattern.matcher(result).replaceAll("><");
+		// }
+
+		// remove multi whitespace characters
+		// if(removeMultiSpaces) {
+		result = result.replaceAll("\\s{2,}", " ");
+		// }
+
+		return result;
+	}
+
+	private static String processJspBlocks(String html, List<String> blocks) {
+		String result = html;
+		for (int i = 0; i < blocks.size(); i++) {
+			blocks.set(i, compressJsp(blocks.get(i)));
+		}
+		// put preserved blocks back
+		while (result.contains(tempJspBlock)) {
+			result = result.replaceFirst(tempJspBlock, Matcher.quoteReplacement(blocks.remove(0)));
+		}
+
+		return result;
+	}
+
+	private static String processPreBlocks(String html, List<String> blocks) throws Exception {
+		String result = html;
+
+		// put preserved blocks back
+		while (result.contains(tempPreBlock)) {
+			result = result.replaceFirst(tempPreBlock, Matcher.quoteReplacement(blocks.remove(0)));
+		}
+
+		return result;
+	}
+
+	private static String processTextareaBlocks(String html, List<String> blocks) throws Exception {
+		String result = html;
+
+		// put preserved blocks back
+		while (result.contains(tempTextAreaBlock)) {
+			result = result.replaceFirst(tempTextAreaBlock, Matcher.quoteReplacement(blocks.remove(0)));
+		}
+
+		return result;
+	}
+
+	private static String processScriptBlocks(String html, List<String> blocks) throws Exception {
+		String result = html;
+
+		// if(compressJavaScript) {
+		for (int i = 0; i < blocks.size(); i++) {
+			blocks.set(i, compressJavaScript(blocks.get(i)));
+		}
+		// }
+
+		// put preserved blocks back
+		while (result.contains(tempScriptBlock)) {
+			result = result.replaceFirst(tempScriptBlock, Matcher.quoteReplacement(blocks.remove(0)));
+		}
+
+		return result;
+	}
+
+	private static String processStyleBlocks(String html, List<String> blocks) throws Exception {
+		String result = html;
+
+		// if(compressCss) {
+		for (int i = 0; i < blocks.size(); i++) {
+			blocks.set(i, compressCssStyles(blocks.get(i)));
+		}
+		// }
+
+		// put preserved blocks back
+		while (result.contains(tempStyleBlock)) {
+			result = result.replaceFirst(tempStyleBlock, Matcher.quoteReplacement(blocks.remove(0)));
+		}
+
+		return result;
+	}
+
+	private static String compressJsp(String source) {
+		// check if block is not empty
+		Matcher jspMatcher = jspPattern.matcher(source);
+		if (jspMatcher.find()) {
+			String result = compressJspJs(jspMatcher.group(1));
+			return (new StringBuilder(source.substring(0, jspMatcher.start(1))).append(result)
+					.append(source.substring(jspMatcher.end(1)))).toString();
+		} else {
+			return source;
+		}
+	}
+
+	private static String compressJavaScript(String source) {
+		// check if block is not empty
+		Matcher scriptMatcher = scriptPattern.matcher(source);
+		if (scriptMatcher.find()) {
+			String result = compressJspJs(scriptMatcher.group(1));
+			return (new StringBuilder(source.substring(0, scriptMatcher.start(1))).append(result)
+					.append(source.substring(scriptMatcher.end(1)))).toString();
+		} else {
+			return source;
+		}
+	}
+
+	private static String compressCssStyles(String source) {
+		// check if block is not empty
+		Matcher styleMatcher = stylePattern.matcher(source);
+		if (styleMatcher.find()) {
+			// 去掉注释，换行
+			String result = multiCommentPattern.matcher(styleMatcher.group(1)).replaceAll("");
+			result = trimPattern.matcher(result).replaceAll("");
+			result = trimPattern2.matcher(result).replaceAll("");
+			return (new StringBuilder(source.substring(0, styleMatcher.start(1))).append(result)
+					.append(source.substring(styleMatcher.end(1)))).toString();
+		} else {
+			return source;
+		}
+	}
+
+	private static String compressJspJs(String source) {
+		String result = source;
+		// 因注释符合有可能出现在字符串中，所以要先把字符串中的特殊符好去掉
+		Matcher stringMatcher = stringPattern.matcher(result);
+		while (stringMatcher.find()) {
+			String tmpStr = stringMatcher.group(0);
+
+			if (tmpStr.indexOf("//") != -1 || tmpStr.indexOf("/*") != -1 || tmpStr.indexOf("*/") != -1) {
+				String blockStr = tmpStr.replaceAll("//", tempSingleCommentBlock)
+						.replaceAll("/\\*", tempMulitCommentBlock1).replaceAll("\\*/", tempMulitCommentBlock2);
+				result = result.replace(tmpStr, blockStr);
+			}
+		}
+		// 去掉注释
+		result = signleCommentPattern.matcher(result).replaceAll("");
+		result = multiCommentPattern.matcher(result).replaceAll("");
+		result = trimPattern2.matcher(result).replaceAll("");
+		result = trimPattern.matcher(result).replaceAll(" ");
+		// 恢复替换掉的字符串
+		result = result.replaceAll(tempSingleCommentBlock, "//").replaceAll(tempMulitCommentBlock1, "/*")
+				.replaceAll(tempMulitCommentBlock2, "*/");
+
+		return result;
+	}
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/HttpUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/HttpUtil.java
new file mode 100644
index 000000000..3ca14db09
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/HttpUtil.java
@@ -0,0 +1,393 @@
+package com.ruoyi.content.utils;
+
+import com.ruoyi.content.exception.BusinessException;
+import com.ruoyi.content.exception.MyTimeoutException;
+import org.apache.http.HttpEntity;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.conn.ConnectTimeoutException;
+import org.apache.http.conn.ssl.*;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.net.ssl.SSLContext;
+import java.io.*;
+import java.net.SocketTimeoutException;
+import java.net.URLEncoder;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author
+ */
+@SuppressWarnings("deprecation")
+public class HttpUtil {
+
+    private final static Logger logger = LoggerFactory.getLogger(HttpUtil.class);
+
+    // HTTP请求和响应的默认编码
+    private static final String DEFAULT_CHARSET = "UTF-8";
+
+    String userName = "wanghongjia";
+    String password = "abcd123%";
+
+    private static RequestConfig getConfig(Integer timeout) {
+        RequestConfig config = null;
+        if (timeout != null && timeout != 0) {
+            config = RequestConfig.custom().setSocketTimeout(timeout).setConnectTimeout(10000)
+                    .setConnectionRequestTimeout(10000).build();
+            /* 代理配置 */
+            // HttpHost proxy = new HttpHost("10.0.251.94", 8080, "http");
+            // config = RequestConfig.custom()
+            // .setSocketTimeout(10000)
+            // .setConnectTimeout(10000)
+            // .setConnectionRequestTimeout(10000)
+            // .setStaleConnectionCheckEnabled(true).setProxy(proxy).build();
+
+        } else {
+            config = RequestConfig.custom().setSocketTimeout(10000).setConnectTimeout(10000)
+                    .setConnectionRequestTimeout(10000).build();
+        }
+        return config;
+    }
+
+    /**
+     * @return String 返回数据
+     * @description 通过HTTP协议向服务器段发送请求, 并得到返回结果，根据项目要求所有请求代码为UTF-8，请求地址必须用 URLEncoder.encode进行UTF-8转化。
+     */
+    public static String post(String requestUrl, String para, int timeout) {
+        String result = "";
+        CloseableHttpClient httpclient = null;
+        CloseableHttpResponse response = null;
+        long start_time = System.currentTimeMillis();
+        try {
+            HttpPost httpPost = new HttpPost(requestUrl);
+            httpPost.setConfig(getConfig(timeout));
+            if (para != null && !para.trim().equals("")) {
+                StringEntity reqEntity = new StringEntity(para, DEFAULT_CHARSET);
+                reqEntity.setContentType("charset=" + DEFAULT_CHARSET);
+                reqEntity.setContentEncoding(DEFAULT_CHARSET);
+                httpPost.setEntity(reqEntity);
+            }
+            logger.info("执行http请求参数编码【{}】请求参数【{}】", DEFAULT_CHARSET, para);
+            if (requestUrl.indexOf("https://") == 0) {
+                logger.info("根据请求地址【{}】转换访问方式成https", requestUrl);
+                httpclient = createSSLClientDefault();
+            } else {
+                httpclient = createSSLClientDefaultBycrert(null, null);
+            }
+            response = httpclient.execute(httpPost);
+            int statusCode = response.getStatusLine().getStatusCode();
+            logger.info("执行http请求返回状态码【{}】,耗时【{}】", statusCode, (System.currentTimeMillis() - start_time));
+            HttpEntity entity = response.getEntity();
+            StringBuffer sb = new StringBuffer();
+            if (entity != null) {
+                BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(entity.getContent(), DEFAULT_CHARSET));
+                String text = null;
+                while ((text = bufferedReader.readLine()) != null) {
+                    sb.append(text);
+                }
+            }
+            result = sb.toString();
+            EntityUtils.consume(entity);
+
+            if (statusCode != 200) {
+                logger.info("Http请求异常，返回码【{}】,返回内容【{}】", statusCode, result);
+                return null;
+            }
+            return result;
+        } catch (ConnectTimeoutException ex) {
+            logger.error("执行http请求，发生异常。异常信息如下：", ex);
+            throw new BusinessException("连接服务平台超时");
+        } catch (SocketTimeoutException ex) {
+            logger.error("执行http请求，发生异常。异常信息如下：", ex);
+            throw new MyTimeoutException("读取服务平台信息超时");
+        } catch (Exception ex) {
+            logger.error("执行http请求，发生异常。异常信息如下：", ex);
+            throw new BusinessException("系统正在维护中，请稍后再试");
+        } finally {
+            try {
+                if (response != null) {
+                    response.close();
+                }
+                if (httpclient != null) {
+                    httpclient.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            logger.info("根据请求地址【{}】请求参数【{}】返回信息【{}】,请求耗时【{}】", requestUrl, para, result, (System.currentTimeMillis() - start_time));
+        }
+    }
+
+    /**
+     * @param para 请求的键值对入参
+     * @return String 返回数据
+     * @description 通过HTTP协议向服务器段发送请求, 并得到返回结果，根据项目要求所有请求代码为UTF-8，请求地址必须用 URLEncoder.encode进行UTF-8转化。
+     */
+    public static String post(String requestUrl, String para, String certKey, String certPath, int timeout) {
+        String result = "";
+        CloseableHttpClient httpclient = null;
+        CloseableHttpResponse response = null;
+        long start_time = System.currentTimeMillis();
+        try {
+            HttpPost httpPost = new HttpPost(requestUrl);
+            httpPost.setConfig(getConfig(timeout));
+            if (para != null && !para.trim().equals("")) {
+                StringEntity reqEntity = new StringEntity(para, DEFAULT_CHARSET);
+                reqEntity.setContentType("charset=" + DEFAULT_CHARSET);
+                reqEntity.setContentEncoding(DEFAULT_CHARSET);
+                httpPost.setEntity(reqEntity);
+            }
+            logger.info("执行http请求参数编码【{}】请求参数【{}】", DEFAULT_CHARSET, para);
+            if (requestUrl.indexOf("https://") == 0) {
+                logger.info("根据请求地址【{}】转换访问方式成https", requestUrl);
+                httpclient = createSSLClientDefaultBycrert(certKey, certPath);
+            } else {
+                httpclient = createSSLClientDefaultBycrert(certKey, certPath);
+            }
+            response = httpclient.execute(httpPost);
+            int statusCode = response.getStatusLine().getStatusCode();
+            logger.info("执行http请求返回状态码【{}】,耗时【{}】", statusCode, (System.currentTimeMillis() - start_time));
+            HttpEntity entity = response.getEntity();
+            StringBuffer sb = new StringBuffer();
+            if (entity != null) {
+                BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(entity.getContent(), DEFAULT_CHARSET));
+                String text = null;
+                while ((text = bufferedReader.readLine()) != null) {
+                    sb.append(text);
+                }
+            }
+            result = sb.toString();
+            EntityUtils.consume(entity);
+            if (statusCode != 200) {
+                logger.info("Http请求异常，返回码【{}】,返回内容【{}】", statusCode, result);
+                return null;
+            }
+            return result;
+        } catch (ConnectTimeoutException ex) {
+            logger.error("执行http请求，发生异常。异常信息如下：", ex);
+            throw new BusinessException("连接服务平台超时");
+        } catch (SocketTimeoutException ex) {
+            logger.error("执行http请求，发生异常。异常信息如下：", ex);
+            throw new MyTimeoutException("读取服务平台信息超时");
+        } catch (Exception ex) {
+            logger.error("执行http请求，发生异常。异常信息如下：", ex);
+            throw new BusinessException("系统正在维护中，请稍后再试");
+        } finally {
+            try {
+                if (response != null) {
+                    response.close();
+                }
+                if (httpclient != null) {
+                    httpclient.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            logger.info("根据请求地址【{}】请求参数【{}】返回信息【{}】,请求耗时【{}】", requestUrl, para, result, (System.currentTimeMillis() - start_time));
+        }
+    }
+
+    /**
+     * @return String 返回数据
+     * @description 通过HTTP协议向服务器段发送请求, 并得到返回结果，根据项目要求所有请求代码为UTF-8，请求地址必须用 URLEncoder.encode进行UTF-8转化。
+     */
+    public static String post(String requestUrl, Map<String, String> paraMap, int timeout) {
+        String result = "";
+        CloseableHttpClient httpclient = null;
+        CloseableHttpResponse response = null;
+        long start_time = System.currentTimeMillis();
+        try {
+            HttpPost httpPost = new HttpPost(requestUrl);
+            httpPost.setConfig(getConfig(timeout));
+            List<NameValuePair> nvps = new ArrayList<NameValuePair>();
+            String para = "";
+            if (paraMap != null && paraMap.size() != 0) {
+                for (Map.Entry<String, String> entry : paraMap.entrySet()) {
+                    nvps.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
+                    para = para + entry.getKey() + "=" + URLEncoder.encode(entry.getValue(), DEFAULT_CHARSET) + "&";
+                }
+            }
+            logger.info("执行http请求参数编码【{}】执行http请求参数【{}】", DEFAULT_CHARSET, para);
+            httpPost.setEntity(new UrlEncodedFormEntity(nvps, DEFAULT_CHARSET));
+            if (requestUrl.indexOf("https://") == 0) {
+                logger.info("根据请求地址【{}】转换访问方式成https", requestUrl);
+                httpclient = createSSLClientDefault();
+            } else {
+                httpclient = createSSLClientDefaultBycrert(null, null);
+            }
+            response = httpclient.execute(httpPost);
+            int statusCode = response.getStatusLine().getStatusCode();
+            logger.info("执行http请求返回状态码【{}】,耗时【{}】", statusCode, (System.currentTimeMillis() - start_time));
+            HttpEntity entity = response.getEntity();
+            StringBuffer sb = new StringBuffer();
+            if (entity != null) {
+                BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(entity.getContent(), DEFAULT_CHARSET));
+                String text = null;
+                while ((text = bufferedReader.readLine()) != null) {
+                    sb.append(text);
+                }
+            }
+            result = sb.toString();
+            EntityUtils.consume(entity);
+
+            if (statusCode != 200) {
+                logger.info("Http请求异常，返回码【{}】,返回内容【{}】", statusCode, result);
+                return null;
+            }
+            return result;
+        } catch (ConnectTimeoutException ex) {
+            logger.error("执行http请求，发生异常。异常信息如下：", ex);
+            throw new BusinessException("连接中台超时");
+        } catch (SocketTimeoutException ex) {
+            logger.error("执行http请求，发生异常。异常信息如下：", ex);
+            throw new MyTimeoutException("读取中台信息超时");
+        } catch (Exception ex) {
+            logger.error("执行http请求，发生异常。异常信息如下：", ex);
+            throw new BusinessException("系统正在维护中，请稍后再试");
+        } finally {
+            try {
+                if (response != null) {
+                    response.close();
+                }
+                if (httpclient != null) {
+                    httpclient.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            logger.info("根据请求地址【{}】请求参数【{}】返回信息【{}】,请求耗时【{}】", requestUrl, paraMap.toString(), result, (System.currentTimeMillis() - start_time));
+        }
+    }
+
+    public static String get(String requestUrl) throws Exception {
+        /* 1 生成 HttpClinet 对象并设置参数 */
+        CloseableHttpClient httpClient = null;
+        CloseableHttpResponse httpResponse = null;
+        long start_time = System.currentTimeMillis();
+
+        if (requestUrl.indexOf("https://") == 0) {
+            logger.info("根据请求地址【{}】转换访问方式成https", requestUrl);
+            httpClient = createSSLClientDefault();
+        } else {
+            httpClient = createSSLClientDefaultBycrert(null, null);
+        }
+        HttpGet httpRequst = new HttpGet(requestUrl);
+        String result = "";
+        try {
+            // 使用DefaultHttpClient类的execute方法发送HTTP GET请求，并返回HttpResponse对象。
+            httpResponse = httpClient.execute(httpRequst);// 其中HttpGet是HttpUriRequst的子类
+            if (httpResponse.getStatusLine().getStatusCode() == 200) {
+                HttpEntity httpEntity = httpResponse.getEntity();
+                result = EntityUtils.toString(httpEntity);// 取出应答字符串
+                // 一般来说都要删除多余的字符
+                result.replaceAll("\r", "");// 去掉返回结果中的"\r"字符，否则会在结果字符串后面显示一个小方格
+            } else {
+                httpRequst.abort();
+            }
+        } catch (ClientProtocolException e) {
+            e.printStackTrace();
+            result = e.getMessage().toString();
+        } catch (IOException e) {
+            e.printStackTrace();
+            result = e.getMessage().toString();
+        } finally {
+            try {
+                if (httpResponse != null) {
+                    httpResponse.close();
+                }
+                if (httpClient != null) {
+                    httpClient.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            logger.info("读取http请求返回信息，请求地址【{}】,出参【{}】,请求耗时【{}】", requestUrl, result, (System.currentTimeMillis() - start_time));
+        }
+        return result;
+    }
+
+    /**
+     * 创建CloseableHttpClient
+     *
+     * @return CloseableHttpClient
+     */
+    private static CloseableHttpClient createSSLClientDefaultBycrert(String certKey, String certPath) {
+        // 判断是否传入证书和密钥
+        if (certPath != null && certKey != null) {
+            logger.info("创建CloseableHttpClient使用证书，证书路径【{}】，证书密码【{}】", certPath, certKey);
+            try {
+                FileInputStream instream = new FileInputStream(new File(certPath));
+                KeyStore keyStore = KeyStore.getInstance("PKCS12");
+                try {
+                    keyStore.load(instream, certKey.toCharArray());
+                } finally {
+                    if (instream != null) {
+                        instream.close();
+                    }
+                }
+
+                SSLContext sslContext = SSLContexts.custom().loadKeyMaterial(keyStore, certKey.toCharArray()).loadTrustMaterial(null,
+                        new TrustSelfSignedStrategy()).build();
+
+                SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext, new String[]{"TLSv1"}, null,
+                        SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
+                // 设置httpclient的SSLSocketFactory 
+                return HttpClients.custom().setDefaultRequestConfig(getConfig(null)).setSSLSocketFactory(sslsf).build();
+            } catch (Exception e) {
+                logger.info("创建CloseableHttpClient使用证书，证书路径【{}】，证书密码【{}】，发生异常【{}】", certPath, certKey, e.getMessage());
+                e.printStackTrace();
+                return HttpClients.custom().setDefaultRequestConfig(getConfig(null)).build();
+            }
+        } else {
+            logger.info("创建CloseableHttpClient未使用证书");
+            return createSSLClientDefault();
+        }
+    }
+
+    /**
+     * 信任所有https证书请求
+     *
+     * @return
+     */
+    private static CloseableHttpClient createSSLClientDefault() {
+        try {
+            SSLContext sslContext = new SSLContextBuilder().loadTrustMaterial(null, new TrustStrategy() {
+                // 信任所有
+                @Override
+                public boolean isTrusted(X509Certificate[] chain,
+                                         String authType) throws CertificateException {
+                    return true;
+                }
+            }).build();
+            SSLConnectionSocketFactory sslsf = new SSLConnectionSocketFactory(sslContext);
+            return HttpClients.custom().setSSLSocketFactory(sslsf).setDefaultRequestConfig(getConfig(null)).build();
+        } catch (KeyManagementException e) {
+            logger.error("创建https访问异常【{}】", e);
+        } catch (NoSuchAlgorithmException e) {
+            logger.error("创建https访问异常【{}】", e);
+        } catch (KeyStoreException e) {
+            logger.error("创建https访问异常【{}】", e);
+        }
+        return HttpClients.custom().setDefaultRequestConfig(getConfig(null)).build();
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/IndexMap.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/IndexMap.java
new file mode 100644
index 000000000..75fe34cce
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/IndexMap.java
@@ -0,0 +1,61 @@
+package com.ruoyi.content.utils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class IndexMap extends HashMap {
+
+    private static final long serialVersionUID = 1L;
+
+    private List list = new ArrayList();
+
+
+    @Override
+    public Object put(Object key, Object value) {
+        if (!containsKey(key)) {
+            list.add(key);
+        }
+        return super.put(key, value);
+    }
+
+
+    public Object get(int idx) {
+        return super.get(getKey(idx));
+    }
+
+    public int getIndex(Object key) {
+        return list.indexOf(key);
+    }
+
+    public Object getKey(int idx) {
+        if (idx >= list.size()) {
+            return null;
+        }
+        return list.get(idx);
+    }
+
+    public void remove(int idx) {
+        Object key = getKey(idx);
+        removeFromList(getIndex(key));
+        super.remove(key);
+    }
+
+    @Override
+    public Object remove(Object key) {
+        removeFromList(getIndex(key));
+        return super.remove(key);
+    }
+
+    @Override
+    public void clear() {
+        this.list = new ArrayList();
+        super.clear();
+    }
+
+    private void removeFromList(int idx) {
+        if (idx < list.size() && idx >= 0) {
+            list.remove(idx);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/Notify.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/Notify.java
new file mode 100644
index 000000000..bedb68104
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/Notify.java
@@ -0,0 +1,156 @@
+package com.ruoyi.content.utils;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.*;
+import java.util.Map.Entry;
+
+public class Notify {
+    private static final String SIGN = "signature";
+
+    public static String sendMessage(String url, String uid, String key, String reqData)
+            throws Exception {
+        return toNotifySend(url, reqData, uid, key);
+    }
+
+    public static String toNotifySend(String url, String data, String uid, String key) {
+        Map pMap = new HashMap();
+        pMap.put("data", data);
+        String reStr = post2NotifyByTest(url, pMap, uid, key);
+        return reStr;
+    }
+
+    private static String post2NotifyByTest(String url, Map<String, String> map, String uid, String md5Key) {
+        CloseableHttpClient httpclient = null;
+        CloseableHttpResponse response = null;
+        String result = "";
+        try {
+            map.put("uid", uid);
+
+            String timestamp = String.valueOf(System.currentTimeMillis());
+            map.put("timestamp", timestamp);
+
+            String nonce = "";
+            map.put("nonce", nonce);
+
+            String params = getLinkString(map);
+
+            String signature = sign(params, md5Key, "UTF-8");
+            map.put("signature", signature);
+
+            List nvps = new ArrayList();
+            for (Entry entry : map.entrySet()) {
+                nvps.add(new BasicNameValuePair((String) entry.getKey(), (String) entry.getValue()));
+            }
+
+            HttpEntity requestEntity = new UrlEncodedFormEntity(nvps, "UTF-8");
+
+            HttpPost httpPost = new HttpPost(url);
+            httpPost.setEntity(requestEntity);
+
+            int connectTimeout = 200000;
+
+            int socketTimeout = 200000;
+            RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(connectTimeout).setSocketTimeout(socketTimeout).build();
+            httpPost.setConfig(requestConfig);
+
+            httpclient = HttpClients.createDefault();
+            response = httpclient.execute(httpPost);
+            HttpEntity responseEntity = response.getEntity();
+
+            if (200 == response.getStatusLine().getStatusCode()) {
+                result = EntityUtils.toString(responseEntity, "UTF-8").trim();
+            }
+
+            String str1 = result;
+            return str1;
+        } catch (Throwable t) {
+            t.printStackTrace();
+        } finally {
+            if (response != null) {
+                try {
+                    response.close();
+                } catch (IOException localIOException4) {
+                }
+            }
+            if (httpclient != null) {
+                try {
+                    httpclient.close();
+                } catch (IOException localIOException5) {
+                }
+            }
+        }
+        return result;
+    }
+
+    private static String getLinkString(Map<String, String> sArray) {
+        Map sPara = paraFilter(sArray);
+
+        String prestr = createLinkString(sPara);
+        return prestr;
+    }
+
+    private static Map<String, String> paraFilter(Map<String, String> sArray) {
+        Map result = new HashMap();
+
+        if ((sArray == null) || (sArray.size() <= 0)) {
+            return result;
+        }
+        for (String key : sArray.keySet()) {
+            String value = (String) sArray.get(key);
+            if ((value == null) || (value.equals("")) || ("signature".equalsIgnoreCase(key))) {
+                continue;
+            }
+            result.put(key, value);
+        }
+
+        return result;
+    }
+
+    private static String createLinkString(Map<String, String> params) {
+        List keys = new ArrayList(params.keySet());
+        Collections.sort(keys);
+
+        String prestr = "";
+
+        for (int i = 0; i < keys.size(); i++) {
+            String key = (String) keys.get(i);
+            String value = (String) params.get(key);
+
+            if (i == keys.size() - 1) {
+                prestr = prestr + key + "=" + value;
+            } else {
+                prestr = prestr + key + "=" + value + "&";
+            }
+        }
+
+        return prestr;
+    }
+
+    public static String sign(String text, String key, String input_charset) {
+        text = text + key;
+        return DigestUtils.md5Hex(getContentBytes(text, input_charset));
+    }
+
+    private static byte[] getContentBytes(String content, String charset) {
+        if ((charset == null) || ("".equals(charset))) {
+            return content.getBytes();
+        }
+        try {
+            return content.getBytes(charset);
+        } catch (UnsupportedEncodingException e) {
+        }
+        throw new RuntimeException("MD5签名过程中出现错误,指定的编码集不对,您目前指定的编码集是:" + charset);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/OSSUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/OSSUtil.java
index f358283f7..f95a62b85 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/utils/OSSUtil.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/OSSUtil.java
@@ -3,6 +3,7 @@ package com.ruoyi.content.utils;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.model.*;
 import com.ruoyi.content.constants.PropertiesConstants;
+import com.ruoyi.content.message.Message;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -281,9 +282,9 @@ public class OSSUtil {
 //		 "我的照片/460.jpg");
     }
 
-    public static Map<String, Object> uploadFileByInputStreamReturnUrl(String ossEndPoint, String ossId, String ossKey,
-                                                                       String bucketName, InputStream input, String ossPath) {
-        Map<String, Object> map = new HashMap<String, Object>();
+    public static Message uploadFileByInputStreamReturnUrl(String ossEndPoint, String ossId, String ossKey,
+                                                           String bucketName, InputStream input, String ossPath) {
+        Message msg = new Message();
         try {
             ObjectMetadata objectMeta = new ObjectMetadata();
             // objectMeta.setContentLength(file.length());
@@ -293,29 +294,35 @@ public class OSSUtil {
             PutObjectResult result = client.putObject(bucketName, ossPath, input, objectMeta);
             client.shutdown();
             logger.info("上传阿里云OSS结果【{}】", result.getETag());
+            Map<String, Object> map = new HashMap<String, Object>();
             map.put("ossFIleId", result.getETag());
             // 设置URL过期时间为10年 3600l* 1000*24*365*10
 //			Date expiration = new Date(new Date().getTime() + 3600l * 1000 * 24 * 365 * 10);
             // 生成URL
 //			URL url = client.generatePresignedUrl(bucketName, ossPath, expiration);
 //			if (url != null) {
-            map.put("result", true);
+            msg.setResult(true);
             map.put("url", PropertiesConstants.OSS_URL + ossPath);
+            msg.setObject(map);
+            msg.setInfo("成功！");
 //			} else {
 //				msg.setResult(false);
 //				msg.setInfo("上传阿里云获取访问地址失败！");
 //			}
-            return map;
+            return msg;
         } catch (Exception e) {
-            logger.error("上传阿里云OSS出错!!", e);
-            map.put("result", false);
-            return map;
+            e.printStackTrace();
+            logger.info("上传阿里云OSS出错!!");
+            msg.setResult(false);
+            msg.setInfo("上传阿里云OSS出错");
+            return msg;
         } finally {
             if (null != input) {
                 try {
                     input.close();
                 } catch (IOException e) {
-                    logger.error("上传阿里云OSS出错!", e);
+                    e.printStackTrace();
+                    logger.info("上传阿里云OSS出错!");
                 }
             }
         }
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/PasswordHelper.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/PasswordHelper.java
new file mode 100644
index 000000000..a442c08de
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/PasswordHelper.java
@@ -0,0 +1,58 @@
+package com.ruoyi.content.utils;
+
+import com.ruoyi.content.domain.CmsSysUser;
+import org.apache.shiro.crypto.RandomNumberGenerator;
+import org.apache.shiro.crypto.SecureRandomNumberGenerator;
+import org.apache.shiro.crypto.hash.SimpleHash;
+import org.apache.shiro.util.ByteSource;
+import org.springframework.stereotype.Component;
+
+@Component
+public class PasswordHelper {
+    private RandomNumberGenerator randomNumberGenerator = new SecureRandomNumberGenerator();
+    private String algorithmName = "MD5";
+    private int hashIterations = 2;
+
+    public void setRandomNumberGenerator(RandomNumberGenerator randomNumberGenerator) {
+        this.randomNumberGenerator = randomNumberGenerator;
+    }
+
+    public void setAlgorithmName(String algorithmName) {
+        this.algorithmName = algorithmName;
+    }
+
+    public void setHashIterations(int hashIterations) {
+        this.hashIterations = hashIterations;
+    }
+
+    public void encryptPassword(CmsSysUser operator) {
+        operator.setSalt(randomNumberGenerator.nextBytes().toHex());
+        String newPassword = new SimpleHash(algorithmName, operator.getPwd(),
+                ByteSource.Util.bytes(operator.getEmail() + operator.getSalt()), hashIterations).toHex();
+        operator.setPwd(newPassword);
+    }
+
+    public void encryptCkeckPassword(CmsSysUser operator) {
+//		operator.setSalt(randomNumberGenerator.nextBytes().toHex());
+        String newPassword = new SimpleHash(algorithmName, operator.getPwd(),
+                ByteSource.Util.bytes(operator.getEmail() + operator.getSalt()), hashIterations).toHex();
+        operator.setPwd(newPassword);
+    }
+
+    public static void main(String[] args) {
+        // TblWmsOperator operator = new TblWmsOperator();
+        // operator.setPwd("123456");
+        // operator.setEmail("lwadsy@aliyun.com");
+        // operator.setSalt("75f4749e3648284edb4ea94a5618f71e");
+        // new PasswordHelper().encryptPassword(operator);
+
+        String salt = new PasswordHelper().randomNumberGenerator.nextBytes().toHex();
+        System.out.println(salt);
+        String newPassword = new SimpleHash("MD5", "123456", ByteSource.Util.bytes("lwadsy@aliyun.com" + salt), 2)
+                .toHex();
+        System.out.println("11111111111111111111111111111============" + newPassword + "---" + salt);
+
+        // System.out.println(ByteSource.Util.bytes(operator.getEmail() +
+        // operator.getSalt()));
+    }
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/PathUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/PathUtil.java
new file mode 100644
index 000000000..12a7dd8a4
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/PathUtil.java
@@ -0,0 +1,56 @@
+package com.ruoyi.content.utils;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+/**
+ * 获取路径方法
+ * @author Administrator
+ *
+ */
+public class PathUtil {
+	
+	/**
+	 * 获取web项目访问路径
+	 * 使用该方法是必须在web.xml中配置了监听  org.springframework.web.context.request.RequestContextListener  
+	 * @return
+	 */
+	public static String getWebPath(){
+		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+		String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";  
+		return basePath;
+	}
+	
+	/**
+	 * 获取web项目classes路径
+	 * @return
+	 */
+	public static String getClassesPath(){
+		return Thread.currentThread().getContextClassLoader().getResource("").getPath();
+	}
+	
+	/**
+	 * 获取已发布文章的浏览静态页
+	*
+	*	liu.hx
+	*	2018年4月24日
+	* @throws
+	 */
+	public static String getArticleViewUrl(String timestamp,String articleId) {
+		return "template/html/view/"+timestamp.substring(0, 8)+"/"+articleId+"b"+timestamp+".html";
+	}
+	
+	/**
+	 * 获取文章编辑静态页
+	*
+	*	liu.hx
+	*	2018年4月24日
+	* @throws
+	 */
+	public static String getArticleEditUrl(String timestamp,String name) {
+		return "template/html/mkt-ms/edit/"+timestamp.substring(0, 8)+"/"+name+".html";
+	}
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/RandomUtils.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/RandomUtils.java
new file mode 100644
index 000000000..60f6b7537
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/RandomUtils.java
@@ -0,0 +1,90 @@
+package com.ruoyi.content.utils;
+
+import java.util.Random;
+
+public class RandomUtils {
+
+	/**
+	 * 生成固定长度的随机字符(仅包含字母)
+	 * 
+	 * @param len   需要的长度
+	 * @return
+	 */
+	public static String generateRandomChar(Integer len) {
+		// 生成字母A-Z,a-z 之间的随机字符
+
+		StringBuffer sb = new StringBuffer();
+		for (Integer i = 0; i < len; i++) {
+			int intRand = (int) (Math.random() * 52);
+			char base = (intRand < 26) ? 'A' : 'a';
+			char c = (char) (base + intRand % 26);
+			sb.append(c);
+		}
+		return sb.toString();
+	}
+
+	/**
+	 * 生成固定长度的随机字符和数字
+	 * 
+	 * @param len
+	 * @return
+	 */
+	public static String generateRandomCharAndNumber(Integer len) {
+		StringBuffer sb = new StringBuffer();
+		for (Integer i = 0; i < len; i++) {
+			int intRand = (int) (Math.random() * 52);
+			int numValue = (int) (Math.random() * 10);
+			char base = (intRand < 26) ? 'A' : 'a';
+			char c = (char) (base + intRand % 26);
+			if (numValue % 2 == 0) {
+				sb.append(c);
+			} else {
+				sb.append(numValue);
+			}
+		}
+		return sb.toString();
+	}
+
+	public static String getCharAndNumr(Integer length) {
+		StringBuffer sb = new StringBuffer();
+		Random random = new Random();
+		for (int i = 0; i < length; i++) {
+			String charOrNum = random.nextInt(2) % 2 == 0 ? "char" : "num"; // 输出字母还是数字
+			if ("char".equalsIgnoreCase(charOrNum)) {// 字符串
+				int choice = random.nextInt(2) % 2 == 0 ? 65 : 97; // 取得大写字母还是小写字母
+				sb.append((char) (choice + random.nextInt(26)));
+			} else if ("num".equalsIgnoreCase(charOrNum)) {// 数字
+				sb.append(String.valueOf(random.nextInt(10)));
+			}
+		}
+		return sb.toString();
+	}
+
+	public static String random8(){
+		StringBuilder str = new StringBuilder();//定义变长字符串
+		Random random = new Random();
+		//随机生成数字，并添加到字符串
+		for(int i=0;i<8;i++){
+			str.append(random.nextInt(10));
+		}
+		return str.toString();
+	}
+
+	/**
+	 * 生成数字随机数
+	 * 
+	 * @param leng
+	 *            随机数长度
+	 * @return
+	 */
+	public static String randomNumber(int leng) {
+		StringBuilder str = new StringBuilder();// 定义变长字符串
+		Random random = new Random();
+		// 随机生成数字，并添加到字符串
+		for (int i = 0; i < leng; i++) {
+			str.append(random.nextInt(leng));
+		}
+		return str.toString();
+	}
+
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/SystemConfig.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/SystemConfig.java
new file mode 100644
index 000000000..60f26f087
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/SystemConfig.java
@@ -0,0 +1,59 @@
+package com.ruoyi.content.utils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
+/**
+ * 加载配置文件并放入servletContext中
+ * @author Leeyao
+ *
+ */
+public class SystemConfig extends HttpServlet {
+	
+	private static final long serialVersionUID = 1L;
+	private static Map<String, String> systemConfig = new HashMap<String, String>();
+
+	@Override
+	public void init() throws ServletException {
+		ServletContext sc = getServletContext();
+		Properties prop = new Properties();
+		try {
+			//查找配置文件存放l路径
+			String settingFilePath= ToolUtil.getProperties("/resources/config/sysConfig.properties", "path");
+			Map<String, String> systemConfigAll = new HashMap<String, String>();
+			//加载配置文件
+			File f = new File(settingFilePath);
+			InputStream is = new FileInputStream(f);
+			prop.load(is);
+			//获取key值
+			Enumeration enu = prop.keys();
+			//取出所有值放入map中
+			while (enu.hasMoreElements()) {
+				String key = (String)enu.nextElement();
+				//String value = (String)prop.getProperty(key);
+				String value = new String(prop.getProperty(key).getBytes("ISO8859-1"),"UTF-8");
+				systemConfig.put(key, value);
+			}
+			//将配置放入
+			sc.setAttribute("systemConfig", systemConfig);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+	
+	
+	public static Map<String, String> getConfig() {
+		return systemConfig;
+	}
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/ToolUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/ToolUtil.java
new file mode 100644
index 000000000..b693ac382
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/ToolUtil.java
@@ -0,0 +1,287 @@
+package com.ruoyi.content.utils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Properties;
+
+public class ToolUtil {
+    /**
+     * get filePath,ecs_setting key value
+     *
+     * @param file_path
+     * @param key
+     * @return value
+     */
+    final public static String getFilePathProperties(String file_path, String key) {
+        Properties prop = new Properties();
+        try {
+            // 查找配置文件存放l路径
+            String settingFilePath = ToolUtil.getProperties(file_path, "path");
+            // 加载配置文件
+            File f = new File(settingFilePath);
+            InputStream is = new FileInputStream(f);
+            prop.load(is);
+            // 获取key值
+            Enumeration enu = prop.keys();
+            // 取出所有值放入map中
+            while (enu.hasMoreElements()) {
+                String tempkey = (String) enu.nextElement();
+                if (tempkey.equals(key)) {
+                    String value = new String(prop.getProperty(key).getBytes("ISO-8859-1"), "UTF-8");
+
+                    return value;
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+
+    /**
+     * 获取资源文件值
+     *
+     * @param file_path
+     * @param key
+     * @return
+     */
+    final public static String getProperties(String file_path, String key) {
+        Properties prop = new Properties();
+        try {
+            prop.load(ToolUtil.class.getResourceAsStream(file_path));
+            return prop.getProperty(key);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return "";
+        }
+    }
+
+//    /**
+//     * 获取当前项目语言
+//     *
+//     * @return en/zh(不包含地区)
+//     */
+//    public static String getCurLanguage(HttpServletRequest request) {
+//        Locale local = request.getLocale();
+//        String language = local.getLanguage();
+//        Locale locale = (Locale) request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
+//        if (locale != null) {
+//            language = locale.getLanguage().toString();
+//        }
+//        return language;
+//    }
+
+//    /**
+//     * 获取当前项目语言
+//     *
+//     * @param value
+//     * @return zh_CN(包含地区)
+//     */
+//    public static String getCurLocale(HttpServletRequest request) {
+//        Locale local = request.getLocale();
+//        Locale locale = (Locale) request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
+//        if (locale != null) {
+//            local = locale;
+//        }
+//
+//        return local.toString();
+//    }
+
+    public static boolean isNotNull(String value) {
+        return value != null && !"".equals(value) && !"null".equals(value.toLowerCase());
+    }
+
+//    /**
+//     * 获取当前项目支持的语言
+//     *
+//     * @param request
+//     * @return
+//     */
+//    public static String getSupportLocale(HttpServletRequest request) {
+//        Locale local = request.getLocale();
+//        Locale locale = (Locale) request.getSession().getAttribute(SessionLocaleResolver.LOCALE_SESSION_ATTRIBUTE_NAME);
+//        if (locale != null) {
+//            local = locale;
+//        }
+//
+//        return local.toString();
+//    }
+
+    final public static String NullToBlank(String str) {
+        if (null == str) {
+            return "";
+        }
+        return str;
+    }
+
+    /**
+     * 获取Excel下标值
+     *
+     * @param columnTitle
+     * @return
+     */
+    final public static int getColumnIndex(String columnTitle) {
+        if (columnTitle == null || columnTitle.length() < 1) {
+            return 0;
+        }
+        columnTitle = columnTitle.toUpperCase();
+        char[] chars = null;
+        try {
+            chars = columnTitle.toCharArray();
+            if (chars == null || chars.length < 1) {
+                return 0;
+            }
+            if (chars.length == 1) {
+                return convertCharToIndex(chars[0]);
+            }
+            if (chars.length == 2) {
+                int one = convertCharToIndex(chars[0]);
+                one = one * 26;
+                int two = convertCharToIndex(chars[1]);
+                return one + two;
+            } else {
+                System.out.println(columnTitle + " 过长，转换列下标失败！");
+                return 0;
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return 0;
+        }
+    }
+
+    /**
+     * 获取Excel下标值
+     *
+     * @param c
+     * @return
+     */
+    final public static int convertCharToIndex(char c) {
+        int index = 0;
+        switch (c) {
+            case 'A':
+                index = 1;
+                break;
+            case 'B':
+                index = 2;
+                break;
+            case 'C':
+                index = 3;
+                break;
+            case 'D':
+                index = 4;
+                break;
+            case 'E':
+                index = 5;
+                break;
+            case 'F':
+                index = 6;
+                break;
+            case 'G':
+                index = 7;
+                break;
+            case 'H':
+                index = 8;
+                break;
+            case 'I':
+                index = 9;
+                break;
+            case 'J':
+                index = 10;
+                break;
+            case 'K':
+                index = 11;
+                break;
+            case 'L':
+                index = 12;
+                break;
+            case 'M':
+                index = 13;
+                break;
+            case 'N':
+                index = 14;
+                break;
+            case 'O':
+                index = 15;
+                break;
+            case 'P':
+                index = 16;
+                break;
+            case 'Q':
+                index = 17;
+                break;
+            case 'R':
+                index = 18;
+                break;
+            case 'S':
+                index = 19;
+                break;
+            case 'T':
+                index = 20;
+                break;
+            case 'U':
+                index = 21;
+                break;
+            case 'V':
+                index = 22;
+                break;
+            case 'W':
+                index = 23;
+                break;
+            case 'X':
+                index = 24;
+                break;
+            case 'Y':
+                index = 25;
+                break;
+            case 'Z':
+                index = 26;
+                break;
+            default:
+                index = 0;
+                break;
+        }
+        return index;
+    }
+
+    /**
+     * 数组转list
+     *
+     * @param array
+     * @return
+     */
+    public static List transformArrayToList(Object[] array) {
+        List<Object> list = new ArrayList<Object>();
+        if (array == null || array.length <= 0) {
+            return null;
+        }
+        for (int i = 0; i < array.length; i++) {
+            list.add(array[i]);
+        }
+        return list;
+    }
+
+    /**
+     * 补全空格占位 使用例子：TXT每行必须为500字符，不足500就空格占位
+     *
+     * @param str     字符串
+     * @param lineNum 需要补充到几位
+     * @return
+     */
+    public static String spaceToString(String str, int lineNum) {
+        StringBuilder strb = new StringBuilder();
+        strb.append(str);
+        int num = str.length();
+        if (lineNum > num) {
+            for (int i = 0; i < (lineNum - num); i++) {
+                strb.append(" ");
+            }
+        }
+        return strb.toString();
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/TransNoManage.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/TransNoManage.java
new file mode 100644
index 000000000..861f9d304
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/TransNoManage.java
@@ -0,0 +1,104 @@
+package com.ruoyi.content.utils;
+
+import com.ruoyi.content.redis.RedisManager;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+public class TransNoManage {
+    @Autowired
+    private RedisManager redisManager;
+    //@Autowired
+    //private BaseConstantService baseConstantService;
+    private final static Logger logger = LoggerFactory.getLogger(TransNoManage.class);
+
+//	public String queryTransNo(String source) {
+//		if (StringUtils.isBlank(source)) {
+//			source = "WKTTEM";// 如果没有数据，则临时使用
+//		}
+//		String transNo = queryPrefixBysource(source) + queryNumBySource(source);
+//		logger.info("根据【{}】生成流水号【{}】", source, transNo);
+//		return transNo;
+//	}
+
+//	/**
+//	 * 获取数据库配置信息生成前缀如果系统异常则生成时间戳
+//	 * 
+//	 * @param source
+//	 * @return
+//	 */
+//	public String queryPrefixBysource(String source) {
+//		String transNo = "";
+//		try {
+//			transNo = baseConstantService.queryConstant(source);
+//			if (StringUtils.isBlank(transNo)) {
+//				logger.info("数据库未配置【{}】相关信息，使用日期+随机数生成12位流水号", source);
+//				// 查询不到配置信息已时间为前缀
+//				transNo = DateUtil.convertDate(new Date(), DateUtil.yyyyMMddHHmmssSSS);
+//			}
+//		} catch (Exception e) {
+//			logger.info("数据库查询【{}】配置信息异常，生成时间戳:【{}】", source, e.getMessage());
+//			transNo = DateUtil.convertDate(new Date(), DateUtil.yyyyMMddHHmmssSSS);
+//		}
+//		return transNo;
+//	}
+
+    /**
+     * 根据key去redis取值 如果redis异常则生成随机6位数字
+     *
+     * @param source
+     * @return
+     */
+    public String queryNumBySource(String source) {
+        String num = "1";
+        // 获取当前日期
+        String nowDate = DateUtil.convertDate(new Date(), DateUtil.YYYYMMDD);
+        try {
+            String val = redisManager.query(source + "_TRANSNO");
+            logger.info("根据code【{}】,获取redis数据【{}】", source, val);
+            if (StringUtils.isNotBlank(val)) {// redis存在数据则进行规则计算
+                if (val.indexOf("d") > -1) {// 判断是否存在分隔符
+                    String orderNum = val.split("d")[0];
+                    String orderDate = val.split("d")[1];
+                    if (orderDate.equals(nowDate)) {// 同一天则继续序号
+                        logger.info("数据为同一天orderDate【{}】,nowDate【{}】", orderNum, nowDate);
+                        int rel = Integer.parseInt(orderNum) + 1;
+                        num = rel + "";
+                    } else {// 新的一天重新计算
+                        logger.info("这是新的一天，重新计算【{}】", num);
+                    }
+                    // 将数据保存到redis
+                    boolean saveRel = redisManager.save(source + "_TRANSNO", num + "d" + nowDate);
+                    if (!saveRel) {
+                        logger.info("保存redis【{}】，【{}】失败，直接获取6位随机数", (source + "_TRANSNO"), num);
+                        num = RandomUtils.randomNumber(6) + "E";
+                    }
+                } else {// 不存在分隔符直接转生成随机数
+                    logger.info("取出来的数据不存在分隔符【{}】", val);
+                    num = RandomUtils.randomNumber(6) + "E";
+                }
+            } else {// 不存在值时，则重新开始计算
+                logger.info("redis不存在数据，重新计算【{}】", num);
+                // 将数据保存到redis
+                boolean saveRel = redisManager.save(source + "_TRANSNO", num + "d" + nowDate);
+                if (!saveRel) {
+                    logger.info("保存redis【{}】，【{}】失败，直接获取6位随机数", (source + "_TRANSNO"), num);
+                    num = RandomUtils.randomNumber(6) + "E";
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.info("redis服务器【{}】异常，生成随机6位数【{}】", source, e.getMessage());
+            // 当redies出错时，生成随机6位数字
+            num = RandomUtils.randomNumber(6) + "E";
+        }
+        logger.info("获取流水号，最终得到数据【{}】", num);
+        return nowDate + num;
+    }
+
+}
diff --git a/ruoyi-content/src/main/resources/mapper/content/AdvertisementInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/AdvertisementInfoMapper.xml
new file mode 100644
index 000000000..f84e4b25a
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/AdvertisementInfoMapper.xml
@@ -0,0 +1,430 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.AdvertisementInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.AdvertisementInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <id column="AD_ID" property="adId" jdbcType="INTEGER" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="AD_TITLE" property="adTitle" jdbcType="VARCHAR" />
+    <result column="AD_TYPE" property="adType" jdbcType="VARCHAR" />
+    <result column="AD_IMAGE_url" property="adImageUrl" jdbcType="VARCHAR" />
+    <result column="AD_LINK_url" property="adLinkUrl" jdbcType="VARCHAR" />
+    <result column="AD_CONTENT" property="adContent" jdbcType="VARCHAR" />
+    <result column="AD_STATE" property="adState" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    AD_ID, COMPANY_ID, AD_TITLE, AD_TYPE, AD_IMAGE_url, AD_LINK_url, AD_CONTENT, AD_STATE, 
+    CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.AdvertisementInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from advertisement_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from advertisement_info
+    where AD_ID = #{adId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    delete from advertisement_info
+    where AD_ID = #{adId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.AdvertisementInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    delete from advertisement_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.AdvertisementInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="adId" order="AFTER" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into advertisement_info (AD_ID, COMPANY_ID, AD_TITLE, 
+      AD_TYPE, AD_IMAGE_url, AD_LINK_url, 
+      AD_CONTENT, AD_STATE, CREATE_DATE, 
+      CREATE_TIME, CREATE_USER, UPDATE_USER, 
+      UPDATE_DATE, UPDATE_TIME)
+    values (#{adId,jdbcType=INTEGER}, #{companyId,jdbcType=VARCHAR}, #{adTitle,jdbcType=VARCHAR}, 
+      #{adType,jdbcType=VARCHAR}, #{adImageUrl,jdbcType=VARCHAR}, #{adLinkUrl,jdbcType=VARCHAR}, 
+      #{adContent,jdbcType=VARCHAR}, #{adState,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.AdvertisementInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="adId" order="AFTER" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into advertisement_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      AD_ID,
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="adTitle != null" >
+        AD_TITLE,
+      </if>
+      <if test="adType != null" >
+        AD_TYPE,
+      </if>
+      <if test="adImageUrl != null" >
+        AD_IMAGE_url,
+      </if>
+      <if test="adLinkUrl != null" >
+        AD_LINK_url,
+      </if>
+      <if test="adContent != null" >
+        AD_CONTENT,
+      </if>
+      <if test="adState != null" >
+        AD_STATE,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{adId,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="adTitle != null" >
+        #{adTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="adType != null" >
+        #{adType,jdbcType=VARCHAR},
+      </if>
+      <if test="adImageUrl != null" >
+        #{adImageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="adLinkUrl != null" >
+        #{adLinkUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="adContent != null" >
+        #{adContent,jdbcType=VARCHAR},
+      </if>
+      <if test="adState != null" >
+        #{adState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.AdvertisementInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select count(*) from advertisement_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update advertisement_info
+    <set >
+      <if test="record.adId != null" >
+        AD_ID = #{record.adId,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adTitle != null" >
+        AD_TITLE = #{record.adTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adType != null" >
+        AD_TYPE = #{record.adType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adImageUrl != null" >
+        AD_IMAGE_url = #{record.adImageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adLinkUrl != null" >
+        AD_LINK_url = #{record.adLinkUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adContent != null" >
+        AD_CONTENT = #{record.adContent,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adState != null" >
+        AD_STATE = #{record.adState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update advertisement_info
+    set AD_ID = #{record.adId,jdbcType=INTEGER},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      AD_TITLE = #{record.adTitle,jdbcType=VARCHAR},
+      AD_TYPE = #{record.adType,jdbcType=VARCHAR},
+      AD_IMAGE_url = #{record.adImageUrl,jdbcType=VARCHAR},
+      AD_LINK_url = #{record.adLinkUrl,jdbcType=VARCHAR},
+      AD_CONTENT = #{record.adContent,jdbcType=VARCHAR},
+      AD_STATE = #{record.adState,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.AdvertisementInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update advertisement_info
+    <set >
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="adTitle != null" >
+        AD_TITLE = #{adTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="adType != null" >
+        AD_TYPE = #{adType,jdbcType=VARCHAR},
+      </if>
+      <if test="adImageUrl != null" >
+        AD_IMAGE_url = #{adImageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="adLinkUrl != null" >
+        AD_LINK_url = #{adLinkUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="adContent != null" >
+        AD_CONTENT = #{adContent,jdbcType=VARCHAR},
+      </if>
+      <if test="adState != null" >
+        AD_STATE = #{adState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where AD_ID = #{adId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.AdvertisementInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update advertisement_info
+    set COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      AD_TITLE = #{adTitle,jdbcType=VARCHAR},
+      AD_TYPE = #{adType,jdbcType=VARCHAR},
+      AD_IMAGE_url = #{adImageUrl,jdbcType=VARCHAR},
+      AD_LINK_url = #{adLinkUrl,jdbcType=VARCHAR},
+      AD_CONTENT = #{adContent,jdbcType=VARCHAR},
+      AD_STATE = #{adState,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
+    where AD_ID = #{adId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticeClickInfoExMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticeClickInfoExMapper.xml
new file mode 100644
index 000000000..67db9da4c
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticeClickInfoExMapper.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper
+	namespace="com.ruoyi.content.mapper.ArticeClickInfoExMapper">
+ <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ClickTrackInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    <id column="CLICK_ID" property="clickId" jdbcType="VARCHAR" />
+    <result column="PARENT_CLICK_ID" property="parentClickId" jdbcType="VARCHAR" />
+    <result column="CLICK_OPEN_ID" property="clickOpenId" jdbcType="VARCHAR" />
+    <result column="CLICK_USER_NICKNAME" property="clickUserNickname" jdbcType="VARCHAR" />
+    <result column="CLICK_USER_HEADIMGURL" property="clickUserHeadimgurl" jdbcType="VARCHAR" />
+    <result column="PUBLISH_USER_ID" property="publishUserId" jdbcType="VARCHAR" />
+    <result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
+    <result column="CLICK_USER_ID" property="clickUserId" jdbcType="VARCHAR" />
+    <result column="AD_ID" property="adId" jdbcType="VARCHAR" />
+    <result column="FROM_SHARE_STATE" property="fromShareState" jdbcType="VARCHAR" />
+    <result column="SHARE_STATE" property="shareState" jdbcType="VARCHAR" />
+    <result column="WATCH_TIME" property="watchTime" jdbcType="VARCHAR" />
+    <result column="CLICK_USER_INFO" property="clickUserInfo" jdbcType="LONGVARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  
+	<resultMap id="Map"
+		type="com.ruoyi.content.domain.ArticeClickInfoExDTO">
+		<result column="CLICK_USER_NICKNAME" property="clickUserNickname"
+			jdbcType="VARCHAR" />
+		<result column="CLICK_USER_HEADIMGURL" property="clickUserHeadimgurl"
+			jdbcType="VARCHAR" />
+		<result column="WATCH_TIME" property="watchTime" jdbcType="VARCHAR" />
+		<result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+		<result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+		<result column="SHARE_STATE" property="shareState" jdbcType="VARCHAR" />
+		<result column="FROM_SHARE_STATE" property="fromShareState"
+			jdbcType="VARCHAR" />
+		<result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
+		<result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR" />
+		<result column="PUSH_DATE" property="pushDate" jdbcType="VARCHAR" />
+		<result column="ARTICLE_AUTHOR" property="articleAutchor"
+			jdbcType="VARCHAR" />
+		<result column="CLICK_USER_INFO" property="clickUserInfo"
+			jdbcType="VARCHAR" />
+		<result column="CLICK_ID" property="clickId"
+			jdbcType="VARCHAR" />
+	</resultMap>
+
+	<resultMap id="ArticleInfoResultMap"
+		type="com.ruoyi.content.domain.ArticleinfoExDTO">
+		<!-- WARNING - @mbggenerated This element is automatically generated by 
+			MyBatis Generator, do not modify. This element was generated on Thu Mar 29 
+			09:44:12 CST 2018. -->
+		<id column="ARTICLE_ID" property="articleId" jdbcType="INTEGER" />
+		<result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR" />
+		<result column="PUSH_DATE" property="pushDate" jdbcType="VARCHAR" />
+		<result column="ARTICLE_AUTHOR" property="articleAuthor"
+			jdbcType="VARCHAR" />
+		<result column="LIST_PIC_URL" property="listPicUrl" jdbcType="VARCHAR" />
+		<result column="SPECIAL" property="special" jdbcType="VARCHAR" />
+		<result column="CHANNEL_ID" property="channelId" jdbcType="VARCHAR" />
+		<result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+		<result column="ORIGINAL_URL" property="originalUrl" jdbcType="VARCHAR" />
+		<result column="SHARE_IMG_URL" property="shareImgUrl" jdbcType="VARCHAR" />
+		<result column="SHARE_TITLE" property="shareTitle" jdbcType="VARCHAR" />
+		<result column="ARTICLE_STATE" property="articleState"
+			jdbcType="VARCHAR" />
+		<result column="SHARE_DES" property="shareDes" jdbcType="VARCHAR" />
+		<result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+		<result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+		<result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+		<result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+		<result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+		<result column="ARTICLE_CONTENT" property="articleContent"
+			jdbcType="VARCHAR" />
+
+		<result column="SHARECOUNT" property="shareCount" jdbcType="INTEGER" />
+		<result column="WATCHCOUNT" property="visitors" jdbcType="INTEGER" />
+		<result column="PUBLISH_VIEW_URL" property="publishViewUrl" jdbcType="INTEGER" />
+		<result column="PUBLISH_EDIT_URL" property="publishEditUrl" jdbcType="INTEGER" />
+
+	</resultMap>
+	<select id="queryClerkArticleInfo" resultMap="Map">
+		SELECT
+		t2.CLICK_ID,
+		t2.CLICK_USER_NICKNAME,
+		t2.CLICK_USER_HEADIMGURL,
+		t2.WATCH_TIME,
+		t2.CREATE_DATE,
+		t2.CREATE_TIME,
+		t2.SHARE_STATE,
+		t2.FROM_SHARE_STATE,
+		t1.ARTICLE_ID,
+		t1.ARTICLE_NAME,
+		t1.PUSH_DATE,
+		t1.ARTICLE_AUTHOR     
+	FROM
+		article_info t1,
+		click_track_info t2
+	WHERE
+		t1.ARTICLE_ID = #{articleId} and t1.COMPANY_ID = #{companyId}
+		AND t1.ARTICLE_ID = t2.ARTICLE_ID
+
+		
+		limit #{startRow},#{rows}
+	</select>
+
+	<select id="clerkArticleCount" resultType="java.lang.Integer">
+		select count(1) from article_info t1,click_track_info t2
+		where t1.COMPANY_ID = #{companyId}
+		and t1.ARTICLE_ID = #{articleId}
+		and t1.ARTICLE_ID = t2.ARTICLE_ID
+	</select>
+
+
+	<select id="queryArticleInfoList" resultMap="ArticleInfoResultMap">
+		select t.PUBLISH_VIEW_URL,t.PUBLISH_EDIT_URL,
+		t1.ARTICLE_ID,t1.ARTICLE_NAME,t1.PUSH_DATE,t1.ARTICLE_AUTHOR,t1.LIST_PIC_URL,t1.SPECIAL,
+		t1.CHANNEL_ID,t1.COMPANY_ID,t1.ORIGINAL_URL,t1.SHARE_IMG_URL,t1.SHARE_TITLE,t1.ARTICLE_STATE,
+		t1.SHARE_DES,t1.CREATE_DATE,t1.CREATE_TIME,t1.CREATE_USER,t1.UPDATE_DATE,t1.UPDATE_TIME,(select
+		count(1) from click_track_info where ARTICLE_ID = t1.ARTICLE_ID )
+		WATCHCOUNT ,
+		(select count(1) from click_track_info where ARTICLE_ID = t1.ARTICLE_ID and
+		SHARE_STATE in ('1','2','5') ) SHARECOUNT from article_publish_track
+		t,article_info t1
+		where t.user_id in (select user_id from user_info where COMPANY_ID =
+		#{companyId})
+		and t.ARTICLE_ID = t1.ARTICLE_ID
+		<if test="articelAuthor != null and articelAuthor != ''">
+			and t1.ARTICLE_AUTHOR = #{articelAuthor}
+		</if>
+		<if test="articelName != null and articelName != ''">
+			and t1.ARTICLE_NAME = #{articelName}
+		</if>
+		<if test="channelId != null and channelId != ''">
+			and t1.CHANNEL_ID = #{channelId}
+		</if>
+		<if test="special != null and special != ''">
+			and t1.SPECIAL = #{special}
+		</if>
+		and (COMPANY_ID is null or COMPANY_ID = '')
+		order by t.create_date desc,t.create_time desc limit #{startRow},#{rows}
+	</select>
+
+	<select id="articleInfoCount" resultType="java.lang.Integer">
+		select count(1) from article_publish_track t,article_info t1
+		where t.user_id in (select user_id from user_info where COMPANY_ID =
+		#{companyId})
+		and t.ARTICLE_ID = t1.ARTICLE_ID
+		<if test="articelAuthor != null and articelAuthor != ''">
+			and t1.ARTICLE_AUTHOR = #{articelAuthor}
+		</if>
+		<if test="articelName != null and articelName != ''">
+			and t1.ARTICLE_NAME = #{articelName}
+		</if>
+		<if test="channelId != null and channelId != ''">
+			and t1.CHANNEL_ID = #{channelId}
+		</if>
+		<if test="special != null and special != ''">
+			and t1.SPECIAL = #{special}
+		</if>
+		and (COMPANY_ID is null or COMPANY_ID = '')
+	</select>
+
+	<select id="selClerkArticleContent" resultMap="ArticleInfoResultMap">
+		select t.PUBLISH_VIEW_URL,t.PUBLISH_EDIT_URL,t1.* from article_publish_track t,article_info t1
+		where t.user_id in (select user_id from user_info where
+		COMPANY_ID=#{companyId})
+		and t.ARTICLE_ID = #{articleId}
+		and t.ARTICLE_ID = t1.ARTICLE_ID
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleAdInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleAdInfoMapper.xml
new file mode 100644
index 000000000..22206b0c2
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleAdInfoMapper.xml
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ArticleAdInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticleAdInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    <id column="AD_ID" property="adId" jdbcType="INTEGER" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="AD_TYPE" property="adType" jdbcType="VARCHAR" />
+    <result column="AD_TYPE_NAME" property="adTypeName" jdbcType="VARCHAR" />
+    <result column="AD_LINK_URL" property="adLinkUrl" jdbcType="VARCHAR" />
+    <result column="AD_TITLE" property="adTitle" jdbcType="VARCHAR" />
+    <result column="AD_NAME" property="adName" jdbcType="VARCHAR" />
+    <result column="AD_SUMMARY" property="adSummary" jdbcType="VARCHAR" />
+    <result column="AD_COLOR_TYPE" property="adColorType" jdbcType="VARCHAR" />
+    <result column="AD_IMAGE_URL" property="adImageUrl" jdbcType="VARCHAR" />
+    <result column="AD_STATE" property="adState" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    AD_ID, COMPANY_ID, AD_TYPE, AD_TYPE_NAME, AD_LINK_URL, AD_TITLE, AD_NAME, AD_SUMMARY, 
+    AD_COLOR_TYPE, AD_IMAGE_URL, AD_STATE, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, 
+    UPDATE_DATE, UPDATE_TIME
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ArticleAdInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from article_ad_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from article_ad_info
+    where AD_ID = #{adId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    delete from article_ad_info
+    where AD_ID = #{adId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ArticleAdInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    delete from article_ad_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ArticleAdInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="adId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into article_ad_info (AD_ID, COMPANY_ID, AD_TYPE, 
+      AD_TYPE_NAME, AD_LINK_URL, AD_TITLE, 
+      AD_NAME, AD_SUMMARY, AD_COLOR_TYPE, 
+      AD_IMAGE_URL, AD_STATE, CREATE_DATE, 
+      CREATE_TIME, CREATE_USER, UPDATE_USER, 
+      UPDATE_DATE, UPDATE_TIME)
+    values (#{adId,jdbcType=INTEGER}, #{companyId,jdbcType=VARCHAR}, #{adType,jdbcType=VARCHAR}, 
+      #{adTypeName,jdbcType=VARCHAR}, #{adLinkUrl,jdbcType=VARCHAR}, #{adTitle,jdbcType=VARCHAR}, 
+      #{adName,jdbcType=VARCHAR}, #{adSummary,jdbcType=VARCHAR}, #{adColorType,jdbcType=VARCHAR}, 
+      #{adImageUrl,jdbcType=VARCHAR}, #{adState,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ArticleAdInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="adId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into article_ad_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      AD_ID,
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="adType != null" >
+        AD_TYPE,
+      </if>
+      <if test="adTypeName != null" >
+        AD_TYPE_NAME,
+      </if>
+      <if test="adLinkUrl != null" >
+        AD_LINK_URL,
+      </if>
+      <if test="adTitle != null" >
+        AD_TITLE,
+      </if>
+      <if test="adName != null" >
+        AD_NAME,
+      </if>
+      <if test="adSummary != null" >
+        AD_SUMMARY,
+      </if>
+      <if test="adColorType != null" >
+        AD_COLOR_TYPE,
+      </if>
+      <if test="adImageUrl != null" >
+        AD_IMAGE_URL,
+      </if>
+      <if test="adState != null" >
+        AD_STATE,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{adId,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="adType != null" >
+        #{adType,jdbcType=VARCHAR},
+      </if>
+      <if test="adTypeName != null" >
+        #{adTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="adLinkUrl != null" >
+        #{adLinkUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="adTitle != null" >
+        #{adTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="adName != null" >
+        #{adName,jdbcType=VARCHAR},
+      </if>
+      <if test="adSummary != null" >
+        #{adSummary,jdbcType=VARCHAR},
+      </if>
+      <if test="adColorType != null" >
+        #{adColorType,jdbcType=VARCHAR},
+      </if>
+      <if test="adImageUrl != null" >
+        #{adImageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="adState != null" >
+        #{adState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ArticleAdInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    select count(*) from article_ad_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    update article_ad_info
+    <set >
+      <if test="record.adId != null" >
+        AD_ID = #{record.adId,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adType != null" >
+        AD_TYPE = #{record.adType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adTypeName != null" >
+        AD_TYPE_NAME = #{record.adTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adLinkUrl != null" >
+        AD_LINK_URL = #{record.adLinkUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adTitle != null" >
+        AD_TITLE = #{record.adTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adName != null" >
+        AD_NAME = #{record.adName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adSummary != null" >
+        AD_SUMMARY = #{record.adSummary,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adColorType != null" >
+        AD_COLOR_TYPE = #{record.adColorType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adImageUrl != null" >
+        AD_IMAGE_URL = #{record.adImageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adState != null" >
+        AD_STATE = #{record.adState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    update article_ad_info
+    set AD_ID = #{record.adId,jdbcType=INTEGER},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      AD_TYPE = #{record.adType,jdbcType=VARCHAR},
+      AD_TYPE_NAME = #{record.adTypeName,jdbcType=VARCHAR},
+      AD_LINK_URL = #{record.adLinkUrl,jdbcType=VARCHAR},
+      AD_TITLE = #{record.adTitle,jdbcType=VARCHAR},
+      AD_NAME = #{record.adName,jdbcType=VARCHAR},
+      AD_SUMMARY = #{record.adSummary,jdbcType=VARCHAR},
+      AD_COLOR_TYPE = #{record.adColorType,jdbcType=VARCHAR},
+      AD_IMAGE_URL = #{record.adImageUrl,jdbcType=VARCHAR},
+      AD_STATE = #{record.adState,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ArticleAdInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    update article_ad_info
+    <set >
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="adType != null" >
+        AD_TYPE = #{adType,jdbcType=VARCHAR},
+      </if>
+      <if test="adTypeName != null" >
+        AD_TYPE_NAME = #{adTypeName,jdbcType=VARCHAR},
+      </if>
+      <if test="adLinkUrl != null" >
+        AD_LINK_URL = #{adLinkUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="adTitle != null" >
+        AD_TITLE = #{adTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="adName != null" >
+        AD_NAME = #{adName,jdbcType=VARCHAR},
+      </if>
+      <if test="adSummary != null" >
+        AD_SUMMARY = #{adSummary,jdbcType=VARCHAR},
+      </if>
+      <if test="adColorType != null" >
+        AD_COLOR_TYPE = #{adColorType,jdbcType=VARCHAR},
+      </if>
+      <if test="adImageUrl != null" >
+        AD_IMAGE_URL = #{adImageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="adState != null" >
+        AD_STATE = #{adState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where AD_ID = #{adId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticleAdInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 02 14:00:18 CST 2018.
+    -->
+    update article_ad_info
+    set COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      AD_TYPE = #{adType,jdbcType=VARCHAR},
+      AD_TYPE_NAME = #{adTypeName,jdbcType=VARCHAR},
+      AD_LINK_URL = #{adLinkUrl,jdbcType=VARCHAR},
+      AD_TITLE = #{adTitle,jdbcType=VARCHAR},
+      AD_NAME = #{adName,jdbcType=VARCHAR},
+      AD_SUMMARY = #{adSummary,jdbcType=VARCHAR},
+      AD_COLOR_TYPE = #{adColorType,jdbcType=VARCHAR},
+      AD_IMAGE_URL = #{adImageUrl,jdbcType=VARCHAR},
+      AD_STATE = #{adState,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
+    where AD_ID = #{adId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleAdQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleAdQueryMapper.xml
new file mode 100644
index 000000000..dd472aa53
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleAdQueryMapper.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ArticleAdQueryMapper" >
+  
+  <resultMap id="ArticleAdMap" type="com.ruoyi.content.domain.ArticleAdInfo" >
+    <id column="AD_ID" property="adId" jdbcType="INTEGER" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="AD_TYPE" property="adType" jdbcType="VARCHAR" />
+    <result column="AD_TYPE_NAME" property="adTypeName" jdbcType="VARCHAR" />
+    <result column="AD_LINK_URL" property="adLinkUrl" jdbcType="VARCHAR" />
+    <result column="AD_TITLE" property="adTitle" jdbcType="VARCHAR" />
+    <result column="AD_NAME" property="adName" jdbcType="VARCHAR" />
+    <result column="AD_SUMMARY" property="adSummary" jdbcType="VARCHAR" />
+    <result column="AD_COLOR_TYPE" property="adColorType" jdbcType="VARCHAR" />
+    <result column="AD_IMAGE_URL" property="adImageUrl" jdbcType="VARCHAR" />
+    <result column="AD_STATE" property="adState" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <sql id="Advertisement_Column_List" >
+     AD_ID, COMPANY_ID, AD_TYPE, AD_TYPE_NAME, AD_LINK_URL, AD_TITLE, AD_NAME, AD_SUMMARY, 
+    AD_COLOR_TYPE, AD_IMAGE_URL, AD_STATE, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, 
+    UPDATE_DATE, UPDATE_TIME
+  </sql>
+
+   <select id="queryAdByCompanyId" resultMap="ArticleAdMap" parameterType="java.lang.String" >
+    SELECT AD_ID,AD_TYPE_NAME,AD_TITLE FROM article_ad_info 
+	WHERE COMPANY_ID = #{companyId,jdbcType=VARCHAR} AND AD_STATE = '0'
+	ORDER BY AD_TYPE_NAME,AD_TITLE
+  </select>
+  
+  <select id="selectAllWithLimit" resultMap="ArticleAdMap">
+	SELECT
+	<include refid="Advertisement_Column_List" />
+	FROM article_ad_info 	
+	WHERE
+	1=1
+	<if test="companyId != null and companyId !=''">
+		and COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+	</if>
+	<if test="adTitle != null and adTitle !=''">
+	    and AD_TITLE like CONCAT(CONCAT('%', #{adTitle,jdbcType=VARCHAR}), '%')
+	</if>
+	 AND AD_STATE = '0' AND CREATE_USER = 'company'
+	 order by CREATE_DATE DESC,CREATE_TIME DESC, UPDATE_DATE
+	DESC,UPDATE_TIME DESC
+	limit
+	#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+</select>	
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleChannelMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleChannelMapper.xml
new file mode 100644
index 000000000..d61d94162
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleChannelMapper.xml
@@ -0,0 +1,466 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ArticleChannelMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticleChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    <id column="ID" property="id" jdbcType="INTEGER" />
+    <result column="ARTICLE_ID" property="articleId" jdbcType="INTEGER" />
+    <result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR" />
+    <result column="ARTICLE_VERSION" jdbcType="VARCHAR" property="articleVersion" />
+    <result column="SPECIAL" property="special" jdbcType="VARCHAR" />
+    <result column="CHANNEL" property="channel" jdbcType="VARCHAR" />
+    <result column="ARTICLE_STATE" property="articleState" jdbcType="VARCHAR" />
+    <result column="PUBLISH_DATE" property="publishDate" jdbcType="VARCHAR" />
+    <result column="PUBLISH_TIME" property="publishTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+    <result column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR" />
+    <result column="ORDER_NO" property="orderNo" jdbcType="INTEGER" />
+    <result column="TOP_TIME" property="topTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    ID, ARTICLE_ID, ARTICLE_NAME, ARTICLE_VERSION, SPECIAL, CHANNEL, ARTICLE_STATE, PUBLISH_DATE, PUBLISH_TIME, 
+    UPDATE_DATE, UPDATE_TIME, COMPANY_ID, BRANCH_ID, PUBLISH_ID, ORDER_NO, TOP_TIME
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ArticleChannelExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from article_channel
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from article_channel
+    where ID = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    delete from article_channel
+    where ID = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ArticleChannelExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    delete from article_channel
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ArticleChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into article_channel (ID, ARTICLE_ID, ARTICLE_NAME, 
+      ARTICLE_VERSION, SPECIAL, CHANNEL, ARTICLE_STATE, 
+      PUBLISH_DATE, PUBLISH_TIME, UPDATE_DATE, 
+      UPDATE_TIME, COMPANY_ID, BRANCH_ID, 
+      PUBLISH_ID, ORDER_NO, TOP_TIME
+      )
+    values (#{id,jdbcType=INTEGER}, #{articleId,jdbcType=INTEGER}, #{articleName,jdbcType=VARCHAR}, 
+      #{articleVersion,jdbcType=VARCHAR}, #{special,jdbcType=VARCHAR}, #{channel,jdbcType=VARCHAR}, #{articleState,jdbcType=VARCHAR}, 
+      #{publishDate,jdbcType=VARCHAR}, #{publishTime,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, #{branchId,jdbcType=VARCHAR}, 
+      #{publishId,jdbcType=VARCHAR}, #{orderNo,jdbcType=INTEGER}, #{topTime,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ArticleChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into article_channel
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="articleId != null" >
+        ARTICLE_ID,
+      </if>
+      <if test="articleName != null" >
+        ARTICLE_NAME,
+      </if>
+      <if test="articleVersion != null">
+        ARTICLE_VERSION,
+      </if>
+      <if test="special != null" >
+        SPECIAL,
+      </if>
+      <if test="channel != null" >
+        CHANNEL,
+      </if>
+      <if test="articleState != null" >
+        ARTICLE_STATE,
+      </if>
+      <if test="publishDate != null" >
+        PUBLISH_DATE,
+      </if>
+      <if test="publishTime != null" >
+        PUBLISH_TIME,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID,
+      </if>
+      <if test="publishId != null" >
+        PUBLISH_ID,
+      </if>
+      <if test="orderNo != null" >
+        ORDER_NO,
+      </if>
+      <if test="topTime != null" >
+        TOP_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="articleId != null" >
+        #{articleId,jdbcType=INTEGER},
+      </if>
+      <if test="articleName != null" >
+        #{articleName,jdbcType=VARCHAR},
+      </if>
+      <if test="articleVersion != null">
+        #{articleVersion,jdbcType=VARCHAR},
+      </if>
+      <if test="special != null" >
+        #{special,jdbcType=VARCHAR},
+      </if>
+      <if test="channel != null" >
+        #{channel,jdbcType=VARCHAR},
+      </if>
+      <if test="articleState != null" >
+        #{articleState,jdbcType=VARCHAR},
+      </if>
+      <if test="publishDate != null" >
+        #{publishDate,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null" >
+        #{publishTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        #{branchId,jdbcType=VARCHAR},
+      </if>
+      <if test="publishId != null" >
+        #{publishId,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNo != null" >
+        #{orderNo,jdbcType=INTEGER},
+      </if>
+      <if test="topTime != null" >
+        #{topTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ArticleChannelExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    select count(*) from article_channel
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    update article_channel
+    <set >
+      <if test="record.id != null" >
+        ID = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.articleId != null" >
+        ARTICLE_ID = #{record.articleId,jdbcType=INTEGER},
+      </if>
+      <if test="record.articleName != null" >
+        ARTICLE_NAME = #{record.articleName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.articleVersion != null">
+        ARTICLE_VERSION = #{record.articleVersion,jdbcType=VARCHAR},
+      </if>
+      <if test="record.special != null" >
+        SPECIAL = #{record.special,jdbcType=VARCHAR},
+      </if>
+      <if test="record.channel != null" >
+        CHANNEL = #{record.channel,jdbcType=VARCHAR},
+      </if>
+      <if test="record.articleState != null" >
+        ARTICLE_STATE = #{record.articleState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishDate != null" >
+        PUBLISH_DATE = #{record.publishDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishTime != null" >
+        PUBLISH_TIME = #{record.publishTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.branchId != null" >
+        BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishId != null" >
+        PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orderNo != null" >
+        ORDER_NO = #{record.orderNo,jdbcType=INTEGER},
+      </if>
+      <if test="record.topTime != null" >
+        TOP_TIME = #{record.topTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    update article_channel
+    set ID = #{record.id,jdbcType=INTEGER},
+      ARTICLE_ID = #{record.articleId,jdbcType=INTEGER},
+      ARTICLE_NAME = #{record.articleName,jdbcType=VARCHAR},
+      ARTICLE_VERSION = #{record.articleVersion,jdbcType=VARCHAR},
+      SPECIAL = #{record.special,jdbcType=VARCHAR},
+      CHANNEL = #{record.channel,jdbcType=VARCHAR},
+      ARTICLE_STATE = #{record.articleState,jdbcType=VARCHAR},
+      PUBLISH_DATE = #{record.publishDate,jdbcType=VARCHAR},
+      PUBLISH_TIME = #{record.publishTime,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
+      ORDER_NO = #{record.orderNo,jdbcType=INTEGER},
+      TOP_TIME = #{record.topTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ArticleChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    update article_channel
+    <set >
+      <if test="articleId != null" >
+        ARTICLE_ID = #{articleId,jdbcType=INTEGER},
+      </if>
+      <if test="articleName != null" >
+        ARTICLE_NAME = #{articleName,jdbcType=VARCHAR},
+      </if>
+      <if test="articleVersion != null">
+        ARTICLE_VERSION = #{articleVersion,jdbcType=VARCHAR},
+      </if>
+      <if test="special != null" >
+        SPECIAL = #{special,jdbcType=VARCHAR},
+      </if>
+      <if test="channel != null" >
+        CHANNEL = #{channel,jdbcType=VARCHAR},
+      </if>
+      <if test="articleState != null" >
+        ARTICLE_STATE = #{articleState,jdbcType=VARCHAR},
+      </if>
+      <if test="publishDate != null" >
+        PUBLISH_DATE = #{publishDate,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null" >
+        PUBLISH_TIME = #{publishTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      </if>
+      <if test="publishId != null" >
+        PUBLISH_ID = #{publishId,jdbcType=VARCHAR},
+      </if>
+      <if test="orderNo != null" >
+        ORDER_NO = #{orderNo,jdbcType=INTEGER},
+      </if>
+      <if test="topTime != null" >
+        TOP_TIME = #{topTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticleChannel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Mar 06 16:10:09 CST 2019.
+    -->
+    update article_channel
+    set ARTICLE_ID = #{articleId,jdbcType=INTEGER},
+      ARTICLE_NAME = #{articleName,jdbcType=VARCHAR},
+      ARTICLE_VERSION = #{articleVersion,jdbcType=VARCHAR},
+      SPECIAL = #{special,jdbcType=VARCHAR},
+      CHANNEL = #{channel,jdbcType=VARCHAR},
+      ARTICLE_STATE = #{articleState,jdbcType=VARCHAR},
+      PUBLISH_DATE = #{publishDate,jdbcType=VARCHAR},
+      PUBLISH_TIME = #{publishTime,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      PUBLISH_ID = #{publishId,jdbcType=VARCHAR},
+      ORDER_NO = #{orderNo,jdbcType=INTEGER},
+      TOP_TIME = #{topTime,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleChannelQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleChannelQueryMapper.xml
new file mode 100644
index 000000000..a81e3ec68
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleChannelQueryMapper.xml
@@ -0,0 +1,324 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.content.mapper.ArticleChannelQueryMapper">
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticleChannel">
+   
+  	<id column="ID" jdbcType="INTEGER" property="id" />
+    <result column="ARTICLE_ID" jdbcType="INTEGER" property="articleId" />
+    <result column="ARTICLE_NAME" jdbcType="VARCHAR" property="articleName" />
+    <result column="ARTICLE_VERSION" jdbcType="VARCHAR" property="articleVersion" />
+    <result column="SPECIAL" jdbcType="VARCHAR" property="special" />
+    <result column="CHANNEL" jdbcType="VARCHAR" property="channel" />
+    <result column="ARTICLE_STATE" jdbcType="VARCHAR" property="articleState" />
+    <result column="PUBLISH_DATE" jdbcType="VARCHAR" property="publishDate" />
+    <result column="PUBLISH_TIME" jdbcType="VARCHAR" property="publishTime" />
+    <result column="UPDATE_DATE" jdbcType="VARCHAR" property="updateDate" />
+    <result column="UPDATE_TIME" jdbcType="VARCHAR" property="updateTime" />
+    <result column="COMPANY_ID" jdbcType="VARCHAR" property="companyId" />
+    <result column="BRANCH_ID" jdbcType="VARCHAR" property="branchId" />
+    <result column="PUBLISH_ID" jdbcType="VARCHAR" property="publishId" />
+    <result column="ORDER_NO" property="orderNo" jdbcType="INTEGER" />
+    <result column="TOP_TIME" property="topTime" jdbcType="VARCHAR" />
+  </resultMap>
+  
+   <select id="selectAllWithLimit"
+		parameterType="com.ruoyi.content.domain.ArticleChannel"
+		resultMap="BaseResultMap">
+		SELECT
+		ID,
+		ARTICLE_ID,
+		ARTICLE_VERSION,
+		ARTICLE_NAME,
+		SPECIAL,
+		CHANNEL,
+		ARTICLE_STATE,
+		PUBLISH_DATE,
+		PUBLISH_TIME,
+		UPDATE_DATE,
+		UPDATE_TIME,
+		COMPANY_ID,
+		BRANCH_ID,
+		PUBLISH_ID,
+		ORDER_NO,
+		TOP_TIME
+		FROM
+		article_channel
+		
+		WHERE
+		1=1
+		<if test="articelName != null and articelName!=''">
+			and ARTICLE_NAME like CONCAT(CONCAT('%', #{articelName,jdbcType=VARCHAR}), '%')
+		</if>
+		<if test="special != null and special!=''">
+			and SPECIAL = #{special,jdbcType=VARCHAR}
+		</if>
+		<if test="channel != null and channel !=''">
+			and CHANNEL = #{channel,jdbcType=VARCHAR}
+		</if>
+		<if test="companyId != null and companyId !=''">
+			and COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+		</if>
+		<if test="branchId != null and branchId !=''">
+			and BRANCH_ID like CONCAT(CONCAT('%', #{branchId,jdbcType=VARCHAR}), '%')
+		</if>
+		<if test="articleState != null">
+			and ARTICLE_STATE in
+			<foreach collection="articleState" item="articleState" index="index"
+				open="(" close=")" separator=",">
+				#{articleState}
+			</foreach>
+		</if>
+		order by UPDATE_DATE DESC,UPDATE_TIME DESC
+		limit
+		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>
+	
+	
+	<select id="queryModifiedEditUrlByArticleId" parameterType="java.lang.String" resultType="java.lang.String">
+  		 SELECT MODIFIED_EDIT_URL FROM article_info WHERE ARTICLE_ID =#{articleId,jdbcType=VARCHAR}
+  	</select>
+  	<select id="queryArticleIdByChannel" parameterType="java.lang.String" resultType="java.lang.Integer">
+  		 SELECT ARTICLE_ID FROM article_channel 
+  		 WHERE CHANNEL =#{channel,jdbcType=VARCHAR} 
+  		 and ARTICLE_STATE="0"
+  	</select>
+  	
+  	<select id="queryByPublishId" parameterType="java.lang.String" resultMap="BaseResultMap">
+  		 SELECT
+		ID,
+		ARTICLE_ID,
+		ARTICLE_NAME,
+		SPECIAL,
+		CHANNEL,
+		ARTICLE_STATE,
+		PUBLISH_DATE,
+		PUBLISH_TIME,
+		UPDATE_DATE,
+		UPDATE_TIME,
+		COMPANY_ID,
+		BRANCH_ID,
+		PUBLISH_ID,
+		ORDER_NO,
+		TOP_TIME
+		FROM
+		article_channel WHERE PUBLISH_ID =#{publishId,jdbcType=VARCHAR}
+  	</select>
+  <!-- 	
+  	 <select id="selectByLimit"
+		parameterType="map"
+		resultType="map">
+		SELECT
+		ARTICLE_ID articleId,
+		ARTICLE_NAME articleName,
+		group_concat(channel,"-",special separator ',') channelSpecial,
+		max(UPDATE_DATE) updateDate,
+		max(UPDATE_TIME) updateTime,
+		PUBLISH_ID publishId
+		FROM
+		article_channel
+		WHERE
+		1=1
+		<if test="articelName != null and articelName!=''">
+			and ARTICLE_NAME like CONCAT(CONCAT('%', #{articelName,jdbcType=VARCHAR}), '%')
+		</if>
+		<if test="channel != null and channel !=''">
+			and (CHANNEL = #{channel,jdbcType=VARCHAR} or SPECIAL = #{special,jdbcType=VARCHAR})
+		</if>
+		<if test="companyId != null and companyId !=''">
+			and COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+		</if>
+		<if test="branchId != null and branchId !=''">
+			and BRANCH_ID like CONCAT(CONCAT('%', #{branchId,jdbcType=VARCHAR}), '%')
+		</if>
+		<if test="list != null">
+			and ARTICLE_STATE in
+			<foreach collection="list" item="articleState" index="index"
+				open="(" close=")" separator=",">
+				#{articleState}
+			</foreach>
+		</if>
+		group by ARTICLE_ID,ARTICLE_NAME,publishId
+		order by max(UPDATE_DATE) DESC,max(UPDATE_TIME) DESC
+		limit
+		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>
+	 -->
+
+	 <select id="selectByLimit"
+		parameterType="map"
+		resultType="map">
+		SELECT
+			max(t.USER_ID) "userId",
+			t.ARTICLE_ID "articleId",
+			max(t.CREATE_USER) "createUser",
+			IFNULL(l.ARTICLE_NAME,info.ARTICLE_NAME) "articleName",
+			group_concat(l.channel,"-",l.special separator ',') channelSpecial,
+			MAX(t.ARTICLE_VERSION),
+			max(concat(t.CREATE_DATE, ' ', T.CREATE_TIME)) publishDate,
+			max(concat(l.UPDATE_DATE, ' ', l.UPDATE_TIME)) updateDate,
+			t.PUBLISH_ID publishId,
+			(select min(f.PUBLISH_DATE) from article_publish_send f where f.PUBLISH_ID = t.PUBLISH_ID and f.SEND_STATE='2') oPbulishTime
+		FROM
+			article_publish_track t
+		LEFT JOIN article_channel l ON t.ARTICLE_ID = l.ARTICLE_ID
+		left JOIN article_info info on t.ARTICLE_ID = info.ARTICLE_ID
+		WHERE
+		1=1
+		<if test="userlist != null">
+			and t.USER_ID in
+			<foreach collection="userlist" item="ulist" index="index"
+				open="(" close=")" separator=",">
+				#{ulist}
+			</foreach>
+		</if>
+		and (l.ARTICLE_STATE = "0" or l.ARTICLE_STATE is null)
+		<if test="articelName != null and articelName!=''">
+			and info.ARTICLE_NAME like CONCAT(CONCAT('%', #{articelName,jdbcType=VARCHAR}), '%')
+		</if>
+		<if test="channel != null and channel !=''">
+			and ( l.CHANNEL = #{channel,jdbcType=VARCHAR} 
+			<if test="special != null and special !=''">
+				or l.SPECIAL = #{special,jdbcType=VARCHAR}
+			</if>	
+			)
+		</if>	
+		group by t.PUBLISH_ID
+		order by max(concat(t.UPDATE_DATE, ' ', t.UPDATE_TIME)) DESC
+		limit
+		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}	
+	</select>
+	<!--  
+  	<select id="selectCountByParam"
+		parameterType="map"
+		resultType="map">
+		SELECT
+		ARTICLE_ID articleId,
+		ARTICLE_NAME articleName,
+		group_concat(channel,"-",special separator ',') channelSpecial,
+		max(UPDATE_DATE) updateDate,
+		max(UPDATE_TIME) updateTime,
+		PUBLISH_ID publishId
+		FROM
+		article_channel
+		WHERE
+		1=1
+		<if test="articelName != null and articelName!=''">
+			and ARTICLE_NAME like CONCAT(CONCAT('%', #{articelName,jdbcType=VARCHAR}), '%')
+		</if>
+		<if test="channel != null and channel !=''">
+			and (CHANNEL = #{channel,jdbcType=VARCHAR} or SPECIAL = #{special,jdbcType=VARCHAR})
+		</if>
+		<if test="companyId != null and companyId !=''">
+			and COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+		</if>
+		<if test="branchId != null and branchId !=''">
+			and BRANCH_ID like CONCAT(CONCAT('%', #{branchId,jdbcType=VARCHAR}), '%')
+		</if>
+		<if test="list != null">
+			and ARTICLE_STATE in
+			<foreach collection="list" item="articleState" index="index"
+				open="(" close=")" separator=",">
+				#{articleState}
+			</foreach>
+		</if>
+		group by ARTICLE_ID,ARTICLE_NAME,PUBLISH_ID
+	</select>
+	-->
+	<select id="selectCountByParam"
+		parameterType="map"
+		resultType="map">
+		SELECT
+			t.PUBLISH_ID publishId
+		FROM
+			article_publish_track t
+		LEFT JOIN article_channel l ON t.ARTICLE_ID = l.ARTICLE_ID
+		left JOIN article_info info on t.ARTICLE_ID = info.ARTICLE_ID
+		WHERE
+		1=1	
+		<if test="userlist != null">
+			and t.USER_ID in
+			<foreach collection="userlist" item="ulist" index="index"
+				open="(" close=")" separator=",">
+				#{ulist}
+			</foreach>
+		</if>
+		and (l.ARTICLE_STATE = "0" or l.ARTICLE_STATE is null)
+		<if test="articelName != null and articelName!=''">
+			and info.ARTICLE_NAME like CONCAT(CONCAT('%', #{articelName,jdbcType=VARCHAR}), '%')
+		</if>
+		<if test="channel != null and channel !=''">
+			and (l.CHANNEL = #{channel,jdbcType=VARCHAR}
+			<if test="special != null and special !=''">
+				or l.SPECIAL = #{special,jdbcType=VARCHAR}
+			</if>		
+			)
+		</if>	
+		group by t.PUBLISH_ID
+	</select>
+	
+	<!-- 批量收录文章 -->
+	
+	<insert id="batchInsertArticeChannel" parameterType="java.util.List">
+		INSERT INTO article_channel (
+						ARTICLE_ID,
+						ARTICLE_NAME,
+						ARTICLE_VERSION,
+						SPECIAL,
+						CHANNEL,
+						ARTICLE_STATE,
+						PUBLISH_DATE,
+						PUBLISH_TIME,
+						UPDATE_DATE,
+						UPDATE_TIME,
+						COMPANY_ID,
+						BRANCH_ID,
+						PUBLISH_ID
+					) values
+					<foreach collection="batchInsertArticle" item="item" index="index" separator=",">
+						(
+							#{item.articleId},
+							#{item.articleName},
+							#{item.articleVersion},
+							#{item.special},
+							#{item.channel},
+							#{item.articleState},
+							#{item.publishDate},
+							#{item.publishTime},
+							#{item.updateDate},
+							#{item.updateTime},
+							#{item.companyId},
+							#{item.branchId},
+							#{item.publishId}
+						)
+				     </foreach>		
+	</insert>
+	
+	<select id="selectByPublishList" parameterType="java.util.List" resultType="map">
+	SELECT
+			max(t.USER_ID) "userId",
+			t.ARTICLE_ID "articleId",
+			max(t.CREATE_USER) "createUser",
+			IFNULL(l.ARTICLE_NAME,info.ARTICLE_NAME) "articleName",
+			group_concat(l.channel,"-",l.special separator ',') channelSpecial,
+			MAX(t.ARTICLE_VERSION),
+			max(concat(t.CREATE_DATE, ' ', T.CREATE_TIME)) publishDate,
+			max(concat(l.UPDATE_DATE, ' ', l.UPDATE_TIME)) updateDate,
+			t.PUBLISH_ID publishId
+		FROM
+			article_publish_track t
+		LEFT JOIN article_channel l ON t.ARTICLE_ID = l.ARTICLE_ID
+		left JOIN article_info info on t.ARTICLE_ID = info.ARTICLE_ID
+		WHERE
+		1=1	
+		and (l.ARTICLE_STATE = "0" or l.ARTICLE_STATE is null)
+		<if test="null != publishList and publishList.size > 0">
+		 and	t.PUBLISH_ID in 
+			<foreach collection="publishList" item="item" index="index" separator="," open="(" close=")">
+					#{item,jdbcType=VARCHAR}
+			</foreach>	
+		</if>
+		group by t.PUBLISH_ID
+		order by max(concat(t.UPDATE_DATE, ' ', t.UPDATE_TIME)) DESC
+	</select>
+	
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleForwardTrackMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleForwardTrackMapper.xml
new file mode 100644
index 000000000..107f39bcd
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleForwardTrackMapper.xml
@@ -0,0 +1,448 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ArticleForwardTrackMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticleForwardTrack" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    <id column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
+    <id column="FORWARD_TIMESTAMP" property="forwardTimestamp" jdbcType="VARCHAR" />
+    <id column="USER_ID" property="userId" jdbcType="VARCHAR" />
+    <result column="FORWARD_ID" property="forwardId" jdbcType="INTEGER" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="CLICK_ID" property="clickId" jdbcType="VARCHAR" />
+    <result column="PUBLISH_USER_ID" property="publishUserId" jdbcType="VARCHAR" />
+    <result column="VERSION_NUMBER" property="versionNumber" jdbcType="VARCHAR" />
+    <result column="SHARE_STATE" property="shareState" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    ARTICLE_ID, FORWARD_TIMESTAMP, USER_ID, FORWARD_ID, COMPANY_ID, CLICK_ID, PUBLISH_USER_ID, 
+    VERSION_NUMBER, SHARE_STATE, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, 
+    UPDATE_DATE, UPDATE_TIME
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ArticleForwardTrackExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from article_forward_track
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ArticleForwardTrackKey" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from article_forward_track
+    where ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
+      and FORWARD_TIMESTAMP = #{forwardTimestamp,jdbcType=VARCHAR}
+      and USER_ID = #{userId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticleForwardTrackKey" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    delete from article_forward_track
+    where ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
+      and FORWARD_TIMESTAMP = #{forwardTimestamp,jdbcType=VARCHAR}
+      and USER_ID = #{userId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ArticleForwardTrackExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    delete from article_forward_track
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.micro.cms.modules.mybatis.entity.ArticleForwardTrack" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="forwardId" order="BEFORE" >
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into article_forward_track (ARTICLE_ID, FORWARD_TIMESTAMP, USER_ID, 
+      FORWARD_ID, COMPANY_ID, CLICK_ID, 
+      PUBLISH_USER_ID, VERSION_NUMBER, SHARE_STATE, 
+      CREATE_DATE, CREATE_TIME, CREATE_USER, 
+      UPDATE_USER, UPDATE_DATE, UPDATE_TIME
+      )
+    values (#{articleId,jdbcType=VARCHAR}, #{forwardTimestamp,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, 
+      #{forwardId,jdbcType=INTEGER}, #{companyId,jdbcType=VARCHAR}, #{clickId,jdbcType=VARCHAR}, 
+      #{publishUserId,jdbcType=VARCHAR}, #{versionNumber,jdbcType=VARCHAR}, #{shareState,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{updateUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ArticleForwardTrack" useGeneratedKeys="true">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="forwardId" order="AFTER" >
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into article_forward_track
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="articleId != null" >
+        ARTICLE_ID,
+      </if>
+      <if test="forwardTimestamp != null" >
+        FORWARD_TIMESTAMP,
+      </if>
+      <if test="userId != null" >
+        USER_ID,
+      </if>
+      FORWARD_ID,
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="clickId != null" >
+        CLICK_ID,
+      </if>
+      <if test="publishUserId != null" >
+        PUBLISH_USER_ID,
+      </if>
+      <if test="versionNumber != null" >
+        VERSION_NUMBER,
+      </if>
+      <if test="shareState != null" >
+        SHARE_STATE,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="articleId != null" >
+        #{articleId,jdbcType=VARCHAR},
+      </if>
+      <if test="forwardTimestamp != null" >
+        #{forwardTimestamp,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null" >
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      #{forwardId,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="clickId != null" >
+        #{clickId,jdbcType=VARCHAR},
+      </if>
+      <if test="publishUserId != null" >
+        #{publishUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="versionNumber != null" >
+        #{versionNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="shareState != null" >
+        #{shareState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ArticleForwardTrackExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    select count(*) from article_forward_track
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    update article_forward_track
+    <set >
+      <if test="record.articleId != null" >
+        ARTICLE_ID = #{record.articleId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.forwardTimestamp != null" >
+        FORWARD_TIMESTAMP = #{record.forwardTimestamp,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userId != null" >
+        USER_ID = #{record.userId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.forwardId != null" >
+        FORWARD_ID = #{record.forwardId,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clickId != null" >
+        CLICK_ID = #{record.clickId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishUserId != null" >
+        PUBLISH_USER_ID = #{record.publishUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.versionNumber != null" >
+        VERSION_NUMBER = #{record.versionNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shareState != null" >
+        SHARE_STATE = #{record.shareState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    update article_forward_track
+    set ARTICLE_ID = #{record.articleId,jdbcType=VARCHAR},
+      FORWARD_TIMESTAMP = #{record.forwardTimestamp,jdbcType=VARCHAR},
+      USER_ID = #{record.userId,jdbcType=VARCHAR},
+      FORWARD_ID = #{record.forwardId,jdbcType=INTEGER},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      CLICK_ID = #{record.clickId,jdbcType=VARCHAR},
+      PUBLISH_USER_ID = #{record.publishUserId,jdbcType=VARCHAR},
+      VERSION_NUMBER = #{record.versionNumber,jdbcType=VARCHAR},
+      SHARE_STATE = #{record.shareState,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ArticleForwardTrack" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    update article_forward_track
+    <set >
+      <if test="forwardId != null" >
+        FORWARD_ID = #{forwardId,jdbcType=INTEGER},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="clickId != null" >
+        CLICK_ID = #{clickId,jdbcType=VARCHAR},
+      </if>
+      <if test="publishUserId != null" >
+        PUBLISH_USER_ID = #{publishUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="versionNumber != null" >
+        VERSION_NUMBER = #{versionNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="shareState != null" >
+        SHARE_STATE = #{shareState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
+      and FORWARD_TIMESTAMP = #{forwardTimestamp,jdbcType=VARCHAR}
+      and USER_ID = #{userId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticleForwardTrack" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 06 14:53:46 CST 2018.
+    -->
+    update article_forward_track
+    set FORWARD_ID = #{forwardId,jdbcType=INTEGER},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      CLICK_ID = #{clickId,jdbcType=VARCHAR},
+      PUBLISH_USER_ID = #{publishUserId,jdbcType=VARCHAR},
+      VERSION_NUMBER = #{versionNumber,jdbcType=VARCHAR},
+      SHARE_STATE = #{shareState,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
+    where ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
+      and FORWARD_TIMESTAMP = #{forwardTimestamp,jdbcType=VARCHAR}
+      and USER_ID = #{userId,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleInfoMapper.xml
new file mode 100644
index 000000000..fa6c53bab
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleInfoMapper.xml
@@ -0,0 +1,674 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ArticleInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticleInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    <id column="ARTICLE_ID" property="articleId" jdbcType="INTEGER" />
+    <result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR" />
+    <result column="PUSH_DATE" property="pushDate" jdbcType="VARCHAR" />
+    <result column="ARTICLE_AUTHOR" property="articleAuthor" jdbcType="VARCHAR" />
+    <result column="ARTICLE_EDIT_URL" property="articleEditUrl" jdbcType="VARCHAR" />
+    <result column="ARTICLE_VIEW_URL" property="articleViewUrl" jdbcType="VARCHAR" />
+    <result column="LIST_PIC_URL" property="listPicUrl" jdbcType="VARCHAR" />
+    <result column="SPECIAL" property="special" jdbcType="VARCHAR" />
+    <result column="CHANNEL_ID" property="channelId" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="ORIGINAL_URL" property="originalUrl" jdbcType="VARCHAR" />
+    <result column="SHARE_IMG_URL" property="shareImgUrl" jdbcType="VARCHAR" />
+    <result column="SHARE_TITLE" property="shareTitle" jdbcType="VARCHAR" />
+    <result column="ARTICLE_STATE" property="articleState" jdbcType="VARCHAR" />
+    <result column="SHARE_DES" property="shareDes" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="MODIFIED_EDIT_URL" property="modifiedEditUrl" jdbcType="VARCHAR" />
+    <result column="MODIFIED_VIEW_URL" property="modifiedViewUrl" jdbcType="VARCHAR" />
+  </resultMap>
+  <resultMap id="ResultMapWithBLOBs" type="com.ruoyi.content.domain.ArticleInfo" extends="BaseResultMap" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    <result column="ARTICLE_CONTENT" property="articleContent" jdbcType="LONGVARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    ARTICLE_ID, ARTICLE_NAME, PUSH_DATE, ARTICLE_AUTHOR, ARTICLE_EDIT_URL, ARTICLE_VIEW_URL, 
+    LIST_PIC_URL, SPECIAL, CHANNEL_ID, COMPANY_ID, ORIGINAL_URL, SHARE_IMG_URL, SHARE_TITLE, 
+    ARTICLE_STATE, SHARE_DES, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_DATE, UPDATE_TIME, 
+    MODIFIED_EDIT_URL, MODIFIED_VIEW_URL
+  </sql>
+  <sql id="Blob_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    ARTICLE_CONTENT
+  </sql>
+  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="com.ruoyi.content.domain.ArticleInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from article_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ArticleInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from article_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from article_info
+    where ARTICLE_ID = #{articleId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    delete from article_info
+    where ARTICLE_ID = #{articleId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ArticleInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    delete from article_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ArticleInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="articleId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into article_info (ARTICLE_ID, ARTICLE_NAME, PUSH_DATE, 
+      ARTICLE_AUTHOR, ARTICLE_EDIT_URL, ARTICLE_VIEW_URL, 
+      LIST_PIC_URL, SPECIAL, CHANNEL_ID, 
+      COMPANY_ID, ORIGINAL_URL, SHARE_IMG_URL, 
+      SHARE_TITLE, ARTICLE_STATE, SHARE_DES, 
+      CREATE_DATE, CREATE_TIME, CREATE_USER, 
+      UPDATE_DATE, UPDATE_TIME, MODIFIED_EDIT_URL, 
+      MODIFIED_VIEW_URL, ARTICLE_CONTENT)
+    values (#{articleId,jdbcType=INTEGER}, #{articleName,jdbcType=VARCHAR}, #{pushDate,jdbcType=VARCHAR}, 
+      #{articleAuthor,jdbcType=VARCHAR}, #{articleEditUrl,jdbcType=VARCHAR}, #{articleViewUrl,jdbcType=VARCHAR}, 
+      #{listPicUrl,jdbcType=VARCHAR}, #{special,jdbcType=VARCHAR}, #{channelId,jdbcType=VARCHAR}, 
+      #{companyId,jdbcType=VARCHAR}, #{originalUrl,jdbcType=VARCHAR}, #{shareImgUrl,jdbcType=VARCHAR}, 
+      #{shareTitle,jdbcType=VARCHAR}, #{articleState,jdbcType=VARCHAR}, #{shareDes,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}, #{modifiedEditUrl,jdbcType=VARCHAR}, 
+      #{modifiedViewUrl,jdbcType=VARCHAR}, #{articleContent,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ArticleInfo" keyProperty="articleId" useGeneratedKeys="true" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="articleId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into article_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      ARTICLE_ID,
+      <if test="articleName != null" >
+        ARTICLE_NAME,
+      </if>
+      <if test="pushDate != null" >
+        PUSH_DATE,
+      </if>
+      <if test="articleAuthor != null" >
+        ARTICLE_AUTHOR,
+      </if>
+      <if test="articleEditUrl != null" >
+        ARTICLE_EDIT_URL,
+      </if>
+      <if test="articleViewUrl != null" >
+        ARTICLE_VIEW_URL,
+      </if>
+      <if test="listPicUrl != null" >
+        LIST_PIC_URL,
+      </if>
+      <if test="special != null" >
+        SPECIAL,
+      </if>
+      <if test="channelId != null" >
+        CHANNEL_ID,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="originalUrl != null" >
+        ORIGINAL_URL,
+      </if>
+      <if test="shareImgUrl != null" >
+        SHARE_IMG_URL,
+      </if>
+      <if test="shareTitle != null" >
+        SHARE_TITLE,
+      </if>
+      <if test="articleState != null" >
+        ARTICLE_STATE,
+      </if>
+      <if test="shareDes != null" >
+        SHARE_DES,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="modifiedEditUrl != null" >
+        MODIFIED_EDIT_URL,
+      </if>
+      <if test="modifiedViewUrl != null" >
+        MODIFIED_VIEW_URL,
+      </if>
+      <if test="articleContent != null" >
+        ARTICLE_CONTENT,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{articleId,jdbcType=INTEGER},
+      <if test="articleName != null" >
+        #{articleName,jdbcType=VARCHAR},
+      </if>
+      <if test="pushDate != null" >
+        #{pushDate,jdbcType=VARCHAR},
+      </if>
+      <if test="articleAuthor != null" >
+        #{articleAuthor,jdbcType=VARCHAR},
+      </if>
+      <if test="articleEditUrl != null" >
+        #{articleEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="articleViewUrl != null" >
+        #{articleViewUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="listPicUrl != null" >
+        #{listPicUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="special != null" >
+        #{special,jdbcType=VARCHAR},
+      </if>
+      <if test="channelId != null" >
+        #{channelId,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="originalUrl != null" >
+        #{originalUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="shareImgUrl != null" >
+        #{shareImgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="shareTitle != null" >
+        #{shareTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="articleState != null" >
+        #{articleState,jdbcType=VARCHAR},
+      </if>
+      <if test="shareDes != null" >
+        #{shareDes,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="modifiedEditUrl != null" >
+        #{modifiedEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="modifiedViewUrl != null" >
+        #{modifiedViewUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="articleContent != null" >
+        #{articleContent,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ArticleInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    select count(*) from article_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    update article_info
+    <set >
+      <if test="record.articleId != null" >
+        ARTICLE_ID = #{record.articleId,jdbcType=INTEGER},
+      </if>
+      <if test="record.articleName != null" >
+        ARTICLE_NAME = #{record.articleName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pushDate != null" >
+        PUSH_DATE = #{record.pushDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.articleAuthor != null" >
+        ARTICLE_AUTHOR = #{record.articleAuthor,jdbcType=VARCHAR},
+      </if>
+      <if test="record.articleEditUrl != null" >
+        ARTICLE_EDIT_URL = #{record.articleEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.articleViewUrl != null" >
+        ARTICLE_VIEW_URL = #{record.articleViewUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.listPicUrl != null" >
+        LIST_PIC_URL = #{record.listPicUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.special != null" >
+        SPECIAL = #{record.special,jdbcType=VARCHAR},
+      </if>
+      <if test="record.channelId != null" >
+        CHANNEL_ID = #{record.channelId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.originalUrl != null" >
+        ORIGINAL_URL = #{record.originalUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shareImgUrl != null" >
+        SHARE_IMG_URL = #{record.shareImgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shareTitle != null" >
+        SHARE_TITLE = #{record.shareTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.articleState != null" >
+        ARTICLE_STATE = #{record.articleState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shareDes != null" >
+        SHARE_DES = #{record.shareDes,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modifiedEditUrl != null" >
+        MODIFIED_EDIT_URL = #{record.modifiedEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modifiedViewUrl != null" >
+        MODIFIED_VIEW_URL = #{record.modifiedViewUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.articleContent != null" >
+        ARTICLE_CONTENT = #{record.articleContent,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    update article_info
+    set ARTICLE_ID = #{record.articleId,jdbcType=INTEGER},
+      ARTICLE_NAME = #{record.articleName,jdbcType=VARCHAR},
+      PUSH_DATE = #{record.pushDate,jdbcType=VARCHAR},
+      ARTICLE_AUTHOR = #{record.articleAuthor,jdbcType=VARCHAR},
+      ARTICLE_EDIT_URL = #{record.articleEditUrl,jdbcType=VARCHAR},
+      ARTICLE_VIEW_URL = #{record.articleViewUrl,jdbcType=VARCHAR},
+      LIST_PIC_URL = #{record.listPicUrl,jdbcType=VARCHAR},
+      SPECIAL = #{record.special,jdbcType=VARCHAR},
+      CHANNEL_ID = #{record.channelId,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      ORIGINAL_URL = #{record.originalUrl,jdbcType=VARCHAR},
+      SHARE_IMG_URL = #{record.shareImgUrl,jdbcType=VARCHAR},
+      SHARE_TITLE = #{record.shareTitle,jdbcType=VARCHAR},
+      ARTICLE_STATE = #{record.articleState,jdbcType=VARCHAR},
+      SHARE_DES = #{record.shareDes,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      MODIFIED_EDIT_URL = #{record.modifiedEditUrl,jdbcType=VARCHAR},
+      MODIFIED_VIEW_URL = #{record.modifiedViewUrl,jdbcType=VARCHAR},
+      ARTICLE_CONTENT = #{record.articleContent,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    update article_info
+    set ARTICLE_ID = #{record.articleId,jdbcType=INTEGER},
+      ARTICLE_NAME = #{record.articleName,jdbcType=VARCHAR},
+      PUSH_DATE = #{record.pushDate,jdbcType=VARCHAR},
+      ARTICLE_AUTHOR = #{record.articleAuthor,jdbcType=VARCHAR},
+      ARTICLE_EDIT_URL = #{record.articleEditUrl,jdbcType=VARCHAR},
+      ARTICLE_VIEW_URL = #{record.articleViewUrl,jdbcType=VARCHAR},
+      LIST_PIC_URL = #{record.listPicUrl,jdbcType=VARCHAR},
+      SPECIAL = #{record.special,jdbcType=VARCHAR},
+      CHANNEL_ID = #{record.channelId,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      ORIGINAL_URL = #{record.originalUrl,jdbcType=VARCHAR},
+      SHARE_IMG_URL = #{record.shareImgUrl,jdbcType=VARCHAR},
+      SHARE_TITLE = #{record.shareTitle,jdbcType=VARCHAR},
+      ARTICLE_STATE = #{record.articleState,jdbcType=VARCHAR},
+      SHARE_DES = #{record.shareDes,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      MODIFIED_EDIT_URL = #{record.modifiedEditUrl,jdbcType=VARCHAR},
+      MODIFIED_VIEW_URL = #{record.modifiedViewUrl,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ArticleInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    update article_info
+    <set >
+      <if test="articleName != null" >
+        ARTICLE_NAME = #{articleName,jdbcType=VARCHAR},
+      </if>
+      <if test="pushDate != null" >
+        PUSH_DATE = #{pushDate,jdbcType=VARCHAR},
+      </if>
+      <if test="articleAuthor != null" >
+        ARTICLE_AUTHOR = #{articleAuthor,jdbcType=VARCHAR},
+      </if>
+      <if test="articleEditUrl != null" >
+        ARTICLE_EDIT_URL = #{articleEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="articleViewUrl != null" >
+        ARTICLE_VIEW_URL = #{articleViewUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="listPicUrl != null" >
+        LIST_PIC_URL = #{listPicUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="special != null" >
+        SPECIAL = #{special,jdbcType=VARCHAR},
+      </if>
+      <if test="channelId != null" >
+        CHANNEL_ID = #{channelId,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="originalUrl != null" >
+        ORIGINAL_URL = #{originalUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="shareImgUrl != null" >
+        SHARE_IMG_URL = #{shareImgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="shareTitle != null" >
+        SHARE_TITLE = #{shareTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="articleState != null" >
+        ARTICLE_STATE = #{articleState,jdbcType=VARCHAR},
+      </if>
+      <if test="shareDes != null" >
+        SHARE_DES = #{shareDes,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="modifiedEditUrl != null" >
+        MODIFIED_EDIT_URL = #{modifiedEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="modifiedViewUrl != null" >
+        MODIFIED_VIEW_URL = #{modifiedViewUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="articleContent != null" >
+        ARTICLE_CONTENT = #{articleContent,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where ARTICLE_ID = #{articleId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.ruoyi.content.domain.ArticleInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    update article_info
+    set ARTICLE_NAME = #{articleName,jdbcType=VARCHAR},
+      PUSH_DATE = #{pushDate,jdbcType=VARCHAR},
+      ARTICLE_AUTHOR = #{articleAuthor,jdbcType=VARCHAR},
+      ARTICLE_EDIT_URL = #{articleEditUrl,jdbcType=VARCHAR},
+      ARTICLE_VIEW_URL = #{articleViewUrl,jdbcType=VARCHAR},
+      LIST_PIC_URL = #{listPicUrl,jdbcType=VARCHAR},
+      SPECIAL = #{special,jdbcType=VARCHAR},
+      CHANNEL_ID = #{channelId,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      ORIGINAL_URL = #{originalUrl,jdbcType=VARCHAR},
+      SHARE_IMG_URL = #{shareImgUrl,jdbcType=VARCHAR},
+      SHARE_TITLE = #{shareTitle,jdbcType=VARCHAR},
+      ARTICLE_STATE = #{articleState,jdbcType=VARCHAR},
+      SHARE_DES = #{shareDes,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      MODIFIED_EDIT_URL = #{modifiedEditUrl,jdbcType=VARCHAR},
+      MODIFIED_VIEW_URL = #{modifiedViewUrl,jdbcType=VARCHAR},
+      ARTICLE_CONTENT = #{articleContent,jdbcType=LONGVARCHAR}
+    where ARTICLE_ID = #{articleId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticleInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri May 25 15:02:37 CST 2018.
+    -->
+    update article_info
+    set ARTICLE_NAME = #{articleName,jdbcType=VARCHAR},
+      PUSH_DATE = #{pushDate,jdbcType=VARCHAR},
+      ARTICLE_AUTHOR = #{articleAuthor,jdbcType=VARCHAR},
+      ARTICLE_EDIT_URL = #{articleEditUrl,jdbcType=VARCHAR},
+      ARTICLE_VIEW_URL = #{articleViewUrl,jdbcType=VARCHAR},
+      LIST_PIC_URL = #{listPicUrl,jdbcType=VARCHAR},
+      SPECIAL = #{special,jdbcType=VARCHAR},
+      CHANNEL_ID = #{channelId,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      ORIGINAL_URL = #{originalUrl,jdbcType=VARCHAR},
+      SHARE_IMG_URL = #{shareImgUrl,jdbcType=VARCHAR},
+      SHARE_TITLE = #{shareTitle,jdbcType=VARCHAR},
+      ARTICLE_STATE = #{articleState,jdbcType=VARCHAR},
+      SHARE_DES = #{shareDes,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      MODIFIED_EDIT_URL = #{modifiedEditUrl,jdbcType=VARCHAR},
+      MODIFIED_VIEW_URL = #{modifiedViewUrl,jdbcType=VARCHAR}
+    where ARTICLE_ID = #{articleId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleLabelMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleLabelMapper.xml
new file mode 100644
index 000000000..165a21467
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleLabelMapper.xml
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ArticleLabelMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticleLabel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="LABEL_ID" property="labelId" jdbcType="INTEGER" />
+    <result column="LABEL_NAME" property="labelName" jdbcType="VARCHAR" />
+    <result column="COMPANY_NAME" property="companyName" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    LABEL_ID, LABEL_NAME, COMPANY_NAME, CREATE_TIME, CREATE_DATE, UPDATE_TIME, UPDATE_DATE, 
+    CREATE_USER, COMPANY_ID, BRANCH_ID
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ArticleLabelExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from article_label
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from article_label
+    where LABEL_ID = #{labelId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from article_label
+    where LABEL_ID = #{labelId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ArticleLabelExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from article_label
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ArticleLabel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into article_label (LABEL_ID, LABEL_NAME, COMPANY_NAME, 
+      CREATE_TIME, CREATE_DATE, UPDATE_TIME, 
+      UPDATE_DATE, CREATE_USER, COMPANY_ID, 
+      BRANCH_ID)
+    values (#{labelId,jdbcType=INTEGER}, #{labelName,jdbcType=VARCHAR}, #{companyName,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, 
+      #{branchId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ArticleLabel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into article_label
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="labelId != null" >
+        LABEL_ID,
+      </if>
+      <if test="labelName != null" >
+        LABEL_NAME,
+      </if>
+      <if test="companyName != null" >
+        COMPANY_NAME,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="labelId != null" >
+        #{labelId,jdbcType=INTEGER},
+      </if>
+      <if test="labelName != null" >
+        #{labelName,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null" >
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        #{branchId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ArticleLabelExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from article_label
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update article_label
+    <set >
+      <if test="record.labelId != null" >
+        LABEL_ID = #{record.labelId,jdbcType=INTEGER},
+      </if>
+      <if test="record.labelName != null" >
+        LABEL_NAME = #{record.labelName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyName != null" >
+        COMPANY_NAME = #{record.companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.branchId != null" >
+        BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update article_label
+    set LABEL_ID = #{record.labelId,jdbcType=INTEGER},
+      LABEL_NAME = #{record.labelName,jdbcType=VARCHAR},
+      COMPANY_NAME = #{record.companyName,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{record.branchId,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ArticleLabel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update article_label
+    <set >
+      <if test="labelName != null" >
+        LABEL_NAME = #{labelName,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null" >
+        COMPANY_NAME = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where LABEL_ID = #{labelId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticleLabel" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update article_label
+    set LABEL_NAME = #{labelName,jdbcType=VARCHAR},
+      COMPANY_NAME = #{companyName,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{branchId,jdbcType=VARCHAR}
+    where LABEL_ID = #{labelId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleLabelRelationshipMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleLabelRelationshipMapper.xml
new file mode 100644
index 000000000..2940a87e6
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleLabelRelationshipMapper.xml
@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.content.mapper.ArticleLabelRelationshipMapper">
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticleLabelRelationship">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <id column="ID" jdbcType="INTEGER" property="id" />
+    <result column="ARTICLE_ID" jdbcType="INTEGER" property="articleId" />
+    <result column="LABEL_ID" jdbcType="INTEGER" property="labelId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    ID, ARTICLE_ID, LABEL_ID
+  </sql>
+  <select id="selectByExample" parameterType="com.ruoyi.content.domain.ArticleLabelRelationshipExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from article_label_relationship
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from article_label_relationship
+    where ID = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from article_label_relationship
+    where ID = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ArticleLabelRelationshipExample">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    delete from article_label_relationship
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ArticleLabelRelationship">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into article_label_relationship (ID, ARTICLE_ID, LABEL_ID
+      )
+    values (#{id,jdbcType=INTEGER}, #{articleId,jdbcType=INTEGER}, #{labelId,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ArticleLabelRelationship">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    insert into article_label_relationship
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="articleId != null">
+        ARTICLE_ID,
+      </if>
+      <if test="labelId != null">
+        LABEL_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="articleId != null">
+        #{articleId,jdbcType=INTEGER},
+      </if>
+      <if test="labelId != null">
+        #{labelId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ArticleLabelRelationshipExample" resultType="java.lang.Integer">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    select count(*) from article_label_relationship
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update article_label_relationship
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.articleId != null">
+        ARTICLE_ID = #{record.articleId,jdbcType=INTEGER},
+      </if>
+      <if test="record.labelId != null">
+        LABEL_ID = #{record.labelId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update article_label_relationship
+    set ID = #{record.id,jdbcType=INTEGER},
+      ARTICLE_ID = #{record.articleId,jdbcType=INTEGER},
+      LABEL_ID = #{record.labelId,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ArticleLabelRelationship">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update article_label_relationship
+    <set>
+      <if test="articleId != null">
+        ARTICLE_ID = #{articleId,jdbcType=INTEGER},
+      </if>
+      <if test="labelId != null">
+        LABEL_ID = #{labelId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticleLabelRelationship">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+    -->
+    update article_label_relationship
+    set ARTICLE_ID = #{articleId,jdbcType=INTEGER},
+      LABEL_ID = #{labelId,jdbcType=INTEGER}
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticlePersonalConfigMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticlePersonalConfigMapper.xml
new file mode 100644
index 000000000..c98e70599
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticlePersonalConfigMapper.xml
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ArticlePersonalConfigMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticlePersonalConfig" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    <id column="ID" property="id" jdbcType="INTEGER" />
+    <result column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR" />
+    <result column="CONFIG_ARTICLE" property="configArticle" jdbcType="VARCHAR" />
+    <result column="CONFIG_PRODUCT" property="configProduct" jdbcType="VARCHAR" />
+    <result column="CONFIG_CARD" property="configCard" jdbcType="VARCHAR" />
+    <result column="CONFIG_RECRUIT" property="configRecruit" jdbcType="VARCHAR" />
+    <result column="SHOW_AD" property="showAd" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    ID, PUBLISH_ID, CONFIG_ARTICLE, CONFIG_PRODUCT, CONFIG_CARD, CONFIG_RECRUIT, SHOW_AD
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ArticlePersonalConfigExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from article_personal_config
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from article_personal_config
+    where ID = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    delete from article_personal_config
+    where ID = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ArticlePersonalConfigExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    delete from article_personal_config
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ArticlePersonalConfig" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+	<selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+
+    insert into article_personal_config (ID, PUBLISH_ID, CONFIG_ARTICLE, 
+      CONFIG_PRODUCT, CONFIG_CARD, CONFIG_RECRUIT, 
+      SHOW_AD)
+    values (#{id,jdbcType=INTEGER}, #{publishId,jdbcType=VARCHAR}, #{configArticle,jdbcType=VARCHAR}, 
+      #{configProduct,jdbcType=VARCHAR}, #{configCard,jdbcType=VARCHAR}, #{configRecruit,jdbcType=VARCHAR}, 
+      #{showAd,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ArticlePersonalConfig" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+	<selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into article_personal_config
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        ID,
+      </if>
+      <if test="publishId != null" >
+        PUBLISH_ID,
+      </if>
+      <if test="configArticle != null" >
+        CONFIG_ARTICLE,
+      </if>
+      <if test="configProduct != null" >
+        CONFIG_PRODUCT,
+      </if>
+      <if test="configCard != null" >
+        CONFIG_CARD,
+      </if>
+      <if test="configRecruit != null" >
+        CONFIG_RECRUIT,
+      </if>
+      <if test="showAd != null" >
+        SHOW_AD,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="publishId != null" >
+        #{publishId,jdbcType=VARCHAR},
+      </if>
+      <if test="configArticle != null" >
+        #{configArticle,jdbcType=VARCHAR},
+      </if>
+      <if test="configProduct != null" >
+        #{configProduct,jdbcType=VARCHAR},
+      </if>
+      <if test="configCard != null" >
+        #{configCard,jdbcType=VARCHAR},
+      </if>
+      <if test="configRecruit != null" >
+        #{configRecruit,jdbcType=VARCHAR},
+      </if>
+      <if test="showAd != null" >
+        #{showAd,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ArticlePersonalConfigExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    select count(*) from article_personal_config
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    update article_personal_config
+    <set >
+      <if test="record.id != null" >
+        ID = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.publishId != null" >
+        PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.configArticle != null" >
+        CONFIG_ARTICLE = #{record.configArticle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.configProduct != null" >
+        CONFIG_PRODUCT = #{record.configProduct,jdbcType=VARCHAR},
+      </if>
+      <if test="record.configCard != null" >
+        CONFIG_CARD = #{record.configCard,jdbcType=VARCHAR},
+      </if>
+      <if test="record.configRecruit != null" >
+        CONFIG_RECRUIT = #{record.configRecruit,jdbcType=VARCHAR},
+      </if>
+      <if test="record.showAd != null" >
+        SHOW_AD = #{record.showAd,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    update article_personal_config
+    set ID = #{record.id,jdbcType=INTEGER},
+      PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
+      CONFIG_ARTICLE = #{record.configArticle,jdbcType=VARCHAR},
+      CONFIG_PRODUCT = #{record.configProduct,jdbcType=VARCHAR},
+      CONFIG_CARD = #{record.configCard,jdbcType=VARCHAR},
+      CONFIG_RECRUIT = #{record.configRecruit,jdbcType=VARCHAR},
+      SHOW_AD = #{record.showAd,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ArticlePersonalConfig" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    update article_personal_config
+    <set >
+      <if test="publishId != null" >
+        PUBLISH_ID = #{publishId,jdbcType=VARCHAR},
+      </if>
+      <if test="configArticle != null" >
+        CONFIG_ARTICLE = #{configArticle,jdbcType=VARCHAR},
+      </if>
+      <if test="configProduct != null" >
+        CONFIG_PRODUCT = #{configProduct,jdbcType=VARCHAR},
+      </if>
+      <if test="configCard != null" >
+        CONFIG_CARD = #{configCard,jdbcType=VARCHAR},
+      </if>
+      <if test="configRecruit != null" >
+        CONFIG_RECRUIT = #{configRecruit,jdbcType=VARCHAR},
+      </if>
+      <if test="showAd != null" >
+        SHOW_AD = #{showAd,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticlePersonalConfig" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed May 20 09:55:58 CST 2020.
+    -->
+    update article_personal_config
+    set PUBLISH_ID = #{publishId,jdbcType=VARCHAR},
+      CONFIG_ARTICLE = #{configArticle,jdbcType=VARCHAR},
+      CONFIG_PRODUCT = #{configProduct,jdbcType=VARCHAR},
+      CONFIG_CARD = #{configCard,jdbcType=VARCHAR},
+      CONFIG_RECRUIT = #{configRecruit,jdbcType=VARCHAR},
+      SHOW_AD = #{showAd,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticlePublishSendMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticlePublishSendMapper.xml
new file mode 100644
index 000000000..2e71f9b01
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticlePublishSendMapper.xml
@@ -0,0 +1,413 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ArticlePublishSendMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticlePublishSend" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    <id column="ID" property="id" jdbcType="INTEGER" />
+    <result column="ARTICLE_ID" property="articleId" jdbcType="INTEGER" />
+    <result column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR" />
+    <result column="SEND_TYPE" property="sendType" jdbcType="VARCHAR" />
+    <result column="GROUP_ID" property="groupId" jdbcType="VARCHAR" />
+    <result column="GROUP_NAME" property="groupName" jdbcType="VARCHAR" />
+    <result column="OPERATE_ID" property="operateId" jdbcType="VARCHAR" />
+    <result column="OPERATE_NAME" property="operateName" jdbcType="VARCHAR" />
+    <result column="PUBLISH_DATE" property="publishDate" jdbcType="VARCHAR" />
+    <result column="PUBLISH_TIME" property="publishTime" jdbcType="VARCHAR" />
+    <result column="OPERATE_DATE" property="operateDate" jdbcType="VARCHAR" />
+    <result column="OPERATE_TIME" property="operateTime" jdbcType="VARCHAR" />
+    <result column="SEND_STATE" property="sendState" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    ID, ARTICLE_ID, PUBLISH_ID, SEND_TYPE, GROUP_ID, GROUP_NAME, OPERATE_ID, OPERATE_NAME, 
+    PUBLISH_DATE, PUBLISH_TIME, OPERATE_DATE, OPERATE_TIME, SEND_STATE
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ArticlePublishSendExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from article_publish_send
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from article_publish_send
+    where ID = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    delete from article_publish_send
+    where ID = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ArticlePublishSendExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    delete from article_publish_send
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ArticlePublishSend" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    insert into article_publish_send (ID, ARTICLE_ID, PUBLISH_ID, 
+      SEND_TYPE, GROUP_ID, GROUP_NAME, 
+      OPERATE_ID, OPERATE_NAME, PUBLISH_DATE, 
+      PUBLISH_TIME, OPERATE_DATE, OPERATE_TIME, 
+      SEND_STATE)
+    values (#{id,jdbcType=INTEGER}, #{articleId,jdbcType=INTEGER}, #{publishId,jdbcType=VARCHAR}, 
+      #{sendType,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{groupName,jdbcType=VARCHAR}, 
+      #{operateId,jdbcType=VARCHAR}, #{operateName,jdbcType=VARCHAR}, #{publishDate,jdbcType=VARCHAR}, 
+      #{publishTime,jdbcType=VARCHAR}, #{operateDate,jdbcType=VARCHAR}, #{operateTime,jdbcType=VARCHAR}, 
+      #{sendState,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ArticlePublishSend" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    insert into article_publish_send
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        ID,
+      </if>
+      <if test="articleId != null" >
+        ARTICLE_ID,
+      </if>
+      <if test="publishId != null" >
+        PUBLISH_ID,
+      </if>
+      <if test="sendType != null" >
+        SEND_TYPE,
+      </if>
+      <if test="groupId != null" >
+        GROUP_ID,
+      </if>
+      <if test="groupName != null" >
+        GROUP_NAME,
+      </if>
+      <if test="operateId != null" >
+        OPERATE_ID,
+      </if>
+      <if test="operateName != null" >
+        OPERATE_NAME,
+      </if>
+      <if test="publishDate != null" >
+        PUBLISH_DATE,
+      </if>
+      <if test="publishTime != null" >
+        PUBLISH_TIME,
+      </if>
+      <if test="operateDate != null" >
+        OPERATE_DATE,
+      </if>
+      <if test="operateTime != null" >
+        OPERATE_TIME,
+      </if>
+      <if test="sendState != null" >
+        SEND_STATE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="articleId != null" >
+        #{articleId,jdbcType=INTEGER},
+      </if>
+      <if test="publishId != null" >
+        #{publishId,jdbcType=VARCHAR},
+      </if>
+      <if test="sendType != null" >
+        #{sendType,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null" >
+        #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="groupName != null" >
+        #{groupName,jdbcType=VARCHAR},
+      </if>
+      <if test="operateId != null" >
+        #{operateId,jdbcType=VARCHAR},
+      </if>
+      <if test="operateName != null" >
+        #{operateName,jdbcType=VARCHAR},
+      </if>
+      <if test="publishDate != null" >
+        #{publishDate,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null" >
+        #{publishTime,jdbcType=VARCHAR},
+      </if>
+      <if test="operateDate != null" >
+        #{operateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="operateTime != null" >
+        #{operateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="sendState != null" >
+        #{sendState,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ArticlePublishSendExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    select count(*) from article_publish_send
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    update article_publish_send
+    <set >
+      <if test="record.id != null" >
+        ID = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.articleId != null" >
+        ARTICLE_ID = #{record.articleId,jdbcType=INTEGER},
+      </if>
+      <if test="record.publishId != null" >
+        PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sendType != null" >
+        SEND_TYPE = #{record.sendType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.groupId != null" >
+        GROUP_ID = #{record.groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.groupName != null" >
+        GROUP_NAME = #{record.groupName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operateId != null" >
+        OPERATE_ID = #{record.operateId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operateName != null" >
+        OPERATE_NAME = #{record.operateName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishDate != null" >
+        PUBLISH_DATE = #{record.publishDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishTime != null" >
+        PUBLISH_TIME = #{record.publishTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operateDate != null" >
+        OPERATE_DATE = #{record.operateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operateTime != null" >
+        OPERATE_TIME = #{record.operateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sendState != null" >
+        SEND_STATE = #{record.sendState,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    update article_publish_send
+    set ID = #{record.id,jdbcType=INTEGER},
+      ARTICLE_ID = #{record.articleId,jdbcType=INTEGER},
+      PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
+      SEND_TYPE = #{record.sendType,jdbcType=VARCHAR},
+      GROUP_ID = #{record.groupId,jdbcType=VARCHAR},
+      GROUP_NAME = #{record.groupName,jdbcType=VARCHAR},
+      OPERATE_ID = #{record.operateId,jdbcType=VARCHAR},
+      OPERATE_NAME = #{record.operateName,jdbcType=VARCHAR},
+      PUBLISH_DATE = #{record.publishDate,jdbcType=VARCHAR},
+      PUBLISH_TIME = #{record.publishTime,jdbcType=VARCHAR},
+      OPERATE_DATE = #{record.operateDate,jdbcType=VARCHAR},
+      OPERATE_TIME = #{record.operateTime,jdbcType=VARCHAR},
+      SEND_STATE = #{record.sendState,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ArticlePublishSend" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    update article_publish_send
+    <set >
+      <if test="articleId != null" >
+        ARTICLE_ID = #{articleId,jdbcType=INTEGER},
+      </if>
+      <if test="publishId != null" >
+        PUBLISH_ID = #{publishId,jdbcType=VARCHAR},
+      </if>
+      <if test="sendType != null" >
+        SEND_TYPE = #{sendType,jdbcType=VARCHAR},
+      </if>
+      <if test="groupId != null" >
+        GROUP_ID = #{groupId,jdbcType=VARCHAR},
+      </if>
+      <if test="groupName != null" >
+        GROUP_NAME = #{groupName,jdbcType=VARCHAR},
+      </if>
+      <if test="operateId != null" >
+        OPERATE_ID = #{operateId,jdbcType=VARCHAR},
+      </if>
+      <if test="operateName != null" >
+        OPERATE_NAME = #{operateName,jdbcType=VARCHAR},
+      </if>
+      <if test="publishDate != null" >
+        PUBLISH_DATE = #{publishDate,jdbcType=VARCHAR},
+      </if>
+      <if test="publishTime != null" >
+        PUBLISH_TIME = #{publishTime,jdbcType=VARCHAR},
+      </if>
+      <if test="operateDate != null" >
+        OPERATE_DATE = #{operateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="operateTime != null" >
+        OPERATE_TIME = #{operateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="sendState != null" >
+        SEND_STATE = #{sendState,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticlePublishSend" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Jun 04 15:03:08 CST 2020.
+    -->
+    update article_publish_send
+    set ARTICLE_ID = #{articleId,jdbcType=INTEGER},
+      PUBLISH_ID = #{publishId,jdbcType=VARCHAR},
+      SEND_TYPE = #{sendType,jdbcType=VARCHAR},
+      GROUP_ID = #{groupId,jdbcType=VARCHAR},
+      GROUP_NAME = #{groupName,jdbcType=VARCHAR},
+      OPERATE_ID = #{operateId,jdbcType=VARCHAR},
+      OPERATE_NAME = #{operateName,jdbcType=VARCHAR},
+      PUBLISH_DATE = #{publishDate,jdbcType=VARCHAR},
+      PUBLISH_TIME = #{publishTime,jdbcType=VARCHAR},
+      OPERATE_DATE = #{operateDate,jdbcType=VARCHAR},
+      OPERATE_TIME = #{operateTime,jdbcType=VARCHAR},
+      SEND_STATE = #{sendState,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticlePublishTrackMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticlePublishTrackMapper.xml
new file mode 100644
index 000000000..5e4180d82
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticlePublishTrackMapper.xml
@@ -0,0 +1,488 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ArticlePublishTrackMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticlePublishTrack" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    <id column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="USER_ID" property="userId" jdbcType="VARCHAR" />
+    <result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
+    <result column="ARTICLE_VERSION" property="articleVersion" jdbcType="VARCHAR" />
+    <result column="AD_ID" property="adId" jdbcType="VARCHAR" />
+    <result column="CARD_ID" property="cardId" jdbcType="VARCHAR" />
+    <result column="PUBLISH_VIEW_URL" property="publishViewUrl" jdbcType="VARCHAR" />
+    <result column="PUBLISH_EDIT_URL" property="publishEditUrl" jdbcType="VARCHAR" />
+    <result column="PUBLISH_STATE" property="publishState" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="BACKGROUND_EDIT_URL" property="backgroundEditUrl" jdbcType="VARCHAR" />
+    <result column="LIBRARY_STATE" property="libraryState" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    PUBLISH_ID, COMPANY_ID, USER_ID, ARTICLE_ID, AD_ID, CARD_ID, PUBLISH_VIEW_URL, PUBLISH_EDIT_URL, 
+    PUBLISH_STATE, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME, 
+    BACKGROUND_EDIT_URL, LIBRARY_STATE, ARTICLE_VERSION
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ArticlePublishTrackExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from article_publish_track
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from article_publish_track
+    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    delete from article_publish_track
+    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ArticlePublishTrackExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    delete from article_publish_track
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ArticlePublishTrack" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+ <!--    <selectKey resultType="java.lang.String" keyProperty="publishId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into article_publish_track (PUBLISH_ID, COMPANY_ID, USER_ID, 
+      ARTICLE_ID, AD_ID, CARD_ID, 
+      PUBLISH_VIEW_URL, PUBLISH_EDIT_URL, PUBLISH_STATE, 
+      CREATE_DATE, CREATE_TIME, CREATE_USER, 
+      UPDATE_USER, UPDATE_DATE, UPDATE_TIME, 
+      BACKGROUND_EDIT_URL, LIBRARY_STATE)
+    values (#{publishId,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, 
+      #{articleId,jdbcType=VARCHAR}, #{adId,jdbcType=VARCHAR}, #{cardId,jdbcType=VARCHAR}, 
+      #{publishViewUrl,jdbcType=VARCHAR}, #{publishEditUrl,jdbcType=VARCHAR}, #{publishState,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{updateUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}, 
+      #{backgroundEditUrl,jdbcType=VARCHAR}, #{libraryState,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ArticlePublishTrack" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.String" keyProperty="publishId" order="AFTER" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>  -->
+    insert into article_publish_track
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      PUBLISH_ID,
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="userId != null" >
+        USER_ID,
+      </if>
+      <if test="articleId != null" >
+        ARTICLE_ID,
+      </if>
+      <if test="articleVersion != null">
+        ARTICLE_VERSION,
+      </if>
+      <if test="adId != null" >
+        AD_ID,
+      </if>
+      <if test="cardId != null" >
+        CARD_ID,
+      </if>
+      <if test="publishViewUrl != null" >
+        PUBLISH_VIEW_URL,
+      </if>
+      <if test="publishEditUrl != null" >
+        PUBLISH_EDIT_URL,
+      </if>
+      <if test="publishState != null" >
+        PUBLISH_STATE,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="backgroundEditUrl != null" >
+        BACKGROUND_EDIT_URL,
+      </if>
+      <if test="libraryState != null" >
+        LIBRARY_STATE,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{publishId,jdbcType=VARCHAR},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null" >
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="articleId != null" >
+        #{articleId,jdbcType=VARCHAR},
+      </if>
+      <if test="articleVersion != null">
+        #{articleVersion,jdbcType=VARCHAR},
+      </if>
+      <if test="adId != null" >
+        #{adId,jdbcType=VARCHAR},
+      </if>
+      <if test="cardId != null" >
+        #{cardId,jdbcType=VARCHAR},
+      </if>
+      <if test="publishViewUrl != null" >
+        #{publishViewUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="publishEditUrl != null" >
+        #{publishEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="publishState != null" >
+        #{publishState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="backgroundEditUrl != null" >
+        #{backgroundEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="libraryState != null" >
+        #{libraryState,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ArticlePublishTrackExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    select count(*) from article_publish_track
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    update article_publish_track
+    <set >
+      <if test="record.publishId != null" >
+        PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userId != null" >
+        USER_ID = #{record.userId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.articleId != null" >
+        ARTICLE_ID = #{record.articleId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adId != null" >
+        AD_ID = #{record.adId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cardId != null" >
+        CARD_ID = #{record.cardId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishViewUrl != null" >
+        PUBLISH_VIEW_URL = #{record.publishViewUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishEditUrl != null" >
+        PUBLISH_EDIT_URL = #{record.publishEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishState != null" >
+        PUBLISH_STATE = #{record.publishState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.backgroundEditUrl != null" >
+        BACKGROUND_EDIT_URL = #{record.backgroundEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.libraryState != null" >
+        LIBRARY_STATE = #{record.libraryState,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    update article_publish_track
+    set PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      USER_ID = #{record.userId,jdbcType=VARCHAR},
+      ARTICLE_ID = #{record.articleId,jdbcType=VARCHAR},
+      AD_ID = #{record.adId,jdbcType=VARCHAR},
+      CARD_ID = #{record.cardId,jdbcType=VARCHAR},
+      PUBLISH_VIEW_URL = #{record.publishViewUrl,jdbcType=VARCHAR},
+      PUBLISH_EDIT_URL = #{record.publishEditUrl,jdbcType=VARCHAR},
+      PUBLISH_STATE = #{record.publishState,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      BACKGROUND_EDIT_URL = #{record.backgroundEditUrl,jdbcType=VARCHAR},
+      LIBRARY_STATE = #{record.libraryState,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ArticlePublishTrack" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    update article_publish_track
+    <set >
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null" >
+        USER_ID = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="articleId != null" >
+        ARTICLE_ID = #{articleId,jdbcType=VARCHAR},
+      </if>
+      <if test="adId != null" >
+        AD_ID = #{adId,jdbcType=VARCHAR},
+      </if>
+      <if test="cardId != null" >
+        CARD_ID = #{cardId,jdbcType=VARCHAR},
+      </if>
+      <if test="publishViewUrl != null" >
+        PUBLISH_VIEW_URL = #{publishViewUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="publishEditUrl != null" >
+        PUBLISH_EDIT_URL = #{publishEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="publishState != null" >
+        PUBLISH_STATE = #{publishState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="backgroundEditUrl != null" >
+        BACKGROUND_EDIT_URL = #{backgroundEditUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="libraryState != null" >
+        LIBRARY_STATE = #{libraryState,jdbcType=VARCHAR},
+      </if>
+      <if test="articleVersion != null" >
+        ARTICLE_VERSION = #{articleVersion,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticlePublishTrack" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Jul 27 10:31:00 CST 2018.
+    -->
+    update article_publish_track
+    set COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      USER_ID = #{userId,jdbcType=VARCHAR},
+      ARTICLE_ID = #{articleId,jdbcType=VARCHAR},
+      AD_ID = #{adId,jdbcType=VARCHAR},
+      CARD_ID = #{cardId,jdbcType=VARCHAR},
+      PUBLISH_VIEW_URL = #{publishViewUrl,jdbcType=VARCHAR},
+      PUBLISH_EDIT_URL = #{publishEditUrl,jdbcType=VARCHAR},
+      PUBLISH_STATE = #{publishState,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      BACKGROUND_EDIT_URL = #{backgroundEditUrl,jdbcType=VARCHAR},
+      LIBRARY_STATE = #{libraryState,jdbcType=VARCHAR}
+    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticlePublishTrackQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticlePublishTrackQueryMapper.xml
new file mode 100644
index 000000000..d1e52aa7f
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticlePublishTrackQueryMapper.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper
+	namespace="com.ruoyi.content.mapper.ArticlePublishTrackQueryMapper">
+
+
+	<resultMap id="BaseResultMap"
+		type="com.ruoyi.content.domain.ArticlePublishTrack">
+		<!-- WARNING - @mbggenerated This element is automatically generated by 
+			MyBatis Generator, do not modify. This element was generated on Tue Jul 10 
+			14:07:08 CST 2018. -->
+		<id column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR" />
+		<result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+		<result column="USER_ID" property="userId" jdbcType="VARCHAR" />
+		<result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
+		<result column="AD_ID" property="adId" jdbcType="VARCHAR" />
+		<result column="CARD_ID" property="cardId" jdbcType="VARCHAR" />
+		<result column="ARTICLE_VERSION" property="articleVersion"
+			jdbcType="VARCHAR" />
+		<result column="PUBLISH_VIEW_URL" property="publishViewUrl"
+			jdbcType="VARCHAR" />
+		<result column="PUBLISH_EDIT_URL" property="publishEditUrl"
+			jdbcType="VARCHAR" />
+		<result column="PUBLISH_STATE" property="publishState"
+			jdbcType="VARCHAR" />
+		<result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+		<result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+		<result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+		<result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+		<result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+		<result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+		<result column="BACKGROUND_EDIT_URL" property="backgroundEditUrl"
+			jdbcType="VARCHAR" />
+		<result column="LIBRARY_STATE" property="libraryState"
+			jdbcType="VARCHAR" />
+	</resultMap>
+
+	<select id="queryEditUrlByArticleId" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		SELECT PUBLISH_ID, USER_ID, ARTICLE_ID, AD_ID, CARD_ID,
+		PUBLISH_VIEW_URL,
+		PUBLISH_EDIT_URL,
+		PUBLISH_STATE, CREATE_DATE,
+		CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE,
+		UPDATE_TIME
+		FROM
+		article_publish_track where ARTICLE_ID =
+		#{articleId,jdbcType=VARCHAR}
+		AND PUBLISH_ID =
+		#{puhlishId,jdbcType=VARCHAR}
+	</select>
+
+	<select id="queryPublishUserInfo" resultMap="BaseResultMap">
+		SELECT
+		PUBLISH_ID,
+		COMPANY_ID,
+		USER_ID,
+		ARTICLE_ID,
+		AD_ID,
+		CARD_ID,
+		PUBLISH_VIEW_URL,
+		PUBLISH_EDIT_URL,
+		PUBLISH_STATE,
+		CREATE_DATE,
+		CREATE_TIME,
+		CREATE_USER,
+		UPDATE_USER,
+		UPDATE_DATE,
+		UPDATE_TIME
+		FROM
+		article_publish_track
+		WHERE
+		ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
+		ORDER BY CREATE_DATE
+		DESC,CREATE_TIME DESC
+		limit
+		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>
+
+	<select id="queryArticleIdByUserId" resultMap="BaseResultMap">
+		SELECT
+		PUBLISH_ID, COMPANY_ID, USER_ID, ARTICLE_ID, AD_ID, CARD_ID,
+		PUBLISH_VIEW_URL,ARTICLE_VERSION,
+		PUBLISH_EDIT_URL,
+		PUBLISH_STATE, CREATE_DATE,
+		CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE,
+		UPDATE_TIME,
+		BACKGROUND_EDIT_URL, LIBRARY_STATE
+		FROM
+		article_publish_track WHERE 1=1
+		and PUBLISH_STATE=0
+		<if test="userId != null">
+			and USER_ID in
+			<foreach collection="userId" item="userId" index="index"
+				open="(" close=")" separator=","> #{userId} </foreach>
+		</if>
+		ORDER BY CREATE_DATE DESC,CREATE_TIME DESC
+		limit
+		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>
+
+	<select id="countArticleIdByUserId" resultType="java.lang.Integer">
+		SELECT
+		count(1)
+		FROM
+		article_publish_track WHERE 1=1
+		<if test="userId != null">
+			and USER_ID in
+			<foreach collection="userId" item="userId" index="index"
+				open="(" close=")" separator=","> #{userId} </foreach>
+		</if>
+	</select>
+
+
+	<select id="queryByPublishId" resultMap="BaseResultMap">
+		SELECT PUBLISH_ID, USER_ID, ARTICLE_ID, AD_ID, CARD_ID,
+		PUBLISH_VIEW_URL,
+		PUBLISH_EDIT_URL,
+		PUBLISH_STATE, CREATE_DATE,
+		CREATE_TIME, CREATE_USER,
+		UPDATE_USER, UPDATE_DATE,
+		UPDATE_TIME
+		FROM
+		article_publish_track where
+		PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
+	</select>
+
+	<select id="queryArticleinfo" resultMap="BaseResultMap">
+		SELECT PUBLISH_ID, USER_ID, ARTICLE_ID, AD_ID, CARD_ID,
+		PUBLISH_VIEW_URL,
+		PUBLISH_EDIT_URL,
+		PUBLISH_STATE, CREATE_DATE,
+		CREATE_TIME, CREATE_USER,
+		UPDATE_USER, UPDATE_DATE,
+		UPDATE_TIME
+		FROM
+		article_publish_track where
+		ARTICLE_ID=#{articleId,jdbcType=VARCHAR} and PUBLISH_ID like 'cofms%'
+	</select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml
new file mode 100644
index 000000000..2fd5e5d84
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ArticleQueryMapper">
+	<resultMap id="PublishedArticlesMap"
+		type="com.ruoyi.content.domain.PublishedArticleInfo">
+		<result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
+		<result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR" />
+		<result column="PUSH_DATE" property="pushDate" jdbcType="VARCHAR" />
+		<result column="ARTICLE_AUTHOR" property="articleAuthor"
+			jdbcType="VARCHAR" />
+		<result column="SPECIAL" property="special" jdbcType="VARCHAR" />
+		<result column="CHANNEL_ID" property="channelId" jdbcType="VARCHAR" />
+		<result column="ARTICLE_STATE" property="articleState"
+			jdbcType="VARCHAR" />
+		<result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+		<result column="ORIGINAL_URL" property="originalUrl" jdbcType="VARCHAR" />
+		<result column="SHARE_TITLE" property="shareTitle" jdbcType="VARCHAR" />
+		<result column="SHARE_DES" property="shareDes" jdbcType="VARCHAR" />
+		<result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+		<result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+		<result column="MODIFIED_EDIT_URL" property="modifiedEditUrl"
+			jdbcType="VARCHAR" />
+		<result column="MODIFIED_VIEW_URL" property="modifiedViewUrl"
+			jdbcType="VARCHAR" />
+		<result column="VISITOR_COUNT" property="visitorCount"
+			jdbcType="VARCHAR" />
+		<result column="SHARE_COUNT" property="shareCount" jdbcType="VARCHAR" />
+	</resultMap>
+
+	<resultMap id="BaseResultMap"
+		type="com.ruoyi.content.domain.ArticleInfo">
+		<!-- WARNING - @mbggenerated This element is automatically generated by 
+			MyBatis Generator, do not modify. This element was generated on Fri May 25 
+			15:02:37 CST 2018. -->
+		<id column="ARTICLE_ID" property="articleId" jdbcType="INTEGER" />
+		<result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR" />
+		<result column="PUSH_DATE" property="pushDate" jdbcType="VARCHAR" />
+		<result column="ARTICLE_AUTHOR" property="articleAuthor"
+			jdbcType="VARCHAR" />
+		<result column="ARTICLE_EDIT_URL" property="articleEditUrl"
+			jdbcType="VARCHAR" />
+		<result column="ARTICLE_VIEW_URL" property="articleViewUrl"
+			jdbcType="VARCHAR" />
+		<result column="LIST_PIC_URL" property="listPicUrl" jdbcType="VARCHAR" />
+		<result column="SPECIAL" property="special" jdbcType="VARCHAR" />
+		<result column="CHANNEL_ID" property="channelId" jdbcType="VARCHAR" />
+		<result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+		<result column="ORIGINAL_URL" property="originalUrl" jdbcType="VARCHAR" />
+		<result column="SHARE_IMG_URL" property="shareImgUrl" jdbcType="VARCHAR" />
+		<result column="SHARE_TITLE" property="shareTitle" jdbcType="VARCHAR" />
+		<result column="ARTICLE_STATE" property="articleState"
+			jdbcType="VARCHAR" />
+		<result column="SHARE_DES" property="shareDes" jdbcType="VARCHAR" />
+		<result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+		<result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+		<result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+		<result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+		<result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+		<result column="MODIFIED_EDIT_URL" property="modifiedEditUrl"
+			jdbcType="VARCHAR" />
+		<result column="MODIFIED_VIEW_URL" property="modifiedViewUrl"
+			jdbcType="VARCHAR" />
+	</resultMap>
+	<resultMap id="CompanyArticlesMap"
+		type="com.ruoyi.content.domain.CompanyArticleInfo">
+		<result column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR" />
+		<result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
+		<result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR" />
+		<result column="LIST_PIC_URL" property="listPicUrl" jdbcType="VARCHAR" />
+		<result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+		<result column="VISITOR_COUNT" property="visitorCount"
+			jdbcType="VARCHAR" />
+		<result column="SHARED_COUNT" property="sharedCount" jdbcType="VARCHAR" />
+		<result column="PUBLISH_VIEW_URL" property="publishViewUrl"
+			jdbcType="VARCHAR" />
+	</resultMap>
+	<!-- 根据文章主键集合查询文章对应的所有标签集合 -->
+	<resultMap id="ArticleLabelRelDTOMap"
+		type="com.ruoyi.content.domain.ArticleLabelRelDTO">
+		<result column="ARTICLE_ID" property="articleId" jdbcType="INTEGER" />
+		<result column="LABEL_NAME" property="labelName" jdbcType="VARCHAR" />
+		<result column="LABEL_ID" property="labelId" jdbcType="INTEGER" />
+	</resultMap>
+	<!-- 查询文章列表 -->
+	<sql id="countVisitorSQL">
+		SELECT COUNT(ct.CLICK_USER_ID)
+		FROM click_track_info ct
+		WHERE ct.PUBLISH_USER_ID = ap.USER_ID AND ct.ARTICLE_ID =
+		ap.ARTICLE_ID
+	</sql>
+
+	<sql id="countSharedSQL">
+		SELECT COUNT(ct.CLICK_USER_ID)
+		FROM click_track_info ct
+		WHERE ct.PUBLISH_USER_ID = ap.USER_ID AND ct.ARTICLE_ID =
+		ap.ARTICLE_ID AND
+		ct.SHARE_STATE!='0'
+	</sql>
+	<sql id="pageVisitorSQL">
+		SELECT COUNT(ct.CLICK_ID)
+		FROM click_track_info ct
+		WHERE
+		ct.ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
+	</sql>
+
+	<sql id="sharedSQL">
+		SELECT COUNT(FORWARD_ID)
+		FROM article_forward_track aft
+		WHERE aft.ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
+	</sql>
+	<resultMap id="PublishedDetailsMap"
+		type="com.ruoyi.content.domain.ArticeClickInfo">
+		<result column="CLICK_USER_NICKNAME" property="clickUserNickname"
+			jdbcType="VARCHAR" />
+		<result column="CLICK_USER_HEADIMGURL" property="clickUserHeadimgurl"
+			jdbcType="VARCHAR" />
+		<result column="SHARE_STATE" property="shareState" jdbcType="VARCHAR" />
+		<result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+		<result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+		<result column="WATCH_TIME" property="watchTime" jdbcType="VARCHAR" />
+	</resultMap>
+
+	<!-- 查询我的发布列表 -->
+	<!-- <select id="queryAllPublishedArticles" resultMap="PublishedArticlesMap" 
+		parameterType="java.lang.String"> SELECT ap.PUBLISH_ID,ap.ARTICLE_ID,ai.ARTICLE_NAME,ai.LIST_PIC_URL,ap.CREATE_DATE 
+		, ( <include refid="countVisitorSQL" /> ) as VISITOR_COUNT, ( <include refid="countSharedSQL" 
+		/> ) as SHARED_COUNT FROM article_publish_track ap, article_info ai WHERE 
+		ap.USER_ID = #{userId,jdbcType=VARCHAR} AND ap.ARTICLE_ID = ai.ARTICLE_ID 
+		ORDER BY ap.CREATE_DATE,ap.CREATE_TIME </select> -->
+
+	<!-- 查询单条文章浏览详情 -->
+	<select id="queryPublishedById" resultMap="PublishedArticlesMap"
+		parameterType="java.lang.String">
+		SELECT
+		ap.PUBLISH_ID,ap.ARTICLE_ID,ai.ARTICLE_NAME,ai.LIST_PIC_URL,ap.CREATE_DATE
+		,
+		(
+		<include refid="countVisitorSQL" />
+		) as VISITOR_COUNT,
+		(
+		<include refid="countSharedSQL" />
+		) as SHARED_COUNT
+		FROM article_publish_track ap, article_info ai
+		WHERE
+		ap.USER_ID = #{userId,jdbcType=VARCHAR}
+		AND ap.ARTICLE_ID =
+		#{articleId,jdbcType=VARCHAR}
+		AND ai.ARTICLE_ID =
+		#{articleId,jdbcType=VARCHAR}
+	</select>
+
+	<!-- 查询浏览详情 -->
+	<select id="queryPublishedDetails" resultMap="PublishedDetailsMap"
+		parameterType="java.lang.String">
+		SELECT
+		ct.CLICK_USER_NICKNAME,ct.WATCH_TIME,ct.CREATE_DATE,ct.CREATE_TIME,ct.SHARE_STATE,
+		CLICK_USER_HEADIMGURL
+		FROM click_track_info ct
+		WHERE ct.PUBLISH_USER_ID=
+		#{userId,jdbcType=VARCHAR} AND ct.ARTICLE_ID
+		=#{articleId,jdbcType=VARCHAR}
+	</select>
+
+	<!-- 根据连接查询文章是否存在 -->
+	<select id="queryArticleByUrl" resultType="java.lang.Integer"
+		parameterType="java.lang.String">
+		SELECT COUNT(1) FROM article_info
+		WHERE ORIGINAL_URL =
+		#{originalUrl,jdbcType=VARCHAR}
+	</select>
+
+	<!-- 根据文章的url和创建人查该条数据 -->
+	<select id="queryArticleInfoByCompanyId" resultMap="BaseResultMap"
+		parameterType="java.lang.String">
+		SELECT ARTICLE_ID, ARTICLE_NAME, PUSH_DATE,
+		ARTICLE_AUTHOR, ARTICLE_EDIT_URL, ARTICLE_VIEW_URL,
+		LIST_PIC_URL,
+		SPECIAL, CHANNEL_ID, COMPANY_ID, ORIGINAL_URL, SHARE_IMG_URL,
+		SHARE_TITLE,
+		ARTICLE_STATE, SHARE_DES, CREATE_DATE, CREATE_TIME,
+		CREATE_USER, UPDATE_DATE,
+		UPDATE_TIME,
+		MODIFIED_EDIT_URL,
+		MODIFIED_VIEW_URL
+		FROM article_info
+		WHERE COMPANY_ID
+		=
+		#{companyId,jdbcType=VARCHAR} AND
+		ORIGINAL_URL =
+		#{originalUrl,jdbcType=VARCHAR}
+	</select>
+
+	<!-- 更新个人已经发布过的文章 -->
+	<update id="updatePublishedArticle" parameterType="java.util.Map">
+		UPDATE article_info ai,article_publish_track ap
+		set ap.UPDATE_DATE =
+		#{updateDate,jdbcType=VARCHAR},ap.UPDATE_TIME =
+		#{updateTime,jdbcType=VARCHAR}
+		<if test="companyId == null or companyId == ''">
+			,ai.ARTICLE_CONTENT =
+			#{articleContent,jdbcType=LONGVARCHAR}
+		</if>
+		<if test="shareTitle != null and shareTitle != ''">
+			,ai.SHARE_TITLE = #{shareTitle,jdbcType=VARCHAR}
+		</if>
+		<if test="articleName != null and articleName != ''">
+			,ai.ARTICLE_NAME = #{articleName,jdbcType=VARCHAR}
+		</if>
+		<if test="adId != null and adId != ''">
+			,ap.AD_ID = #{adId,jdbcType=VARCHAR}
+		</if>
+		<if test="cardId != null and adId != ''">
+			,ap.CARD_ID = #{cardId,jdbcType=VARCHAR}
+		</if>
+		WHERE ai.ARTICLE_ID=ap.ARTICLE_ID AND ap.PUBLISH_ID =
+		#{publishId,jdbcType=VARCHAR}
+	</update>
+
+	<select id="selectAllWithLimit"
+		parameterType="com.ruoyi.content.domain.PublishedArticleInfo"
+		resultMap="PublishedArticlesMap">
+		SELECT
+		ai.ARTICLE_ID,
+		ai.ARTICLE_NAME,
+		ai.PUSH_DATE,
+		ai.ARTICLE_AUTHOR,
+		ai.LIST_PIC_URL,
+		ai.SPECIAL,
+		ai.CHANNEL_ID,
+		ai.COMPANY_ID,
+		ai.ORIGINAL_URL,
+		ai.SHARE_IMG_URL,
+		ai.SHARE_TITLE,
+		ai.ARTICLE_STATE,
+		ai.SHARE_DES,
+		ai.CREATE_DATE,
+		ai.CREATE_TIME,
+		ai.CREATE_USER,
+		ai.UPDATE_DATE,
+		ai.UPDATE_TIME,
+		ai.MODIFIED_EDIT_URL,
+		ai.MODIFIED_VIEW_URL
+		<!-- , ( <include refid="pageVisitorSQL" /> ) AS VISITOR_COUNT, ( <include 
+			refid="sharedSQL" /> ) AS SHARE_COUNT -->
+		FROM
+		article_info ai WHERE 1=1
+		<if test="articelName != null and articelName!=''">
+			and ai.ARTICLE_NAME like CONCAT(CONCAT('%', #{articelName,
+			jdbcType=VARCHAR}), '%') </if>
+		<if test="articelAuthor != null and articelAuthor!=''">
+			and ai.ARTICLE_AUTHOR like CONCAT(CONCAT('%',
+			#{articelAuthor,
+			jdbcType=VARCHAR}), '%') </if>
+		<if test="special != null and special!=''">
+			and ai.SPECIAL = #{special,jdbcType=VARCHAR}
+		</if>
+		<if test="channelId != null and channelId !=''">
+			and ai.CHANNEL_ID = #{channelId,jdbcType=VARCHAR}
+		</if>
+		<if test="companyId != null and companyId !=''">
+			and ai.COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+		</if>
+		<if test="articleState != null">
+			and ai.ARTICLE_STATE in
+			<foreach collection="articleState" item="articleState" index="index"
+				open="(" close=")" separator=","> #{articleState} </foreach>
+		</if>
+		order by ai.CREATE_DATE DESC,ai.CREATE_TIME DESC, ai.UPDATE_DATE
+		DESC,ai.UPDATE_TIME DESC
+		limit
+		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>
+
+
+
+
+	<select id="queryModifiedEditUrlByArticleId" resultMap="BaseResultMap"
+		parameterType="java.lang.Integer">
+		select ARTICLE_ID, ARTICLE_NAME, PUSH_DATE,
+		ARTICLE_AUTHOR, ARTICLE_EDIT_URL,
+		ARTICLE_VIEW_URL,
+		LIST_PIC_URL,
+		SPECIAL, CHANNEL_ID, COMPANY_ID, ORIGINAL_URL, SHARE_IMG_URL,
+		SHARE_TITLE,
+		ARTICLE_STATE, SHARE_DES, CREATE_DATE, CREATE_TIME,
+		CREATE_USER, UPDATE_DATE,
+		UPDATE_TIME,
+		MODIFIED_EDIT_URL,
+		MODIFIED_VIEW_URL from article_info where ARTICLE_ID =
+		#{articleId,jdbcType=INTEGER}
+	</select>
+
+	<!-- 单条查询公司发布文章 -->
+	<select id="queryCompanyArticleById" resultMap="CompanyArticlesMap">
+		SELECT
+		apt.PUBLISH_ID,apt.ARTICLE_ID,apt.PUBLISH_VIEW_URL,ai.ARTICLE_NAME,ai.LIST_PIC_URL,apt.CREATE_DATE
+		,
+		(
+		<include refid="pageVisitorSQL" />
+		) as VISITOR_COUNT,
+		(
+		<include refid="sharedSQL" />
+		) as SHARED_COUNT
+		FROM article_publish_track apt, article_info ai
+		WHERE
+		apt.PUBLISH_ID =#{publishId,jdbcType=VARCHAR}
+		AND ai.ARTICLE_ID =
+		#{articleId,jdbcType=VARCHAR}
+	</select>
+
+	<!-- 根据文章主键集合查询文章对应的所有标签集合 -->
+	<select id="findArticleLabelRelByArticleIds" resultMap="ArticleLabelRelDTOMap"
+		parameterType="java.util.ArrayList">
+		SELECT
+		r.ARTICLE_ID,lab.label_id,lab.LABEL_NAME
+		FROM
+		article_label_relationship r
+		INNER JOIN article_label lab ON
+		lab.LABEL_ID = r.LABEL_ID
+		WHERE
+		r.ARTICLE_ID IN
+		<foreach collection="articelId" item="id" index="index" open="("
+			close=")" separator=",">
+			#{id}
+		</foreach>
+	</select>
+	
+	<resultMap id="noSendResult" type="com.ruoyi.content.domain.ArticlePublishSend">
+		<id column="ID" property="id" jdbcType="INTEGER" />
+	    <result column="ARTICLE_ID" property="articleId" jdbcType="INTEGER" />
+	    <result column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR" />
+	    <result column="SEND_TYPE" property="sendType" jdbcType="VARCHAR" />
+	    <result column="GROUP_ID" property="groupId" jdbcType="VARCHAR" />
+	    <result column="GROUP_NAME" property="groupName" jdbcType="VARCHAR" />
+	    <result column="OPERATE_ID" property="operateId" jdbcType="VARCHAR" />
+	    <result column="OPERATE_NAME" property="operateName" jdbcType="VARCHAR" />
+	    <result column="PUBLISH_DATE" property="publishDate" jdbcType="VARCHAR" />
+	    <result column="PUBLISH_TIME" property="publishTime" jdbcType="VARCHAR" />
+	    <result column="OPERATE_DATE" property="operateDate" jdbcType="VARCHAR" />
+	    <result column="OPERATE_TIME" property="operateTime" jdbcType="VARCHAR" />
+	    <result column="SEND_STATE" property="sendState" jdbcType="VARCHAR" />
+	</resultMap>
+	
+	<select id="noSendPublishArticle" parameterType="map" resultMap="noSendResult">
+		SELECT
+		   ID,
+		   ARTICLE_ID,
+		   PUBLISH_ID,
+		   SEND_TYPE,
+		   GROUP_ID,
+		   GROUP_NAME,
+		   OPERATE_ID,
+		   OPERATE_NAME,
+		   PUBLISH_DATE,
+		   PUBLISH_TIME,
+		   OPERATE_DATE,
+		   OPERATE_TIME,
+		   SEND_STATE
+		FROM
+		article_publish_send WHERE 1=1
+		<if test="articleId != null and articleId !=''">
+			and ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
+		</if>
+		<if test="publishId != null and publishId !=''">
+			and PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
+		</if>
+		<if test="sendState != null and sendState !=''">
+			and SEND_STATE = #{sendState,jdbcType=VARCHAR}
+		</if>
+		order by PUBLISH_DATE desc,PUBLISH_TIME desc
+		limit
+		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>
+	
+	
+	
+	
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleSendUrlMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleSendUrlMapper.xml
new file mode 100644
index 000000000..8e3dd8f5d
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleSendUrlMapper.xml
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ArticleSendUrlMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticleSendUrl" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    <id column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR" />
+    <result column="VERSION_NUMBER" property="versionNumber" jdbcType="VARCHAR" />
+    <result column="QYH_ARTICLE_URL" property="qyhArticleUrl" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    PUBLISH_ID, VERSION_NUMBER, QYH_ARTICLE_URL, CREATE_DATE, CREATE_TIME, CREATE_USER, 
+    UPDATE_USER, UPDATE_DATE, UPDATE_TIME
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ArticleSendUrlExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from article_send_url
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from article_send_url
+    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    delete from article_send_url
+    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ArticleSendUrlExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    delete from article_send_url
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ArticleSendUrl" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.String" keyProperty="publishId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into article_send_url (PUBLISH_ID, VERSION_NUMBER, QYH_ARTICLE_URL, 
+      CREATE_DATE, CREATE_TIME, CREATE_USER, 
+      UPDATE_USER, UPDATE_DATE, UPDATE_TIME
+      )
+    values (#{publishId,jdbcType=VARCHAR}, #{versionNumber,jdbcType=VARCHAR}, #{qyhArticleUrl,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{updateUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ArticleSendUrl" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.String" keyProperty="publishId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into article_send_url
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      PUBLISH_ID,
+      <if test="versionNumber != null" >
+        VERSION_NUMBER,
+      </if>
+      <if test="qyhArticleUrl != null" >
+        QYH_ARTICLE_URL,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{publishId,jdbcType=VARCHAR},
+      <if test="versionNumber != null" >
+        #{versionNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="qyhArticleUrl != null" >
+        #{qyhArticleUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ArticleSendUrlExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    select count(*) from article_send_url
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    update article_send_url
+    <set >
+      <if test="record.publishId != null" >
+        PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.versionNumber != null" >
+        VERSION_NUMBER = #{record.versionNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qyhArticleUrl != null" >
+        QYH_ARTICLE_URL = #{record.qyhArticleUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    update article_send_url
+    set PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
+      VERSION_NUMBER = #{record.versionNumber,jdbcType=VARCHAR},
+      QYH_ARTICLE_URL = #{record.qyhArticleUrl,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ArticleSendUrl" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    update article_send_url
+    <set >
+      <if test="versionNumber != null" >
+        VERSION_NUMBER = #{versionNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="qyhArticleUrl != null" >
+        QYH_ARTICLE_URL = #{qyhArticleUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticleSendUrl" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 04 17:49:40 CST 2018.
+    -->
+    update article_send_url
+    set VERSION_NUMBER = #{versionNumber,jdbcType=VARCHAR},
+      QYH_ARTICLE_URL = #{qyhArticleUrl,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
+    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/AttachmentInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/AttachmentInfoMapper.xml
new file mode 100644
index 000000000..2756499af
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/AttachmentInfoMapper.xml
@@ -0,0 +1,430 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.AttachmentInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.AttachmentInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <id column="FILE_ID" property="fileId" jdbcType="INTEGER" />
+    <result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
+    <result column="FILE_NAME" property="fileName" jdbcType="VARCHAR" />
+    <result column="FILE_OSSID" property="fileOssid" jdbcType="VARCHAR" />
+    <result column="FILE_PATH" property="filePath" jdbcType="VARCHAR" />
+    <result column="FILE_URL" property="fileUrl" jdbcType="VARCHAR" />
+    <result column="FILE_TYPE" property="fileType" jdbcType="VARCHAR" />
+    <result column="RELATION_TYPE" property="relationType" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="REMARK" property="remark" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    FILE_ID, ARTICLE_ID, FILE_NAME, FILE_OSSID, FILE_PATH, FILE_URL, FILE_TYPE, RELATION_TYPE, 
+    CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_DATE, UPDATE_TIME, REMARK
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.AttachmentInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from attachment_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from attachment_info
+    where FILE_ID = #{fileId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    delete from attachment_info
+    where FILE_ID = #{fileId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.AttachmentInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    delete from attachment_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.AttachmentInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="fileId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into attachment_info (FILE_ID, ARTICLE_ID, FILE_NAME, 
+      FILE_OSSID, FILE_PATH, FILE_URL, 
+      FILE_TYPE, RELATION_TYPE, CREATE_DATE, 
+      CREATE_TIME, CREATE_USER, UPDATE_DATE, 
+      UPDATE_TIME, REMARK)
+    values (#{fileId,jdbcType=INTEGER}, #{articleId,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, 
+      #{fileOssid,jdbcType=VARCHAR}, #{filePath,jdbcType=VARCHAR}, #{fileUrl,jdbcType=VARCHAR}, 
+      #{fileType,jdbcType=VARCHAR}, #{relationType,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.AttachmentInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="fileId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into attachment_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      FILE_ID,
+      <if test="articleId != null" >
+        ARTICLE_ID,
+      </if>
+      <if test="fileName != null" >
+        FILE_NAME,
+      </if>
+      <if test="fileOssid != null" >
+        FILE_OSSID,
+      </if>
+      <if test="filePath != null" >
+        FILE_PATH,
+      </if>
+      <if test="fileUrl != null" >
+        FILE_URL,
+      </if>
+      <if test="fileType != null" >
+        FILE_TYPE,
+      </if>
+      <if test="relationType != null" >
+        RELATION_TYPE,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="remark != null" >
+        REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{fileId,jdbcType=INTEGER},
+      <if test="articleId != null" >
+        #{articleId,jdbcType=VARCHAR},
+      </if>
+      <if test="fileName != null" >
+        #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="fileOssid != null" >
+        #{fileOssid,jdbcType=VARCHAR},
+      </if>
+      <if test="filePath != null" >
+        #{filePath,jdbcType=VARCHAR},
+      </if>
+      <if test="fileUrl != null" >
+        #{fileUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="fileType != null" >
+        #{fileType,jdbcType=VARCHAR},
+      </if>
+      <if test="relationType != null" >
+        #{relationType,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        #{remark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.AttachmentInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select count(*) from attachment_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update attachment_info
+    <set >
+      <if test="record.fileId != null" >
+        FILE_ID = #{record.fileId,jdbcType=INTEGER},
+      </if>
+      <if test="record.articleId != null" >
+        ARTICLE_ID = #{record.articleId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileName != null" >
+        FILE_NAME = #{record.fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileOssid != null" >
+        FILE_OSSID = #{record.fileOssid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.filePath != null" >
+        FILE_PATH = #{record.filePath,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileUrl != null" >
+        FILE_URL = #{record.fileUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fileType != null" >
+        FILE_TYPE = #{record.fileType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.relationType != null" >
+        RELATION_TYPE = #{record.relationType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.remark != null" >
+        REMARK = #{record.remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update attachment_info
+    set FILE_ID = #{record.fileId,jdbcType=INTEGER},
+      ARTICLE_ID = #{record.articleId,jdbcType=VARCHAR},
+      FILE_NAME = #{record.fileName,jdbcType=VARCHAR},
+      FILE_OSSID = #{record.fileOssid,jdbcType=VARCHAR},
+      FILE_PATH = #{record.filePath,jdbcType=VARCHAR},
+      FILE_URL = #{record.fileUrl,jdbcType=VARCHAR},
+      FILE_TYPE = #{record.fileType,jdbcType=VARCHAR},
+      RELATION_TYPE = #{record.relationType,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      REMARK = #{record.remark,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.AttachmentInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update attachment_info
+    <set >
+      <if test="articleId != null" >
+        ARTICLE_ID = #{articleId,jdbcType=VARCHAR},
+      </if>
+      <if test="fileName != null" >
+        FILE_NAME = #{fileName,jdbcType=VARCHAR},
+      </if>
+      <if test="fileOssid != null" >
+        FILE_OSSID = #{fileOssid,jdbcType=VARCHAR},
+      </if>
+      <if test="filePath != null" >
+        FILE_PATH = #{filePath,jdbcType=VARCHAR},
+      </if>
+      <if test="fileUrl != null" >
+        FILE_URL = #{fileUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="fileType != null" >
+        FILE_TYPE = #{fileType,jdbcType=VARCHAR},
+      </if>
+      <if test="relationType != null" >
+        RELATION_TYPE = #{relationType,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="remark != null" >
+        REMARK = #{remark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where FILE_ID = #{fileId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.AttachmentInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update attachment_info
+    set ARTICLE_ID = #{articleId,jdbcType=VARCHAR},
+      FILE_NAME = #{fileName,jdbcType=VARCHAR},
+      FILE_OSSID = #{fileOssid,jdbcType=VARCHAR},
+      FILE_PATH = #{filePath,jdbcType=VARCHAR},
+      FILE_URL = #{fileUrl,jdbcType=VARCHAR},
+      FILE_TYPE = #{fileType,jdbcType=VARCHAR},
+      RELATION_TYPE = #{relationType,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      REMARK = #{remark,jdbcType=VARCHAR}
+    where FILE_ID = #{fileId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/AuthorityExMapper.xml b/ruoyi-content/src/main/resources/mapper/content/AuthorityExMapper.xml
new file mode 100644
index 000000000..2bb35d1e3
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/AuthorityExMapper.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.AuthorityFindfExMapper">
+
+	<resultMap id="AuthorityResultMap"
+		type="com.ruoyi.content.domain.AuthorityExDto">
+		<id column="ID" property="id" jdbcType="VARCHAR" />
+		<result column="TYPE" property="type" jdbcType="VARCHAR" />
+		<result column="LEVEL" property="level" jdbcType="VARCHAR" />
+		<result column="OPERATOR_ROLE_NAME" property="operatorRoleName"
+			jdbcType="VARCHAR" />
+		<result column="OPERATOR_ROLE_PATH" property="operatorRolePath"
+			jdbcType="VARCHAR" />
+	</resultMap>
+
+	<select id="findAuthorityEx" resultMap="AuthorityResultMap">
+		SELECT
+		DISTINCT(r.ID),r.LEVEL,r.TYPE,r.OPERATOR_ROLE_NAME,r.OPERATOR_ROLE_PATH
+		from cms_sys_authority r,cms_role_authority p
+		WHERE r.ID=p.PARENT_CHILD
+		and
+		p.SELF_CHILD in(
+		SELECT wo.AUTHORITY_NAME
+		FROM cms_user_role wo
+		WHERE wo.AUTHORITY_EMAIL=#{userLog}
+		) ORDER BY r.NUM ASC
+	</select>
+
+<!-- 	<insert id="insertOPeratorAuthorityRole" parameterType="java.lang.String">
+		insert into cms_role_authority
+		(SELF_CHILD,PARENT_CHILD,CREATE_USER,CREATE_DATE,CREATE_TIME)
+		values
+		<foreach item="item" index="index" collection="array" open="("
+			separator="," close=")">
+			SELF_CHILD=#{email},CREATE_USER=#{createUser},CREATE_DATE=#{createDate},CREATE_TIME=#{createTime},PARENT_CHILD=#{item}
+		</foreach>
+	</insert> -->
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
new file mode 100644
index 000000000..1245fbe34
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.content.mapper.BaseCodeExMapper">
+	<sql id="baseSelectField">
+		select ID, CODE_CODE, CODE_TYPE, ORDER_NO, CODE_CNAME, CODE_ENAME,
+		CODE_TNAME, STATE, CREATE_USER,
+		CREATE_TIME, UPDATE_USER, UPDATE_TIME,
+		UPDATE_REMARK, BUSINESS_AREA,COMPANY_ID,BRANCH_ID 
+	</sql>
+	<resultMap id="BaseResultMap" type="com.ruoyi.content.domain.BaseCode">
+		 <id column="ID" property="id" jdbcType="INTEGER" />
+    <result column="CODE_CODE" property="codeCode" jdbcType="VARCHAR" />
+    <result column="CODE_TYPE" property="codeType" jdbcType="VARCHAR" />
+    <result column="ORDER_NO" property="orderNo" jdbcType="VARCHAR" />
+    <result column="CODE_CNAME" property="codeCname" jdbcType="VARCHAR" />
+    <result column="CODE_ENAME" property="codeEname" jdbcType="VARCHAR" />
+    <result column="CODE_TNAME" property="codeTname" jdbcType="VARCHAR" />
+    <result column="STATE" property="state" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
+    <result column="UPDATE_REMARK" property="updateRemark" jdbcType="VARCHAR" />
+    <result column="BUSINESS_AREA" property="businessArea" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+	 <result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+	</resultMap>
+	
+	<select id="selectAllWithLimit"
+		parameterType="com.ruoyi.content.domain.ArticleInfoExample"
+		resultMap="BaseResultMap">
+		select ID, CODE_CODE, CODE_TYPE, ORDER_NO, CODE_CNAME, CODE_ENAME,
+		CODE_TNAME, STATE, CREATE_USER,
+		CREATE_TIME, UPDATE_USER, UPDATE_TIME,
+		UPDATE_REMARK, BUSINESS_AREA,COMPANY_ID,BRANCH_ID from
+		base_code
+		where
+		STATE in (0,1)
+		<if test="companyId != null and companyId !=''"> 
+			and COMPANY_ID = #{companyId,jdbcType=VARCHAR} 
+		</if> 
+			<if test="branchId != null and branchId !=''"> 
+			and BRANCH_ID like CONCAT(CONCAT('%', #{branchId,jdbcType=VARCHAR}), '%')   
+		</if> 
+		
+		<if test="codeCname != null and codeCname!=''">
+			and CODE_CNAME like CONCAT(CONCAT('%', #{codeCname,
+			jdbcType=VARCHAR}), '%')
+		</if>
+		<if test="codeType != null and codeType!=''">
+			and CODE_TYPE = #{codeType,jdbcType=VARCHAR}
+		</if>
+		<if test="orderNo != null and orderNo!=''">
+			and ORDER_NO = #{orderNo,jdbcType=VARCHAR}
+		</if>
+		order by CODE_TYPE DESC,ORDER_NO*1 ASC, CREATE_TIME ASC, UPDATE_TIME ASC 
+		limit #{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>
+	
+	
+    <resultMap id="BaseTreeResultMap" type="com.ruoyi.content.domain.BaseCodeTree">
+        <id column="ID" property="id" jdbcType="INTEGER" />
+	    <result column="CODE_CODE" property="codeCode" jdbcType="VARCHAR" />
+	    <result column="CODE_TYPE" property="codeType" jdbcType="VARCHAR" />
+	    <result column="ORDER_NO" property="orderNo" jdbcType="VARCHAR" />
+	    <result column="CODE_CNAME" property="codeCname" jdbcType="VARCHAR" />
+	    <result column="CODE_ENAME" property="codeEname" jdbcType="VARCHAR" />
+	    <result column="CODE_TNAME" property="codeTname" jdbcType="VARCHAR" />
+	    <result column="STATE" property="state" jdbcType="VARCHAR" />
+	    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+	    <result column="CREATE_TIME" property="createTime" jdbcType="TIMESTAMP" />
+	    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+	    <result column="UPDATE_TIME" property="updateTime" jdbcType="TIMESTAMP" />
+	    <result column="UPDATE_REMARK" property="updateRemark" jdbcType="VARCHAR" />
+	    <result column="BUSINESS_AREA" property="businessArea" jdbcType="VARCHAR" />
+	    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+		<result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+      	<collection column="CODE_CODE=CODE_CODE,parentCompanyId=parentCompanyId,parentState=parentState,parentBranchId=parentBranchId" property="child" javaType="java.util.ArrayList"
+                   ofType="com.ruoyi.content.domain.BaseCodeTree" select="getNextNodeTree"/>
+   	</resultMap>
+ 
+    <select id="getNextNodeTree" resultMap="BaseTreeResultMap">
+       	<include refid="baseSelectField" />
+       	,#{parentCompanyId} as parentCompanyId
+		,#{parentState} as parentState
+		,#{parentBranchId} as parentBranchId
+       	from base_code
+        WHERE CODE_TYPE = #{CODE_CODE}
+        <if test="parentCompanyId != null and parentCompanyId !=''">
+			and COMPANY_ID = #{parentCompanyId}
+		</if>
+		<if test="parentState != null and parentState !=''">
+			and STATE = #{parentState}
+		</if>
+		<if test="parentBranchId != null and parentBranchId !=''">
+			and BRANCH_ID like concat("%",concat(#{parentBranchId},"%"))
+		</if>
+		order by ORDER_NO*1,CREATE_TIME
+    </select>
+ 
+    <select id="columnTree" resultMap="BaseTreeResultMap" parameterType="map">
+        <include refid="baseSelectField" />
+		,#{companyId} as parentCompanyId
+		,#{state} as parentState
+		,#{branchId} as parentBranchId
+        from base_code
+        WHERE 1 = 1
+        <if test="codeCode != null and codeCode !=''">
+			and CODE_CODE = #{codeCode,jdbcType=VARCHAR}
+		</if>
+		<if test="companyId != null and companyId !=''">
+			and COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+		</if>
+		<if test="state != null and state !=''">
+			and STATE = #{state,jdbcType=VARCHAR}
+		</if>
+		<if test="branchId != null and branchId !=''">
+			and BRANCH_ID like concat("%",concat(#{branchId,jdbcType=VARCHAR},"%"))
+		</if>
+		order by ORDER_NO*1,CREATE_TIME
+	</select>
+	
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/BaseCodeMapper.xml b/ruoyi-content/src/main/resources/mapper/content/BaseCodeMapper.xml
index 05148653a..a2b763e83 100644
--- a/ruoyi-content/src/main/resources/mapper/content/BaseCodeMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/BaseCodeMapper.xml
@@ -113,7 +113,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from cms_base_code
+    from base_code
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -129,7 +129,7 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from cms_base_code
+    from base_code
     where ID = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
@@ -138,7 +138,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 24 14:34:00 CST 2018.
     -->
-    delete from cms_base_code
+    delete from base_code
     where ID = #{id,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.BaseCodeExample" >
@@ -147,7 +147,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 24 14:34:00 CST 2018.
     -->
-    delete from cms_base_code
+    delete from base_code
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -161,7 +161,7 @@
   <!--   <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
        SELECT LAST_INSERT_ID() 
     </selectKey> -->
-    insert into cms_base_code (ID, CODE_CODE, CODE_TYPE,
+    insert into base_code (ID, CODE_CODE, CODE_TYPE,
       ORDER_NO, CODE_CNAME, CODE_ENAME, 
       CODE_TNAME, STATE, CREATE_USER, 
       CREATE_TIME, UPDATE_USER, UPDATE_TIME, 
@@ -183,7 +183,7 @@
 <!--     <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
        SELECT LAST_INSERT_ID() 
     </selectKey> -->
-    insert into cms_base_code
+    insert into base_code
     <trim prefix="(" suffix=")" suffixOverrides="," >
       ID,
       <if test="codeCode != null" >
@@ -287,7 +287,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 24 14:34:00 CST 2018.
     -->
-    select count(*) from cms_base_code
+    select count(*) from base_code
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -298,7 +298,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 24 14:34:00 CST 2018.
     -->
-    update cms_base_code
+    update base_code
     <set >
       <if test="record.id != null" >
         ID = #{record.id,jdbcType=INTEGER},
@@ -359,7 +359,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 24 14:34:00 CST 2018.
     -->
-    update cms_base_code
+    update base_code
     set ID = #{record.id,jdbcType=INTEGER},
       CODE_CODE = #{record.codeCode,jdbcType=VARCHAR},
       CODE_TYPE = #{record.codeType,jdbcType=VARCHAR},
@@ -386,7 +386,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 24 14:34:00 CST 2018.
     -->
-    update cms_base_code
+    update base_code
     <set >
       <if test="codeCode != null" >
         CODE_CODE = #{codeCode,jdbcType=VARCHAR},
@@ -442,7 +442,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Tue Jul 24 14:34:00 CST 2018.
     -->
-    update cms_base_code
+    update base_code
     set CODE_CODE = #{codeCode,jdbcType=VARCHAR},
       CODE_TYPE = #{codeType,jdbcType=VARCHAR},
       ORDER_NO = #{orderNo,jdbcType=VARCHAR},
diff --git a/ruoyi-content/src/main/resources/mapper/content/CardInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CardInfoMapper.xml
new file mode 100644
index 000000000..3d71edf6d
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/CardInfoMapper.xml
@@ -0,0 +1,463 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.CardInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.CardInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <id column="CARD_ID" property="cardId" jdbcType="INTEGER" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="CARD_TYPE" property="cardType" jdbcType="VARCHAR" />
+    <result column="CARD_IMAGE_URL" property="cardImageUrl" jdbcType="VARCHAR" />
+    <result column="CARD_TITLE" property="cardTitle" jdbcType="VARCHAR" />
+    <result column="CARD_NAME1" property="cardName1" jdbcType="VARCHAR" />
+    <result column="CARD_NAME2" property="cardName2" jdbcType="VARCHAR" />
+    <result column="CARD_LINK1" property="cardLink1" jdbcType="VARCHAR" />
+    <result column="CARD_LINK2" property="cardLink2" jdbcType="VARCHAR" />
+    <result column="CARD_STATE" property="cardState" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    CARD_ID, COMPANY_ID, CARD_TYPE, CARD_IMAGE_URL, CARD_TITLE, CARD_NAME1, CARD_NAME2, 
+    CARD_LINK1, CARD_LINK2, CARD_STATE, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, 
+    UPDATE_DATE, UPDATE_TIME
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.CardInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from card_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from card_info
+    where CARD_ID = #{cardId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    delete from card_info
+    where CARD_ID = #{cardId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.CardInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    delete from card_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.CardInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="cardId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into card_info (CARD_ID, COMPANY_ID, CARD_TYPE, 
+      CARD_IMAGE_URL, CARD_TITLE, CARD_NAME1, 
+      CARD_NAME2, CARD_LINK1, CARD_LINK2, 
+      CARD_STATE, CREATE_DATE, CREATE_TIME, 
+      CREATE_USER, UPDATE_USER, UPDATE_DATE, 
+      UPDATE_TIME)
+    values (#{cardId,jdbcType=INTEGER}, #{companyId,jdbcType=VARCHAR}, #{cardType,jdbcType=VARCHAR}, 
+      #{cardImageUrl,jdbcType=VARCHAR}, #{cardTitle,jdbcType=VARCHAR}, #{cardName1,jdbcType=VARCHAR}, 
+      #{cardName2,jdbcType=VARCHAR}, #{cardLink1,jdbcType=VARCHAR}, #{cardLink2,jdbcType=VARCHAR}, 
+      #{cardState,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.CardInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="cardId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into card_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      CARD_ID,
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="cardType != null" >
+        CARD_TYPE,
+      </if>
+      <if test="cardImageUrl != null" >
+        CARD_IMAGE_URL,
+      </if>
+      <if test="cardTitle != null" >
+        CARD_TITLE,
+      </if>
+      <if test="cardName1 != null" >
+        CARD_NAME1,
+      </if>
+      <if test="cardName2 != null" >
+        CARD_NAME2,
+      </if>
+      <if test="cardLink1 != null" >
+        CARD_LINK1,
+      </if>
+      <if test="cardLink2 != null" >
+        CARD_LINK2,
+      </if>
+      <if test="cardState != null" >
+        CARD_STATE,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{cardId,jdbcType=INTEGER},
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="cardType != null" >
+        #{cardType,jdbcType=VARCHAR},
+      </if>
+      <if test="cardImageUrl != null" >
+        #{cardImageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="cardTitle != null" >
+        #{cardTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="cardName1 != null" >
+        #{cardName1,jdbcType=VARCHAR},
+      </if>
+      <if test="cardName2 != null" >
+        #{cardName2,jdbcType=VARCHAR},
+      </if>
+      <if test="cardLink1 != null" >
+        #{cardLink1,jdbcType=VARCHAR},
+      </if>
+      <if test="cardLink2 != null" >
+        #{cardLink2,jdbcType=VARCHAR},
+      </if>
+      <if test="cardState != null" >
+        #{cardState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.CardInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select count(*) from card_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update card_info
+    <set >
+      <if test="record.cardId != null" >
+        CARD_ID = #{record.cardId,jdbcType=INTEGER},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cardType != null" >
+        CARD_TYPE = #{record.cardType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cardImageUrl != null" >
+        CARD_IMAGE_URL = #{record.cardImageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cardTitle != null" >
+        CARD_TITLE = #{record.cardTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cardName1 != null" >
+        CARD_NAME1 = #{record.cardName1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cardName2 != null" >
+        CARD_NAME2 = #{record.cardName2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cardLink1 != null" >
+        CARD_LINK1 = #{record.cardLink1,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cardLink2 != null" >
+        CARD_LINK2 = #{record.cardLink2,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cardState != null" >
+        CARD_STATE = #{record.cardState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update card_info
+    set CARD_ID = #{record.cardId,jdbcType=INTEGER},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      CARD_TYPE = #{record.cardType,jdbcType=VARCHAR},
+      CARD_IMAGE_URL = #{record.cardImageUrl,jdbcType=VARCHAR},
+      CARD_TITLE = #{record.cardTitle,jdbcType=VARCHAR},
+      CARD_NAME1 = #{record.cardName1,jdbcType=VARCHAR},
+      CARD_NAME2 = #{record.cardName2,jdbcType=VARCHAR},
+      CARD_LINK1 = #{record.cardLink1,jdbcType=VARCHAR},
+      CARD_LINK2 = #{record.cardLink2,jdbcType=VARCHAR},
+      CARD_STATE = #{record.cardState,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.CardInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update card_info
+    <set >
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="cardType != null" >
+        CARD_TYPE = #{cardType,jdbcType=VARCHAR},
+      </if>
+      <if test="cardImageUrl != null" >
+        CARD_IMAGE_URL = #{cardImageUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="cardTitle != null" >
+        CARD_TITLE = #{cardTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="cardName1 != null" >
+        CARD_NAME1 = #{cardName1,jdbcType=VARCHAR},
+      </if>
+      <if test="cardName2 != null" >
+        CARD_NAME2 = #{cardName2,jdbcType=VARCHAR},
+      </if>
+      <if test="cardLink1 != null" >
+        CARD_LINK1 = #{cardLink1,jdbcType=VARCHAR},
+      </if>
+      <if test="cardLink2 != null" >
+        CARD_LINK2 = #{cardLink2,jdbcType=VARCHAR},
+      </if>
+      <if test="cardState != null" >
+        CARD_STATE = #{cardState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where CARD_ID = #{cardId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.CardInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update card_info
+    set COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      CARD_TYPE = #{cardType,jdbcType=VARCHAR},
+      CARD_IMAGE_URL = #{cardImageUrl,jdbcType=VARCHAR},
+      CARD_TITLE = #{cardTitle,jdbcType=VARCHAR},
+      CARD_NAME1 = #{cardName1,jdbcType=VARCHAR},
+      CARD_NAME2 = #{cardName2,jdbcType=VARCHAR},
+      CARD_LINK1 = #{cardLink1,jdbcType=VARCHAR},
+      CARD_LINK2 = #{cardLink2,jdbcType=VARCHAR},
+      CARD_STATE = #{cardState,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
+    where CARD_ID = #{cardId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ChannelInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ChannelInfoMapper.xml
new file mode 100644
index 000000000..f7243fb7e
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ChannelInfoMapper.xml
@@ -0,0 +1,383 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ChannelInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ChannelInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <id column="CHANNEL_ID" property="channelId" jdbcType="INTEGER" />
+    <result column="PARENT_ID" property="parentId" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="CHANNEL_NAME" property="channelName" jdbcType="VARCHAR" />
+    <result column="CHANNEL_STATE" property="channelState" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    CHANNEL_ID, PARENT_ID, COMPANY_ID, CHANNEL_NAME, CHANNEL_STATE, CREATE_DATE, CREATE_TIME, 
+    CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ChannelInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from channel_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from channel_info
+    where CHANNEL_ID = #{channelId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    delete from channel_info
+    where CHANNEL_ID = #{channelId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ChannelInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    delete from channel_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ChannelInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="channelId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into channel_info (CHANNEL_ID, PARENT_ID, COMPANY_ID, 
+      CHANNEL_NAME, CHANNEL_STATE, CREATE_DATE, 
+      CREATE_TIME, CREATE_USER, UPDATE_USER, 
+      UPDATE_DATE, UPDATE_TIME)
+    values (#{channelId,jdbcType=INTEGER}, #{parentId,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, 
+      #{channelName,jdbcType=VARCHAR}, #{channelState,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ChannelInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="channelId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into channel_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      CHANNEL_ID,
+      <if test="parentId != null" >
+        PARENT_ID,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="channelName != null" >
+        CHANNEL_NAME,
+      </if>
+      <if test="channelState != null" >
+        CHANNEL_STATE,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{channelId,jdbcType=INTEGER},
+      <if test="parentId != null" >
+        #{parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="channelName != null" >
+        #{channelName,jdbcType=VARCHAR},
+      </if>
+      <if test="channelState != null" >
+        #{channelState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ChannelInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select count(*) from channel_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update channel_info
+    <set >
+      <if test="record.channelId != null" >
+        CHANNEL_ID = #{record.channelId,jdbcType=INTEGER},
+      </if>
+      <if test="record.parentId != null" >
+        PARENT_ID = #{record.parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.channelName != null" >
+        CHANNEL_NAME = #{record.channelName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.channelState != null" >
+        CHANNEL_STATE = #{record.channelState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update channel_info
+    set CHANNEL_ID = #{record.channelId,jdbcType=INTEGER},
+      PARENT_ID = #{record.parentId,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      CHANNEL_NAME = #{record.channelName,jdbcType=VARCHAR},
+      CHANNEL_STATE = #{record.channelState,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ChannelInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update channel_info
+    <set >
+      <if test="parentId != null" >
+        PARENT_ID = #{parentId,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="channelName != null" >
+        CHANNEL_NAME = #{channelName,jdbcType=VARCHAR},
+      </if>
+      <if test="channelState != null" >
+        CHANNEL_STATE = #{channelState,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where CHANNEL_ID = #{channelId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ChannelInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update channel_info
+    set PARENT_ID = #{parentId,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      CHANNEL_NAME = #{channelName,jdbcType=VARCHAR},
+      CHANNEL_STATE = #{channelState,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
+    where CHANNEL_ID = #{channelId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ClickTrackInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ClickTrackInfoMapper.xml
new file mode 100644
index 000000000..131926ff1
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ClickTrackInfoMapper.xml
@@ -0,0 +1,621 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ClickTrackInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ClickTrackInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    <id column="CLICK_ID" property="clickId" jdbcType="VARCHAR" />
+    <result column="FORWARD_TIMESTAMP" property="forwardTimestamp" jdbcType="VARCHAR" />
+    <result column="PARENT_CLICK_ID" property="parentClickId" jdbcType="VARCHAR" />
+    <result column="CLICK_OPEN_ID" property="clickOpenId" jdbcType="VARCHAR" />
+    <result column="CLICK_USER_NICKNAME" property="clickUserNickname" jdbcType="VARCHAR" />
+    <result column="CLICK_USER_HEADIMGURL" property="clickUserHeadimgurl" jdbcType="VARCHAR" />
+    <result column="PUBLISH_USER_ID" property="publishUserId" jdbcType="VARCHAR" />
+    <result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
+    <result column="CLICK_USER_ID" property="clickUserId" jdbcType="VARCHAR" />
+    <result column="AD_ID" property="adId" jdbcType="VARCHAR" />
+    <result column="FROM_SHARE_STATE" property="fromShareState" jdbcType="VARCHAR" />
+    <result column="SHARE_STATE" property="shareState" jdbcType="VARCHAR" />
+    <result column="WATCH_TIME" property="watchTime" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <resultMap id="ResultMapWithBLOBs" type="com.ruoyi.content.domain.ClickTrackInfo" extends="BaseResultMap" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    <result column="CLICK_USER_INFO" property="clickUserInfo" jdbcType="LONGVARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    CLICK_ID, FORWARD_TIMESTAMP, PARENT_CLICK_ID, CLICK_OPEN_ID, CLICK_USER_NICKNAME, 
+    CLICK_USER_HEADIMGURL, PUBLISH_USER_ID, ARTICLE_ID, CLICK_USER_ID, AD_ID, FROM_SHARE_STATE, 
+    SHARE_STATE, WATCH_TIME, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, 
+    UPDATE_TIME
+  </sql>
+  <sql id="Blob_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    CLICK_USER_INFO
+  </sql>
+  <select id="selectByExampleWithBLOBs" resultMap="ResultMapWithBLOBs" parameterType="com.ruoyi.content.domain.ClickTrackInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from click_track_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ClickTrackInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from click_track_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="ResultMapWithBLOBs" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from click_track_info
+    where CLICK_ID = #{clickId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    delete from click_track_info
+    where CLICK_ID = #{clickId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ClickTrackInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    delete from click_track_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ClickTrackInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    <selectKey resultType="java.lang.String" keyProperty="clickId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into click_track_info (CLICK_ID, FORWARD_TIMESTAMP, PARENT_CLICK_ID, 
+      CLICK_OPEN_ID, CLICK_USER_NICKNAME, CLICK_USER_HEADIMGURL, 
+      PUBLISH_USER_ID, ARTICLE_ID, CLICK_USER_ID, 
+      AD_ID, FROM_SHARE_STATE, SHARE_STATE, 
+      WATCH_TIME, CREATE_DATE, CREATE_TIME, 
+      CREATE_USER, UPDATE_USER, UPDATE_DATE, 
+      UPDATE_TIME, CLICK_USER_INFO)
+    values (#{clickId,jdbcType=VARCHAR}, #{forwardTimestamp,jdbcType=VARCHAR}, #{parentClickId,jdbcType=VARCHAR}, 
+      #{clickOpenId,jdbcType=VARCHAR}, #{clickUserNickname,jdbcType=VARCHAR}, #{clickUserHeadimgurl,jdbcType=VARCHAR}, 
+      #{publishUserId,jdbcType=VARCHAR}, #{articleId,jdbcType=VARCHAR}, #{clickUserId,jdbcType=VARCHAR}, 
+      #{adId,jdbcType=VARCHAR}, #{fromShareState,jdbcType=VARCHAR}, #{shareState,jdbcType=VARCHAR}, 
+      #{watchTime,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=VARCHAR}, #{clickUserInfo,jdbcType=LONGVARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ClickTrackInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    <selectKey resultType="java.lang.String" keyProperty="clickId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into click_track_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      CLICK_ID,
+      <if test="forwardTimestamp != null" >
+        FORWARD_TIMESTAMP,
+      </if>
+      <if test="parentClickId != null" >
+        PARENT_CLICK_ID,
+      </if>
+      <if test="clickOpenId != null" >
+        CLICK_OPEN_ID,
+      </if>
+      <if test="clickUserNickname != null" >
+        CLICK_USER_NICKNAME,
+      </if>
+      <if test="clickUserHeadimgurl != null" >
+        CLICK_USER_HEADIMGURL,
+      </if>
+      <if test="publishUserId != null" >
+        PUBLISH_USER_ID,
+      </if>
+      <if test="articleId != null" >
+        ARTICLE_ID,
+      </if>
+      <if test="clickUserId != null" >
+        CLICK_USER_ID,
+      </if>
+      <if test="adId != null" >
+        AD_ID,
+      </if>
+      <if test="fromShareState != null" >
+        FROM_SHARE_STATE,
+      </if>
+      <if test="shareState != null" >
+        SHARE_STATE,
+      </if>
+      <if test="watchTime != null" >
+        WATCH_TIME,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="clickUserInfo != null" >
+        CLICK_USER_INFO,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{clickId,jdbcType=VARCHAR},
+      <if test="forwardTimestamp != null" >
+        #{forwardTimestamp,jdbcType=VARCHAR},
+      </if>
+      <if test="parentClickId != null" >
+        #{parentClickId,jdbcType=VARCHAR},
+      </if>
+      <if test="clickOpenId != null" >
+        #{clickOpenId,jdbcType=VARCHAR},
+      </if>
+      <if test="clickUserNickname != null" >
+        #{clickUserNickname,jdbcType=VARCHAR},
+      </if>
+      <if test="clickUserHeadimgurl != null" >
+        #{clickUserHeadimgurl,jdbcType=VARCHAR},
+      </if>
+      <if test="publishUserId != null" >
+        #{publishUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="articleId != null" >
+        #{articleId,jdbcType=VARCHAR},
+      </if>
+      <if test="clickUserId != null" >
+        #{clickUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="adId != null" >
+        #{adId,jdbcType=VARCHAR},
+      </if>
+      <if test="fromShareState != null" >
+        #{fromShareState,jdbcType=VARCHAR},
+      </if>
+      <if test="shareState != null" >
+        #{shareState,jdbcType=VARCHAR},
+      </if>
+      <if test="watchTime != null" >
+        #{watchTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="clickUserInfo != null" >
+        #{clickUserInfo,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.ClickTrackInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    select count(*) from click_track_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    update click_track_info
+    <set >
+      <if test="record.clickId != null" >
+        CLICK_ID = #{record.clickId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.forwardTimestamp != null" >
+        FORWARD_TIMESTAMP = #{record.forwardTimestamp,jdbcType=VARCHAR},
+      </if>
+      <if test="record.parentClickId != null" >
+        PARENT_CLICK_ID = #{record.parentClickId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clickOpenId != null" >
+        CLICK_OPEN_ID = #{record.clickOpenId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clickUserNickname != null" >
+        CLICK_USER_NICKNAME = #{record.clickUserNickname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clickUserHeadimgurl != null" >
+        CLICK_USER_HEADIMGURL = #{record.clickUserHeadimgurl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.publishUserId != null" >
+        PUBLISH_USER_ID = #{record.publishUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.articleId != null" >
+        ARTICLE_ID = #{record.articleId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clickUserId != null" >
+        CLICK_USER_ID = #{record.clickUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.adId != null" >
+        AD_ID = #{record.adId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fromShareState != null" >
+        FROM_SHARE_STATE = #{record.fromShareState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shareState != null" >
+        SHARE_STATE = #{record.shareState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.watchTime != null" >
+        WATCH_TIME = #{record.watchTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clickUserInfo != null" >
+        CLICK_USER_INFO = #{record.clickUserInfo,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    update click_track_info
+    set CLICK_ID = #{record.clickId,jdbcType=VARCHAR},
+      FORWARD_TIMESTAMP = #{record.forwardTimestamp,jdbcType=VARCHAR},
+      PARENT_CLICK_ID = #{record.parentClickId,jdbcType=VARCHAR},
+      CLICK_OPEN_ID = #{record.clickOpenId,jdbcType=VARCHAR},
+      CLICK_USER_NICKNAME = #{record.clickUserNickname,jdbcType=VARCHAR},
+      CLICK_USER_HEADIMGURL = #{record.clickUserHeadimgurl,jdbcType=VARCHAR},
+      PUBLISH_USER_ID = #{record.publishUserId,jdbcType=VARCHAR},
+      ARTICLE_ID = #{record.articleId,jdbcType=VARCHAR},
+      CLICK_USER_ID = #{record.clickUserId,jdbcType=VARCHAR},
+      AD_ID = #{record.adId,jdbcType=VARCHAR},
+      FROM_SHARE_STATE = #{record.fromShareState,jdbcType=VARCHAR},
+      SHARE_STATE = #{record.shareState,jdbcType=VARCHAR},
+      WATCH_TIME = #{record.watchTime,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      CLICK_USER_INFO = #{record.clickUserInfo,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    update click_track_info
+    set CLICK_ID = #{record.clickId,jdbcType=VARCHAR},
+      FORWARD_TIMESTAMP = #{record.forwardTimestamp,jdbcType=VARCHAR},
+      PARENT_CLICK_ID = #{record.parentClickId,jdbcType=VARCHAR},
+      CLICK_OPEN_ID = #{record.clickOpenId,jdbcType=VARCHAR},
+      CLICK_USER_NICKNAME = #{record.clickUserNickname,jdbcType=VARCHAR},
+      CLICK_USER_HEADIMGURL = #{record.clickUserHeadimgurl,jdbcType=VARCHAR},
+      PUBLISH_USER_ID = #{record.publishUserId,jdbcType=VARCHAR},
+      ARTICLE_ID = #{record.articleId,jdbcType=VARCHAR},
+      CLICK_USER_ID = #{record.clickUserId,jdbcType=VARCHAR},
+      AD_ID = #{record.adId,jdbcType=VARCHAR},
+      FROM_SHARE_STATE = #{record.fromShareState,jdbcType=VARCHAR},
+      SHARE_STATE = #{record.shareState,jdbcType=VARCHAR},
+      WATCH_TIME = #{record.watchTime,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ClickTrackInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    update click_track_info
+    <set >
+      <if test="forwardTimestamp != null" >
+        FORWARD_TIMESTAMP = #{forwardTimestamp,jdbcType=VARCHAR},
+      </if>
+      <if test="parentClickId != null" >
+        PARENT_CLICK_ID = #{parentClickId,jdbcType=VARCHAR},
+      </if>
+      <if test="clickOpenId != null" >
+        CLICK_OPEN_ID = #{clickOpenId,jdbcType=VARCHAR},
+      </if>
+      <if test="clickUserNickname != null" >
+        CLICK_USER_NICKNAME = #{clickUserNickname,jdbcType=VARCHAR},
+      </if>
+      <if test="clickUserHeadimgurl != null" >
+        CLICK_USER_HEADIMGURL = #{clickUserHeadimgurl,jdbcType=VARCHAR},
+      </if>
+      <if test="publishUserId != null" >
+        PUBLISH_USER_ID = #{publishUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="articleId != null" >
+        ARTICLE_ID = #{articleId,jdbcType=VARCHAR},
+      </if>
+      <if test="clickUserId != null" >
+        CLICK_USER_ID = #{clickUserId,jdbcType=VARCHAR},
+      </if>
+      <if test="adId != null" >
+        AD_ID = #{adId,jdbcType=VARCHAR},
+      </if>
+      <if test="fromShareState != null" >
+        FROM_SHARE_STATE = #{fromShareState,jdbcType=VARCHAR},
+      </if>
+      <if test="shareState != null" >
+        SHARE_STATE = #{shareState,jdbcType=VARCHAR},
+      </if>
+      <if test="watchTime != null" >
+        WATCH_TIME = #{watchTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="clickUserInfo != null" >
+        CLICK_USER_INFO = #{clickUserInfo,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where CLICK_ID = #{clickId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.ruoyi.content.domain.ClickTrackInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    update click_track_info
+    set FORWARD_TIMESTAMP = #{forwardTimestamp,jdbcType=VARCHAR},
+      PARENT_CLICK_ID = #{parentClickId,jdbcType=VARCHAR},
+      CLICK_OPEN_ID = #{clickOpenId,jdbcType=VARCHAR},
+      CLICK_USER_NICKNAME = #{clickUserNickname,jdbcType=VARCHAR},
+      CLICK_USER_HEADIMGURL = #{clickUserHeadimgurl,jdbcType=VARCHAR},
+      PUBLISH_USER_ID = #{publishUserId,jdbcType=VARCHAR},
+      ARTICLE_ID = #{articleId,jdbcType=VARCHAR},
+      CLICK_USER_ID = #{clickUserId,jdbcType=VARCHAR},
+      AD_ID = #{adId,jdbcType=VARCHAR},
+      FROM_SHARE_STATE = #{fromShareState,jdbcType=VARCHAR},
+      SHARE_STATE = #{shareState,jdbcType=VARCHAR},
+      WATCH_TIME = #{watchTime,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      CLICK_USER_INFO = #{clickUserInfo,jdbcType=LONGVARCHAR}
+    where CLICK_ID = #{clickId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ClickTrackInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    update click_track_info
+    set FORWARD_TIMESTAMP = #{forwardTimestamp,jdbcType=VARCHAR},
+      PARENT_CLICK_ID = #{parentClickId,jdbcType=VARCHAR},
+      CLICK_OPEN_ID = #{clickOpenId,jdbcType=VARCHAR},
+      CLICK_USER_NICKNAME = #{clickUserNickname,jdbcType=VARCHAR},
+      CLICK_USER_HEADIMGURL = #{clickUserHeadimgurl,jdbcType=VARCHAR},
+      PUBLISH_USER_ID = #{publishUserId,jdbcType=VARCHAR},
+      ARTICLE_ID = #{articleId,jdbcType=VARCHAR},
+      CLICK_USER_ID = #{clickUserId,jdbcType=VARCHAR},
+      AD_ID = #{adId,jdbcType=VARCHAR},
+      FROM_SHARE_STATE = #{fromShareState,jdbcType=VARCHAR},
+      SHARE_STATE = #{shareState,jdbcType=VARCHAR},
+      WATCH_TIME = #{watchTime,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
+    where CLICK_ID = #{clickId,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/ClickTrackInfoQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ClickTrackInfoQueryMapper.xml
new file mode 100644
index 000000000..7df4f1d5d
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/ClickTrackInfoQueryMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.ClickTrackInfoQueryMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ClickTrackInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Wed Jun 20 16:32:59 CST 2018.
+    -->
+    <id column="CLICK_ID" property="clickId" jdbcType="VARCHAR" />
+    <result column="FORWARD_TIMESTAMP" property="forwardTimestamp" jdbcType="VARCHAR" />
+    <result column="PARENT_CLICK_ID" property="parentClickId" jdbcType="VARCHAR" />
+    <result column="CLICK_OPEN_ID" property="clickOpenId" jdbcType="VARCHAR" />
+    <result column="CLICK_USER_NICKNAME" property="clickUserNickname" jdbcType="VARCHAR" />
+    <result column="CLICK_USER_HEADIMGURL" property="clickUserHeadimgurl" jdbcType="VARCHAR" />
+    <result column="PUBLISH_USER_ID" property="publishUserId" jdbcType="VARCHAR" />
+    <result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
+    <result column="CLICK_USER_ID" property="clickUserId" jdbcType="VARCHAR" />
+    <result column="AD_ID" property="adId" jdbcType="VARCHAR" />
+    <result column="FROM_SHARE_STATE" property="fromShareState" jdbcType="VARCHAR" />
+    <result column="SHARE_STATE" property="shareState" jdbcType="VARCHAR" />
+    <result column="WATCH_TIME" property="watchTime" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <select id="queryClickInfoByUserId" resultMap="BaseResultMap">
+		SELECT
+		CLICK_ID, FORWARD_TIMESTAMP, PARENT_CLICK_ID, CLICK_OPEN_ID, CLICK_USER_NICKNAME, 
+    	CLICK_USER_HEADIMGURL, PUBLISH_USER_ID, ARTICLE_ID, CLICK_USER_ID, AD_ID, FROM_SHARE_STATE, 
+    	SHARE_STATE, WATCH_TIME, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, 
+    	UPDATE_TIME
+		FROM
+		click_track_info 
+		WHERE
+		PUBLISH_USER_ID = #{userId,jdbcType=VARCHAR} AND ARTICLE_ID =  #{articleId,jdbcType=VARCHAR}
+		ORDER BY CREATE_DATE DESC,CREATE_TIME DESC
+		limit #{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
index 14b21737f..d54b980b1 100644
--- a/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsArticleAdInfoMapper.xml
@@ -25,7 +25,7 @@
     </resultMap>
 
     <sql id="selectCmsArticleAdInfoVo">
-        select AD_ID, COMPANY_ID, AD_TYPE, AD_TYPE_NAME, AD_LINK_URL, AD_TITLE, AD_NAME, AD_SUMMARY, AD_COLOR_TYPE, AD_IMAGE_URL, AD_STATE, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME from cms_article_ad_info
+        select AD_ID, COMPANY_ID, AD_TYPE, AD_TYPE_NAME, AD_LINK_URL, AD_TITLE, AD_NAME, AD_SUMMARY, AD_COLOR_TYPE, AD_IMAGE_URL, AD_STATE, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME from article_ad_info
     </sql>
 
     <select id="selectCmsArticleAdInfoList" parameterType="CmsArticleAdInfo" resultMap="CmsArticleAdInfoResult">
@@ -58,7 +58,7 @@
     </select>
 
     <insert id="insertCmsArticleAdInfo" parameterType="CmsArticleAdInfo" useGeneratedKeys="true" keyProperty="adId">
-        insert into cms_article_ad_info
+        insert into article_ad_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="companyId != null">COMPANY_ID,</if>
             <if test="adType != null">AD_TYPE,</if>
@@ -98,7 +98,7 @@
     </insert>
 
     <update id="updateCmsArticleAdInfo" parameterType="CmsArticleAdInfo">
-        update cms_article_ad_info
+        update article_ad_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="companyId != null">COMPANY_ID = #{companyId},</if>
             <if test="adType != null">AD_TYPE = #{adType},</if>
@@ -121,11 +121,11 @@
     </update>
 
     <delete id="deleteCmsArticleAdInfoById" parameterType="Long">
-        delete from cms_article_ad_info where AD_ID = #{adId}
+        delete from article_ad_info where AD_ID = #{adId}
     </delete>
 
     <delete id="deleteCmsArticleAdInfoByIds" parameterType="String">
-        delete from cms_article_ad_info where AD_ID in
+        delete from article_ad_info where AD_ID in
         <foreach item="adId" collection="array" open="(" separator="," close=")">
             #{adId}
         </foreach>
@@ -160,7 +160,7 @@
     <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
         select
         <include refid="Base_Column_List"/>
-        from cms_article_ad_info
+        from article_ad_info
         where AD_ID = #{adId,jdbcType=INTEGER}
     </select>
 
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsPicAdInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsPicAdInfoMapper.xml
index b70854fad..358e2974b 100644
--- a/ruoyi-content/src/main/resources/mapper/content/CmsPicAdInfoMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsPicAdInfoMapper.xml
@@ -21,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectCmsPicAdInfoVo">
-        select PIC_AD_ID, PIC_AD_TYPE, PIC_AD_TITLE, PIC_AD_NAME, PIC_AD_URL, PIC_AD_STATE, COMPANY_ID, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME from cms_pic_ad_info
+        select PIC_AD_ID, PIC_AD_TYPE, PIC_AD_TITLE, PIC_AD_NAME, PIC_AD_URL, PIC_AD_STATE, COMPANY_ID, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME from pic_ad_info
     </sql>
 
     <select id="selectCmsPicAdInfoList" parameterType="CmsPicAdInfo" resultMap="CmsPicAdInfoResult">
@@ -49,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertCmsPicAdInfo" parameterType="CmsPicAdInfo" useGeneratedKeys="true" keyProperty="picAdId">
-        insert into cms_pic_ad_info
+        insert into pic_ad_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="picAdType != null">PIC_AD_TYPE,</if>
             <if test="picAdTitle != null">PIC_AD_TITLE,</if>
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateCmsPicAdInfo" parameterType="CmsPicAdInfo">
-        update cms_pic_ad_info
+        update pic_ad_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="picAdType != null">PIC_AD_TYPE = #{picAdType},</if>
             <if test="picAdTitle != null">PIC_AD_TITLE = #{picAdTitle},</if>
@@ -100,11 +100,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteCmsPicAdInfoById" parameterType="Long">
-        delete from cms_pic_ad_info where PIC_AD_ID = #{picAdId}
+        delete from pic_ad_info where PIC_AD_ID = #{picAdId}
     </delete>
 
     <delete id="deleteCmsPicAdInfoByIds" parameterType="String">
-        delete from cms_pic_ad_info where PIC_AD_ID in 
+        delete from pic_ad_info where PIC_AD_ID in 
         <foreach item="picAdId" collection="array" open="(" separator="," close=")">
             #{picAdId}
         </foreach>
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsRoleAuthorityMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsRoleAuthorityMapper.xml
new file mode 100644
index 000000000..f230b6378
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsRoleAuthorityMapper.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.CmsRoleAuthorityMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.CmsRoleAuthority" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 18:17:00 CST 2018.
+    -->
+    <result column="SELF_CHILD" property="selfChild" jdbcType="VARCHAR" />
+    <result column="PARENT_CHILD" property="parentChild" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 18:17:00 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 18:17:00 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 18:17:00 CST 2018.
+    -->
+    SELF_CHILD, PARENT_CHILD, CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, 
+    UPDATE_TIME
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.CmsRoleAuthorityExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 18:17:00 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from cms_role_authority
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.CmsRoleAuthorityExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 18:17:00 CST 2018.
+    -->
+    delete from cms_role_authority
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.CmsRoleAuthority" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 18:17:00 CST 2018.
+    -->
+  <!--   <selectKey resultType="java.lang.String" keyProperty="selfChild" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_role_authority (SELF_CHILD, PARENT_CHILD, CREATE_DATE, 
+      CREATE_TIME, CREATE_USER, UPDATE_USER, 
+      UPDATE_DATE, UPDATE_TIME)
+    values (#{selfChild,jdbcType=VARCHAR}, #{parentChild,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.CmsRoleAuthority" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 18:17:00 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.String" keyProperty="selfChild" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_role_authority
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      SELF_CHILD,
+      <if test="parentChild != null" >
+        PARENT_CHILD,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{selfChild,jdbcType=VARCHAR},
+      <if test="parentChild != null" >
+        #{parentChild,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.CmsRoleAuthorityExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 18:17:00 CST 2018.
+    -->
+    select count(*) from cms_role_authority
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 18:17:00 CST 2018.
+    -->
+    update cms_role_authority
+    <set >
+      <if test="record.selfChild != null" >
+        SELF_CHILD = #{record.selfChild,jdbcType=VARCHAR},
+      </if>
+      <if test="record.parentChild != null" >
+        PARENT_CHILD = #{record.parentChild,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 18:17:00 CST 2018.
+    -->
+    update cms_role_authority
+    set SELF_CHILD = #{record.selfChild,jdbcType=VARCHAR},
+      PARENT_CHILD = #{record.parentChild,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsSysAuthorityExMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsSysAuthorityExMapper.xml
new file mode 100644
index 000000000..a4f7282eb
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsSysAuthorityExMapper.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.CmsSysAuthorityExMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.CmsSysAuthority" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    <id column="NUM" property="num" jdbcType="INTEGER" />
+    <result column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="LEVEL" property="level" jdbcType="VARCHAR" />
+    <result column="TYPE" property="type" jdbcType="VARCHAR" />
+    <result column="OPERATOR_ROLE_NAME" property="operatorRoleName" jdbcType="VARCHAR" />
+    <result column="OPERATOR_ROLE_PATH" property="operatorRolePath" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  	<resultMap id="roleResultMap"
+		type="com.ruoyi.content.domain.CmsSysRoleAuthorDto">
+		<id column="NUM" property="num" jdbcType="INTEGER" />
+		<result column="ID" property="id" jdbcType="VARCHAR" />
+		<result column="LEVEL" property="level" jdbcType="VARCHAR" />
+		<result column="TYPE" property="type" jdbcType="VARCHAR" />
+		<result column="OPERATOR_ROLE_NAME" property="operatorRoleName"
+			jdbcType="VARCHAR" />
+		<result column="OPERATOR_ROLE_PATH" property="operatorRolePath"
+			jdbcType="VARCHAR" />
+		<result column="ISHAVE" property="isHave" jdbcType="VARCHAR" />
+	</resultMap>
+	
+   <!-- 分页查询 -->
+  <select id="selectAllMenuWithLimit" resultMap="BaseResultMap"
+		parameterType="com.ruoyi.content.domain.CmsSysAuthorityExample">
+		select NUM, ID, LEVEL, TYPE, OPERATOR_ROLE_NAME,
+		OPERATOR_ROLE_PATH,
+		CREATE_DATE, CREATE_TIME,
+		CREATE_USER, UPDATE_DATE,
+		UPDATE_TIME, UPDATE_USER from cms_sys_authority 
+		where 1=1
+		<if test="id != null and id !=''" >
+       		and ID like CONCAT(CONCAT('%', #{id,jdbcType=VARCHAR}), '%')
+     	</if>
+     	<if test="level != null and level !=''" >
+       		and LEVEL like CONCAT(CONCAT('%', #{level,jdbcType=VARCHAR}), '%')
+     	</if>
+     	<if test="type != null and type !=''" >
+       		and TYPE like CONCAT(CONCAT('%', #{type,jdbcType=VARCHAR}), '%')
+     	</if>
+     	<if test="operatorRoleName != null and operatorRoleName !=''" >
+       		and OPERATOR_ROLE_NAME like CONCAT(CONCAT('%', #{operatorRoleName,jdbcType=VARCHAR}), '%')
+     	</if>
+		order by TYPE,LEVEL ASC 
+		limit #{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>
+  <select id="selectAllRoleMenuWithLimit" resultMap="roleResultMap"
+		parameterType="com.ruoyi.content.domain.CmsSysAuthorityExample">
+		select NUM, ID, LEVEL, TYPE, OPERATOR_ROLE_NAME,
+		OPERATOR_ROLE_PATH,
+		CASE when
+		id in (select PARENT_CHILD from
+		cms_role_authority where
+		SELF_CHILD=#{role,jdbcType=VARCHAR}) then 'Y'
+		else 'N' end as isHave
+		from
+		cms_sys_authority
+		where 1=1
+		<if test="id != null and id !=''">
+			and ID like CONCAT(CONCAT('%', #{id,jdbcType=VARCHAR}),
+			'%')
+		</if>
+		<if test="level != null and level !=''">
+			and LEVEL like CONCAT(CONCAT('%',
+			#{level,jdbcType=VARCHAR}), '%')
+		</if>
+		<if test="type != null and type !=''">
+			and TYPE like CONCAT(CONCAT('%',
+			#{type,jdbcType=VARCHAR}), '%')
+		</if>
+		<if test="operatorRoleName != null and operatorRoleName !=''">
+			and OPERATOR_ROLE_NAME like CONCAT(CONCAT('%',
+			#{operatorRoleName,jdbcType=VARCHAR}), '%')
+		</if>
+		order by TYPE,LEVEL ASC
+		limit
+		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsSysAuthorityMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsSysAuthorityMapper.xml
new file mode 100644
index 000000000..9494ec681
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsSysAuthorityMapper.xml
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.CmsSysAuthorityMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.CmsSysAuthority" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    <id column="NUM" property="num" jdbcType="INTEGER" />
+    <result column="ID" property="id" jdbcType="VARCHAR" />
+    <result column="LEVEL" property="level" jdbcType="VARCHAR" />
+    <result column="TYPE" property="type" jdbcType="VARCHAR" />
+    <result column="OPERATOR_ROLE_NAME" property="operatorRoleName" jdbcType="VARCHAR" />
+    <result column="OPERATOR_ROLE_PATH" property="operatorRolePath" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    NUM, ID, LEVEL, TYPE, OPERATOR_ROLE_NAME, OPERATOR_ROLE_PATH, CREATE_DATE, CREATE_TIME, 
+    CREATE_USER, UPDATE_DATE, UPDATE_TIME, UPDATE_USER
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.CmsSysAuthorityExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from cms_sys_authority
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from cms_sys_authority
+    where NUM = #{num,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    delete from cms_sys_authority
+    where NUM = #{num,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.CmsSysAuthorityExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    delete from cms_sys_authority
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.CmsSysAuthority" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    insert into cms_sys_authority (NUM, ID, LEVEL, 
+      TYPE, OPERATOR_ROLE_NAME, OPERATOR_ROLE_PATH, 
+      CREATE_DATE, CREATE_TIME, CREATE_USER, 
+      UPDATE_DATE, UPDATE_TIME, UPDATE_USER
+      )
+    values (#{num,jdbcType=INTEGER}, #{id,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR}, 
+      #{type,jdbcType=VARCHAR}, #{operatorRoleName,jdbcType=VARCHAR}, #{operatorRolePath,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.CmsSysAuthority" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    insert into cms_sys_authority
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="num != null" >
+        NUM,
+      </if>
+      <if test="id != null" >
+        ID,
+      </if>
+      <if test="level != null" >
+        LEVEL,
+      </if>
+      <if test="type != null" >
+        TYPE,
+      </if>
+      <if test="operatorRoleName != null" >
+        OPERATOR_ROLE_NAME,
+      </if>
+      <if test="operatorRolePath != null" >
+        OPERATOR_ROLE_PATH,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="num != null" >
+        #{num,jdbcType=INTEGER},
+      </if>
+      <if test="id != null" >
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="level != null" >
+        #{level,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null" >
+        #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="operatorRoleName != null" >
+        #{operatorRoleName,jdbcType=VARCHAR},
+      </if>
+      <if test="operatorRolePath != null" >
+        #{operatorRolePath,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.CmsSysAuthorityExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    select count(*) from cms_sys_authority
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    update cms_sys_authority
+    <set >
+      <if test="record.num != null" >
+        NUM = #{record.num,jdbcType=INTEGER},
+      </if>
+      <if test="record.id != null" >
+        ID = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.level != null" >
+        LEVEL = #{record.level,jdbcType=VARCHAR},
+      </if>
+      <if test="record.type != null" >
+        TYPE = #{record.type,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operatorRoleName != null" >
+        OPERATOR_ROLE_NAME = #{record.operatorRoleName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.operatorRolePath != null" >
+        OPERATOR_ROLE_PATH = #{record.operatorRolePath,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    update cms_sys_authority
+    set NUM = #{record.num,jdbcType=INTEGER},
+      ID = #{record.id,jdbcType=VARCHAR},
+      LEVEL = #{record.level,jdbcType=VARCHAR},
+      TYPE = #{record.type,jdbcType=VARCHAR},
+      OPERATOR_ROLE_NAME = #{record.operatorRoleName,jdbcType=VARCHAR},
+      OPERATOR_ROLE_PATH = #{record.operatorRolePath,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.CmsSysAuthority" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    update cms_sys_authority
+    <set >
+      <if test="id != null" >
+        ID = #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="level != null" >
+        LEVEL = #{level,jdbcType=VARCHAR},
+      </if>
+      <if test="type != null" >
+        TYPE = #{type,jdbcType=VARCHAR},
+      </if>
+      <if test="operatorRoleName != null" >
+        OPERATOR_ROLE_NAME = #{operatorRoleName,jdbcType=VARCHAR},
+      </if>
+      <if test="operatorRolePath != null" >
+        OPERATOR_ROLE_PATH = #{operatorRolePath,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where NUM = #{num,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.CmsSysAuthority" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    update cms_sys_authority
+    set ID = #{id,jdbcType=VARCHAR},
+      LEVEL = #{level,jdbcType=VARCHAR},
+      TYPE = #{type,jdbcType=VARCHAR},
+      OPERATOR_ROLE_NAME = #{operatorRoleName,jdbcType=VARCHAR},
+      OPERATOR_ROLE_PATH = #{operatorRolePath,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR}
+    where NUM = #{num,jdbcType=INTEGER}
+  </update>
+  
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsSysRoleExMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsSysRoleExMapper.xml
new file mode 100644
index 000000000..4f066bbad
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsSysRoleExMapper.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.CmsSysRoleExMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.CmsSysRole" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    <id column="ID" property="id" jdbcType="INTEGER" />
+    <result column="NAME" property="name" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    ID, NAME, CREATE_USER, CREATE_DATE, CREATE_TIME, UPDATE_USER, UPDATE_DATE, UPDATE_TIME
+  </sql>
+  
+  <!-- 分页查询 -->
+  <select id="selectByPage" resultMap="BaseResultMap">
+   	select
+    <include refid="Base_Column_List" />
+    from cms_sys_role
+    where 1=1
+    <if test="name != null and name !=''" >
+       	and NAME like CONCAT(CONCAT('%', #{name,jdbcType=VARCHAR}), '%')
+     </if>
+    order by CREATE_DATE desc ,CREATE_TIME desc,UPDATE_DATE desc
+	limit #{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+  </select>
+  	<resultMap id="userRoleResultMap"
+		type="com.ruoyi.content.domain.CmsUSerSysRoleDto">
+		<result column="ID" property="id" jdbcType="VARCHAR" />
+		<result column="NAME" property="name" jdbcType="VARCHAR" />
+		<result column="isHave" property="isHave" jdbcType="VARCHAR" />
+	</resultMap>
+  <select id="selectuserRoleByPage" resultMap="userRoleResultMap">
+		select ID,NAME,CASE when NAME in(select AUTHORITY_NAME from cms_user_role
+		where
+		AUTHORITY_EMAIL=#{email,jdbcType=VARCHAR}) then 'Y' else 'N' end
+		as isHave from
+		cms_sys_role where 1=1
+		<if test="name != null and name !=''">
+			and NAME like CONCAT(CONCAT('%',
+			#{name,jdbcType=VARCHAR}), '%')
+		</if>
+		order by CREATE_DATE desc ,CREATE_TIME desc,UPDATE_DATE desc
+		limit
+		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+	</select>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsSysRoleMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsSysRoleMapper.xml
new file mode 100644
index 000000000..4ecda12b3
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsSysRoleMapper.xml
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.CmsSysRoleMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.CmsSysRole" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    <id column="ID" property="id" jdbcType="INTEGER" />
+    <result column="NAME" property="name" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    ID, NAME, CREATE_USER, CREATE_DATE, CREATE_TIME, UPDATE_USER, UPDATE_DATE, UPDATE_TIME
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.CmsSysRoleExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from cms_sys_role
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from cms_sys_role
+    where ID = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    delete from cms_sys_role
+    where ID = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.CmsSysRoleExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    delete from cms_sys_role
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.CmsSysRole" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    insert into cms_sys_role (ID, NAME, CREATE_USER, 
+      CREATE_DATE, CREATE_TIME, UPDATE_USER, 
+      UPDATE_DATE, UPDATE_TIME)
+    values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.CmsSysRole" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    insert into cms_sys_role
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        ID,
+      </if>
+      <if test="name != null" >
+        NAME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      <if test="id != null" >
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.CmsSysRoleExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    select count(*) from cms_sys_role
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    update cms_sys_role
+    <set >
+      <if test="record.id != null" >
+        ID = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.name != null" >
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    update cms_sys_role
+    set ID = #{record.id,jdbcType=INTEGER},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.CmsSysRole" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    update cms_sys_role
+    <set >
+      <if test="name != null" >
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.CmsSysRole" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+    update cms_sys_role
+    set NAME = #{name,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsSysUserExMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsSysUserExMapper.xml
new file mode 100644
index 000000000..f63b49e76
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsSysUserExMapper.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.CmsSysUserExMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.CmsSysUser" >
+<id column="EMAIL" property="email" jdbcType="VARCHAR" />
+    <result column="OPEN_ID" property="openId" jdbcType="VARCHAR" />
+    <result column="PWD" property="pwd" jdbcType="VARCHAR" />
+    <result column="SALT" property="salt" jdbcType="VARCHAR" />
+    <result column="USER_ID" property="userId" jdbcType="VARCHAR" />
+    <result column="JOB_NUMBER" property="jobNumber" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+    <result column="NAME" property="name" jdbcType="VARCHAR" />
+    <result column="SEX" property="sex" jdbcType="VARCHAR" />
+    <result column="PHONE" property="phone" jdbcType="VARCHAR" />
+    <result column="STATE" property="state" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_REMARK" property="updateRemark" jdbcType="VARCHAR" />
+  </resultMap>
+
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Thu Aug 17 17:24:12 CST 2017.
+    -->
+      EMAIL, OPEN_ID, PWD, SALT, USER_ID, JOB_NUMBER, COMPANY_ID, BRANCH_ID, NAME, SEX, 
+    PHONE, STATE, CREATE_USER, CREATE_DATE, CREATE_TIME, UPDATE_USER, UPDATE_DATE, UPDATE_TIME, 
+    UPDATE_REMARK
+  </sql>
+ 
+  <!-- 分页查询 -->
+  <select id="selectByPage" resultMap="BaseResultMap">
+   	select
+    <include refid="Base_Column_List" />
+    from cms_sys_user
+    where 1=1
+    <if test="email != null and email !=''" >
+       	and EMAIL like CONCAT(CONCAT('%', #{email, jdbcType=VARCHAR}), '%')
+    </if>
+	<if test="phone != null and phone !=''" >
+       	and PHONE like CONCAT(CONCAT('%', #{phone, jdbcType=VARCHAR}), '%')
+     </if>
+     <if test="name != null and name !=''" >
+       	and NAME like CONCAT(CONCAT('%', #{name,jdbcType=VARCHAR}), '%')
+     </if>
+     <if test="companyId != null and companyId !=''" >
+       	and COMPANY_ID = #{companyId,jdbcType=VARCHAR} 
+     </if>
+    order by CREATE_DATE desc ,CREATE_TIME desc,UPDATE_DATE desc
+	limit #{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+  </select>
+  
+  <select id="queryLoginInfoByEmail" parameterType="java.lang.String" resultMap="BaseResultMap">
+   	select
+    <include refid="Base_Column_List" />
+    from cms_sys_user
+    where 
+    EMAIL = #{email, jdbcType=VARCHAR}
+    
+  </select>
+  
+  
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsSysUserMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsSysUserMapper.xml
new file mode 100644
index 000000000..4f5ca8486
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsSysUserMapper.xml
@@ -0,0 +1,510 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.CmsSysUserMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.CmsSysUser" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    <id column="EMAIL" property="email" jdbcType="VARCHAR" />
+    <result column="OPEN_ID" property="openId" jdbcType="VARCHAR" />
+    <result column="PWD" property="pwd" jdbcType="VARCHAR" />
+    <result column="SALT" property="salt" jdbcType="VARCHAR" />
+    <result column="USER_ID" property="userId" jdbcType="VARCHAR" />
+    <result column="JOB_NUMBER" property="jobNumber" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
+    <result column="NAME" property="name" jdbcType="VARCHAR" />
+    <result column="SEX" property="sex" jdbcType="VARCHAR" />
+    <result column="PHONE" property="phone" jdbcType="VARCHAR" />
+    <result column="STATE" property="state" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_REMARK" property="updateRemark" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    EMAIL, OPEN_ID, PWD, SALT, USER_ID, JOB_NUMBER, COMPANY_ID, BRANCH_ID, NAME, SEX, 
+    PHONE, STATE, CREATE_USER, CREATE_DATE, CREATE_TIME, UPDATE_USER, UPDATE_DATE, UPDATE_TIME, 
+    UPDATE_REMARK
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.CmsSysUserExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from cms_sys_user
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from cms_sys_user
+    where EMAIL = #{email,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    delete from cms_sys_user
+    where EMAIL = #{email,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.CmsSysUserExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    delete from cms_sys_user
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.CmsSysUser" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+<!--     <selectKey resultType="java.lang.String" keyProperty="email" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_sys_user (EMAIL, OPEN_ID, PWD, 
+      SALT, USER_ID, JOB_NUMBER, 
+      COMPANY_ID, BRANCH_ID, NAME, 
+      SEX, PHONE, STATE, 
+      CREATE_USER, CREATE_DATE, CREATE_TIME, 
+      UPDATE_USER, UPDATE_DATE, UPDATE_TIME, 
+      UPDATE_REMARK)
+    values (#{email,jdbcType=VARCHAR}, #{openId,jdbcType=VARCHAR}, #{pwd,jdbcType=VARCHAR}, 
+      #{salt,jdbcType=VARCHAR}, #{userId,jdbcType=VARCHAR}, #{jobNumber,jdbcType=VARCHAR}, 
+      #{companyId,jdbcType=VARCHAR}, #{branchId,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{sex,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
+      #{updateUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}, 
+      #{updateRemark,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.CmsSysUser" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.String" keyProperty="email" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into cms_sys_user
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      EMAIL,
+      <if test="openId != null" >
+        OPEN_ID,
+      </if>
+      <if test="pwd != null" >
+        PWD,
+      </if>
+      <if test="salt != null" >
+        SALT,
+      </if>
+      <if test="userId != null" >
+        USER_ID,
+      </if>
+      <if test="jobNumber != null" >
+        JOB_NUMBER,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID,
+      </if>
+      <if test="name != null" >
+        NAME,
+      </if>
+      <if test="sex != null" >
+        SEX,
+      </if>
+      <if test="phone != null" >
+        PHONE,
+      </if>
+      <if test="state != null" >
+        STATE,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="updateRemark != null" >
+        UPDATE_REMARK,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{email,jdbcType=VARCHAR},
+      <if test="openId != null" >
+        #{openId,jdbcType=VARCHAR},
+      </if>
+      <if test="pwd != null" >
+        #{pwd,jdbcType=VARCHAR},
+      </if>
+      <if test="salt != null" >
+        #{salt,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null" >
+        #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="jobNumber != null" >
+        #{jobNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        #{branchId,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sex != null" >
+        #{sex,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateRemark != null" >
+        #{updateRemark,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.CmsSysUserExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    select count(*) from cms_sys_user
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    update cms_sys_user
+    <set >
+      <if test="record.email != null" >
+        EMAIL = #{record.email,jdbcType=VARCHAR},
+      </if>
+      <if test="record.openId != null" >
+        OPEN_ID = #{record.openId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.pwd != null" >
+        PWD = #{record.pwd,jdbcType=VARCHAR},
+      </if>
+      <if test="record.salt != null" >
+        SALT = #{record.salt,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userId != null" >
+        USER_ID = #{record.userId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jobNumber != null" >
+        JOB_NUMBER = #{record.jobNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.branchId != null" >
+        BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null" >
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sex != null" >
+        SEX = #{record.sex,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phone != null" >
+        PHONE = #{record.phone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null" >
+        STATE = #{record.state,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateRemark != null" >
+        UPDATE_REMARK = #{record.updateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    update cms_sys_user
+    set EMAIL = #{record.email,jdbcType=VARCHAR},
+      OPEN_ID = #{record.openId,jdbcType=VARCHAR},
+      PWD = #{record.pwd,jdbcType=VARCHAR},
+      SALT = #{record.salt,jdbcType=VARCHAR},
+      USER_ID = #{record.userId,jdbcType=VARCHAR},
+      JOB_NUMBER = #{record.jobNumber,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{record.branchId,jdbcType=VARCHAR},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      SEX = #{record.sex,jdbcType=VARCHAR},
+      PHONE = #{record.phone,jdbcType=VARCHAR},
+      STATE = #{record.state,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      UPDATE_REMARK = #{record.updateRemark,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.CmsSysUser" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    update cms_sys_user
+    <set >
+      <if test="openId != null" >
+        OPEN_ID = #{openId,jdbcType=VARCHAR},
+      </if>
+      <if test="pwd != null" >
+        PWD = #{pwd,jdbcType=VARCHAR},
+      </if>
+      <if test="salt != null" >
+        SALT = #{salt,jdbcType=VARCHAR},
+      </if>
+      <if test="userId != null" >
+        USER_ID = #{userId,jdbcType=VARCHAR},
+      </if>
+      <if test="jobNumber != null" >
+        JOB_NUMBER = #{jobNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="branchId != null" >
+        BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sex != null" >
+        SEX = #{sex,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        PHONE = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        STATE = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateRemark != null" >
+        UPDATE_REMARK = #{updateRemark,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where EMAIL = #{email,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.CmsSysUser" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Aug 28 09:28:51 CST 2018.
+    -->
+    update cms_sys_user
+    set OPEN_ID = #{openId,jdbcType=VARCHAR},
+      PWD = #{pwd,jdbcType=VARCHAR},
+      SALT = #{salt,jdbcType=VARCHAR},
+      USER_ID = #{userId,jdbcType=VARCHAR},
+      JOB_NUMBER = #{jobNumber,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      BRANCH_ID = #{branchId,jdbcType=VARCHAR},
+      NAME = #{name,jdbcType=VARCHAR},
+      SEX = #{sex,jdbcType=VARCHAR},
+      PHONE = #{phone,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      UPDATE_REMARK = #{updateRemark,jdbcType=VARCHAR}
+    where EMAIL = #{email,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/CmsUserRoleMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CmsUserRoleMapper.xml
new file mode 100644
index 000000000..5eaa014ac
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/CmsUserRoleMapper.xml
@@ -0,0 +1,351 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.content.mapper.CmsUserRoleMapper">
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.CmsUserRole">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    <id column="ID" jdbcType="INTEGER" property="id" />
+    <result column="AUTHORITY_NAME" jdbcType="VARCHAR" property="authorityName" />
+    <result column="AUTHORITY_EMAIL" jdbcType="VARCHAR" property="authorityEmail" />
+    <result column="CREATE_USER" jdbcType="VARCHAR" property="createUser" />
+    <result column="CREATE_DATE" jdbcType="VARCHAR" property="createDate" />
+    <result column="CREATE_TIME" jdbcType="VARCHAR" property="createTime" />
+    <result column="UPDATE_USER" jdbcType="VARCHAR" property="updateUser" />
+    <result column="UPDATE_DATE" jdbcType="VARCHAR" property="updateDate" />
+    <result column="UPDATE_TIME" jdbcType="VARCHAR" property="updateTime" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    ID, AUTHORITY_NAME, AUTHORITY_EMAIL, CREATE_USER, CREATE_DATE, CREATE_TIME, UPDATE_USER, 
+    UPDATE_DATE, UPDATE_TIME
+  </sql>
+  <select id="selectByExample" parameterType="com.ruoyi.content.domain.CmsUserRoleExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from cms_user_role
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from cms_user_role
+    where ID = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    delete from cms_user_role
+    where ID = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.CmsUserRoleExample">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    delete from cms_user_role
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.CmsUserRole">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    insert into cms_user_role (ID, AUTHORITY_NAME, AUTHORITY_EMAIL, 
+      CREATE_USER, CREATE_DATE, CREATE_TIME, 
+      UPDATE_USER, UPDATE_DATE, UPDATE_TIME
+      )
+    values (#{id,jdbcType=INTEGER}, #{authorityName,jdbcType=VARCHAR}, #{authorityEmail,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
+      #{updateUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.CmsUserRole">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    insert into cms_user_role
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        ID,
+      </if>
+      <if test="authorityName != null">
+        AUTHORITY_NAME,
+      </if>
+      <if test="authorityEmail != null">
+        AUTHORITY_EMAIL,
+      </if>
+      <if test="createUser != null">
+        CREATE_USER,
+      </if>
+      <if test="createDate != null">
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME,
+      </if>
+      <if test="updateUser != null">
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null">
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=INTEGER},
+      </if>
+      <if test="authorityName != null">
+        #{authorityName,jdbcType=VARCHAR},
+      </if>
+      <if test="authorityEmail != null">
+        #{authorityEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null">
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null">
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null">
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.CmsUserRoleExample" resultType="java.lang.Integer">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    select count(*) from cms_user_role
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    update cms_user_role
+    <set>
+      <if test="record.id != null">
+        ID = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.authorityName != null">
+        AUTHORITY_NAME = #{record.authorityName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.authorityEmail != null">
+        AUTHORITY_EMAIL = #{record.authorityEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null">
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null">
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null">
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null">
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null">
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null">
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    update cms_user_role
+    set ID = #{record.id,jdbcType=INTEGER},
+      AUTHORITY_NAME = #{record.authorityName,jdbcType=VARCHAR},
+      AUTHORITY_EMAIL = #{record.authorityEmail,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.CmsUserRole">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    update cms_user_role
+    <set>
+      <if test="authorityName != null">
+        AUTHORITY_NAME = #{authorityName,jdbcType=VARCHAR},
+      </if>
+      <if test="authorityEmail != null">
+        AUTHORITY_EMAIL = #{authorityEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null">
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null">
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null">
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null">
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.CmsUserRole">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Fri Aug 18 13:38:42 CST 2017.
+    -->
+    update cms_user_role
+    set AUTHORITY_NAME = #{authorityName,jdbcType=VARCHAR},
+      AUTHORITY_EMAIL = #{authorityEmail,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
+    where ID = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/CompanyInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/CompanyInfoMapper.xml
new file mode 100644
index 000000000..373070a85
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/CompanyInfoMapper.xml
@@ -0,0 +1,478 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.CompanyInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.CompanyInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <id column="COMPANY_ID" property="companyId" jdbcType="INTEGER" />
+    <result column="APP_NAME" property="appName" jdbcType="VARCHAR" />
+    <result column="APP_ORIGINAL_ID" property="appOriginalId" jdbcType="VARCHAR" />
+    <result column="WECHAT_CODE" property="wechatCode" jdbcType="VARCHAR" />
+    <result column="WECHAT_TYPE" property="wechatType" jdbcType="VARCHAR" />
+    <result column="QR_CODE_URL" property="qrCodeUrl" jdbcType="VARCHAR" />
+    <result column="APP_ID" property="appId" jdbcType="VARCHAR" />
+    <result column="APP_SECRET" property="appSecret" jdbcType="VARCHAR" />
+    <result column="COMPANY_CODE" property="companyCode" jdbcType="VARCHAR" />
+    <result column="COMPANY_NAME" property="companyName" jdbcType="VARCHAR" />
+    <result column="COMPANY_TYPE" property="companyType" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    COMPANY_ID, APP_NAME, APP_ORIGINAL_ID, WECHAT_CODE, WECHAT_TYPE, QR_CODE_URL, APP_ID, 
+    APP_SECRET, COMPANY_CODE, COMPANY_NAME, COMPANY_TYPE, CREATE_DATE, CREATE_TIME, CREATE_USER, 
+    UPDATE_USER, UPDATE_DATE, UPDATE_TIME
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.CompanyInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from company_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from company_info
+    where COMPANY_ID = #{companyId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    delete from company_info
+    where COMPANY_ID = #{companyId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.CompanyInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    delete from company_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.CompanyInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="companyId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into company_info (COMPANY_ID, APP_NAME, APP_ORIGINAL_ID, 
+      WECHAT_CODE, WECHAT_TYPE, QR_CODE_URL, 
+      APP_ID, APP_SECRET, COMPANY_CODE, 
+      COMPANY_NAME, COMPANY_TYPE, CREATE_DATE, 
+      CREATE_TIME, CREATE_USER, UPDATE_USER, 
+      UPDATE_DATE, UPDATE_TIME)
+    values (#{companyId,jdbcType=INTEGER}, #{appName,jdbcType=VARCHAR}, #{appOriginalId,jdbcType=VARCHAR}, 
+      #{wechatCode,jdbcType=VARCHAR}, #{wechatType,jdbcType=VARCHAR}, #{qrCodeUrl,jdbcType=VARCHAR}, 
+      #{appId,jdbcType=VARCHAR}, #{appSecret,jdbcType=VARCHAR}, #{companyCode,jdbcType=VARCHAR}, 
+      #{companyName,jdbcType=VARCHAR}, #{companyType,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}, 
+      #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.CompanyInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="companyId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into company_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      COMPANY_ID,
+      <if test="appName != null" >
+        APP_NAME,
+      </if>
+      <if test="appOriginalId != null" >
+        APP_ORIGINAL_ID,
+      </if>
+      <if test="wechatCode != null" >
+        WECHAT_CODE,
+      </if>
+      <if test="wechatType != null" >
+        WECHAT_TYPE,
+      </if>
+      <if test="qrCodeUrl != null" >
+        QR_CODE_URL,
+      </if>
+      <if test="appId != null" >
+        APP_ID,
+      </if>
+      <if test="appSecret != null" >
+        APP_SECRET,
+      </if>
+      <if test="companyCode != null" >
+        COMPANY_CODE,
+      </if>
+      <if test="companyName != null" >
+        COMPANY_NAME,
+      </if>
+      <if test="companyType != null" >
+        COMPANY_TYPE,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{companyId,jdbcType=INTEGER},
+      <if test="appName != null" >
+        #{appName,jdbcType=VARCHAR},
+      </if>
+      <if test="appOriginalId != null" >
+        #{appOriginalId,jdbcType=VARCHAR},
+      </if>
+      <if test="wechatCode != null" >
+        #{wechatCode,jdbcType=VARCHAR},
+      </if>
+      <if test="wechatType != null" >
+        #{wechatType,jdbcType=VARCHAR},
+      </if>
+      <if test="qrCodeUrl != null" >
+        #{qrCodeUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="appId != null" >
+        #{appId,jdbcType=VARCHAR},
+      </if>
+      <if test="appSecret != null" >
+        #{appSecret,jdbcType=VARCHAR},
+      </if>
+      <if test="companyCode != null" >
+        #{companyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null" >
+        #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="companyType != null" >
+        #{companyType,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.CompanyInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    select count(*) from company_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update company_info
+    <set >
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=INTEGER},
+      </if>
+      <if test="record.appName != null" >
+        APP_NAME = #{record.appName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.appOriginalId != null" >
+        APP_ORIGINAL_ID = #{record.appOriginalId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wechatCode != null" >
+        WECHAT_CODE = #{record.wechatCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.wechatType != null" >
+        WECHAT_TYPE = #{record.wechatType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.qrCodeUrl != null" >
+        QR_CODE_URL = #{record.qrCodeUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.appId != null" >
+        APP_ID = #{record.appId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.appSecret != null" >
+        APP_SECRET = #{record.appSecret,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyCode != null" >
+        COMPANY_CODE = #{record.companyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyName != null" >
+        COMPANY_NAME = #{record.companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyType != null" >
+        COMPANY_TYPE = #{record.companyType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update company_info
+    set COMPANY_ID = #{record.companyId,jdbcType=INTEGER},
+      APP_NAME = #{record.appName,jdbcType=VARCHAR},
+      APP_ORIGINAL_ID = #{record.appOriginalId,jdbcType=VARCHAR},
+      WECHAT_CODE = #{record.wechatCode,jdbcType=VARCHAR},
+      WECHAT_TYPE = #{record.wechatType,jdbcType=VARCHAR},
+      QR_CODE_URL = #{record.qrCodeUrl,jdbcType=VARCHAR},
+      APP_ID = #{record.appId,jdbcType=VARCHAR},
+      APP_SECRET = #{record.appSecret,jdbcType=VARCHAR},
+      COMPANY_CODE = #{record.companyCode,jdbcType=VARCHAR},
+      COMPANY_NAME = #{record.companyName,jdbcType=VARCHAR},
+      COMPANY_TYPE = #{record.companyType,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.CompanyInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update company_info
+    <set >
+      <if test="appName != null" >
+        APP_NAME = #{appName,jdbcType=VARCHAR},
+      </if>
+      <if test="appOriginalId != null" >
+        APP_ORIGINAL_ID = #{appOriginalId,jdbcType=VARCHAR},
+      </if>
+      <if test="wechatCode != null" >
+        WECHAT_CODE = #{wechatCode,jdbcType=VARCHAR},
+      </if>
+      <if test="wechatType != null" >
+        WECHAT_TYPE = #{wechatType,jdbcType=VARCHAR},
+      </if>
+      <if test="qrCodeUrl != null" >
+        QR_CODE_URL = #{qrCodeUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="appId != null" >
+        APP_ID = #{appId,jdbcType=VARCHAR},
+      </if>
+      <if test="appSecret != null" >
+        APP_SECRET = #{appSecret,jdbcType=VARCHAR},
+      </if>
+      <if test="companyCode != null" >
+        COMPANY_CODE = #{companyCode,jdbcType=VARCHAR},
+      </if>
+      <if test="companyName != null" >
+        COMPANY_NAME = #{companyName,jdbcType=VARCHAR},
+      </if>
+      <if test="companyType != null" >
+        COMPANY_TYPE = #{companyType,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where COMPANY_ID = #{companyId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.CompanyInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Mar 26 15:46:22 CST 2018.
+    -->
+    update company_info
+    set APP_NAME = #{appName,jdbcType=VARCHAR},
+      APP_ORIGINAL_ID = #{appOriginalId,jdbcType=VARCHAR},
+      WECHAT_CODE = #{wechatCode,jdbcType=VARCHAR},
+      WECHAT_TYPE = #{wechatType,jdbcType=VARCHAR},
+      QR_CODE_URL = #{qrCodeUrl,jdbcType=VARCHAR},
+      APP_ID = #{appId,jdbcType=VARCHAR},
+      APP_SECRET = #{appSecret,jdbcType=VARCHAR},
+      COMPANY_CODE = #{companyCode,jdbcType=VARCHAR},
+      COMPANY_NAME = #{companyName,jdbcType=VARCHAR},
+      COMPANY_TYPE = #{companyType,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
+    where COMPANY_ID = #{companyId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/GalleryChannelMapper.xml b/ruoyi-content/src/main/resources/mapper/content/GalleryChannelMapper.xml
index b78ba4eaa..76ff2ae6e 100644
--- a/ruoyi-content/src/main/resources/mapper/content/GalleryChannelMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/GalleryChannelMapper.xml
@@ -104,7 +104,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from cms_gallery_channel
+    from gallery_channel
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -120,7 +120,7 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from cms_gallery_channel
+    from gallery_channel
     where ID = #{id,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
@@ -129,7 +129,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Wed Sep 19 10:35:12 CST 2018.
     -->
-    delete from cms_gallery_channel
+    delete from gallery_channel
     where ID = #{id,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.GalleryChannelExample" >
@@ -138,7 +138,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Wed Sep 19 10:35:12 CST 2018.
     -->
-    delete from cms_gallery_channel
+    delete from gallery_channel
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -152,7 +152,7 @@
     <!-- <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
        SELECT LAST_INSERT_ID() 
     </selectKey> -->
-    insert into cms_gallery_channel (ID, PIC_ID, SPECIAL,
+    insert into gallery_channel (ID, PIC_ID, SPECIAL,
       CHANNEL_ID, STATE, CREATE_DATE, 
       CREATE_TIME, COMPANY_ID, BRANCH_ID
       )
@@ -170,7 +170,7 @@
     <!-- <selectKey resultType="java.lang.Integer" keyProperty="id" order="BEFORE" >
        SELECT LAST_INSERT_ID() 
     </selectKey> -->
-    insert into cms_gallery_channel
+    insert into gallery_channel
     <trim prefix="(" suffix=")" suffixOverrides="," >
       ID,
       <if test="picId != null" >
@@ -232,7 +232,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Wed Sep 19 10:35:12 CST 2018.
     -->
-    select count(*) from cms_gallery_channel
+    select count(*) from gallery_channel
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -243,7 +243,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Wed Sep 19 10:35:12 CST 2018.
     -->
-    update cms_gallery_channel
+    update gallery_channel
     <set >
       <if test="record.id != null" >
         ID = #{record.id,jdbcType=INTEGER},
@@ -283,7 +283,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Wed Sep 19 10:35:12 CST 2018.
     -->
-    update cms_gallery_channel
+    update gallery_channel
     set ID = #{record.id,jdbcType=INTEGER},
       PIC_ID = #{record.picId,jdbcType=INTEGER},
       SPECIAL = #{record.special,jdbcType=VARCHAR},
@@ -303,7 +303,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Wed Sep 19 10:35:12 CST 2018.
     -->
-    update cms_gallery_channel
+    update gallery_channel
     <set >
       <if test="picId != null" >
         PIC_ID = #{picId,jdbcType=INTEGER},
@@ -338,7 +338,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Wed Sep 19 10:35:12 CST 2018.
     -->
-    update cms_gallery_channel
+    update gallery_channel
     set PIC_ID = #{picId,jdbcType=INTEGER},
       SPECIAL = #{special,jdbcType=VARCHAR},
       CHANNEL_ID = #{channelId,jdbcType=VARCHAR},
diff --git a/ruoyi-content/src/main/resources/mapper/content/GalleryPicInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/GalleryPicInfoMapper.xml
index 0eee738b8..429708b08 100644
--- a/ruoyi-content/src/main/resources/mapper/content/GalleryPicInfoMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/GalleryPicInfoMapper.xml
@@ -107,7 +107,7 @@
       distinct
     </if>
     <include refid="Base_Column_List" />
-    from cms_gallery_pic_info
+    from gallery_pic_info
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -123,7 +123,7 @@
     -->
     select 
     <include refid="Base_Column_List" />
-    from cms_gallery_pic_info
+    from gallery_pic_info
     where PIC_ID = #{picId,jdbcType=INTEGER}
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
@@ -132,7 +132,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Thu Sep 20 09:57:29 CST 2018.
     -->
-    delete from cms_gallery_pic_info
+    delete from gallery_pic_info
     where PIC_ID = #{picId,jdbcType=INTEGER}
   </delete>
   <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.GalleryPicInfoExample" >
@@ -141,7 +141,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Thu Sep 20 09:57:29 CST 2018.
     -->
-    delete from cms_gallery_pic_info
+    delete from gallery_pic_info
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -155,7 +155,7 @@
     <!-- <selectKey resultType="java.lang.Integer" keyProperty="picId" order="BEFORE" >
        SELECT LAST_INSERT_ID() 
     </selectKey> -->
-    insert into cms_gallery_pic_info (PIC_ID, IMG_URL, PIC_AD_ID,
+    insert into gallery_pic_info (PIC_ID, IMG_URL, PIC_AD_ID,
       PIC_STATE, COMPANY_ID, CREATE_DATE, 
       CREATE_TIME, CREATE_USER, UPDATE_DATE, 
       UPDATE_TIME, BRANCH_ID)
@@ -173,7 +173,7 @@
     <!-- <selectKey resultType="java.lang.Integer" keyProperty="picId" order="BEFORE" >
        SELECT LAST_INSERT_ID() 
     </selectKey> -->
-    insert into cms_gallery_pic_info
+    insert into gallery_pic_info
     <trim prefix="(" suffix=")" suffixOverrides="," >
       PIC_ID,
       <if test="imgUrl != null" >
@@ -247,7 +247,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Thu Sep 20 09:57:29 CST 2018.
     -->
-    select count(*) from cms_gallery_pic_info
+    select count(*) from gallery_pic_info
     <if test="_parameter != null" >
       <include refid="Example_Where_Clause" />
     </if>
@@ -258,7 +258,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Thu Sep 20 09:57:29 CST 2018.
     -->
-    update cms_gallery_pic_info
+    update gallery_pic_info
     <set >
       <if test="record.picId != null" >
         PIC_ID = #{record.picId,jdbcType=INTEGER},
@@ -304,7 +304,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Thu Sep 20 09:57:29 CST 2018.
     -->
-    update cms_gallery_pic_info
+    update gallery_pic_info
     set PIC_ID = #{record.picId,jdbcType=INTEGER},
       IMG_URL = #{record.imgUrl,jdbcType=VARCHAR},
       PIC_AD_ID = #{record.picAdId,jdbcType=VARCHAR},
@@ -326,7 +326,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Thu Sep 20 09:57:29 CST 2018.
     -->
-    update cms_gallery_pic_info
+    update gallery_pic_info
     <set >
       <if test="imgUrl != null" >
         IMG_URL = #{imgUrl,jdbcType=VARCHAR},
@@ -367,7 +367,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Thu Sep 20 09:57:29 CST 2018.
     -->
-    update cms_gallery_pic_info
+    update gallery_pic_info
     set IMG_URL = #{imgUrl,jdbcType=VARCHAR},
       PIC_AD_ID = #{picAdId,jdbcType=VARCHAR},
       PIC_STATE = #{picState,jdbcType=VARCHAR},
diff --git a/ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml
index df2982c21..c1317e675 100644
--- a/ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml
@@ -21,7 +21,7 @@
   
    <sql id="adTitleSQL">
    	 SELECT ad.PIC_AD_NAME
-   	 FROM cms_pic_ad_info ad
+   	 FROM pic_ad_info ad
    	 WHERE ad.PIC_AD_ID = pi.PIC_AD_ID	 
    </sql>
 	<select id="selectAllWithLimit"
@@ -39,7 +39,7 @@
 		pi.CREATE_USER,
 		pi.UPDATE_DATE,
 		pi.UPDATE_TIME
-		FROM cms_gallery_pic_info pi
+		FROM gallery_pic_info pi
 		WHERE
 		1=1
 		<if test="companyId != null and companyId !=''">
@@ -90,7 +90,7 @@
 		pi.CREATE_USER,
 		pi.UPDATE_DATE,
 		pi.UPDATE_TIME
-		FROM cms_gallery_pic_info pi
+		FROM gallery_pic_info pi
 		WHERE
 		1=1
 		<if test="companyId != null and companyId !=''">
diff --git a/ruoyi-content/src/main/resources/mapper/content/LdComMapper.xml b/ruoyi-content/src/main/resources/mapper/content/LdComMapper.xml
new file mode 100644
index 000000000..e1d226fde
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/LdComMapper.xml
@@ -0,0 +1,812 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.LdComMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.LdCom" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    <id column="COMCODE" property="comcode" jdbcType="VARCHAR" />
+    <result column="OUTCOMCODE" property="outcomcode" jdbcType="VARCHAR" />
+    <result column="NAME" property="name" jdbcType="VARCHAR" />
+    <result column="SHORTNAME" property="shortname" jdbcType="VARCHAR" />
+    <result column="ADDRESS" property="address" jdbcType="VARCHAR" />
+    <result column="ZIPCODE" property="zipcode" jdbcType="VARCHAR" />
+    <result column="PHONE" property="phone" jdbcType="VARCHAR" />
+    <result column="FAX" property="fax" jdbcType="VARCHAR" />
+    <result column="EMAIL" property="email" jdbcType="VARCHAR" />
+    <result column="WEBADDRESS" property="webaddress" jdbcType="VARCHAR" />
+    <result column="SATRAPNAME" property="satrapname" jdbcType="VARCHAR" />
+    <result column="INSUMONITORCODE" property="insumonitorcode" jdbcType="VARCHAR" />
+    <result column="INSUREID" property="insureid" jdbcType="VARCHAR" />
+    <result column="SIGNID" property="signid" jdbcType="VARCHAR" />
+    <result column="REGIONALISMCODE" property="regionalismcode" jdbcType="VARCHAR" />
+    <result column="COMNATURE" property="comnature" jdbcType="VARCHAR" />
+    <result column="VALIDCODE" property="validcode" jdbcType="VARCHAR" />
+    <result column="SIGN" property="sign" jdbcType="VARCHAR" />
+    <result column="COMCITYSIZE" property="comcitysize" jdbcType="VARCHAR" />
+    <result column="SERVICENAME" property="servicename" jdbcType="VARCHAR" />
+    <result column="SERVICENO" property="serviceno" jdbcType="VARCHAR" />
+    <result column="SERVICEPHONE" property="servicephone" jdbcType="VARCHAR" />
+    <result column="SERVICEPOSTADDRESS" property="servicepostaddress" jdbcType="VARCHAR" />
+    <result column="SERVICEPOSTZIPCODE" property="servicepostzipcode" jdbcType="VARCHAR" />
+    <result column="LETTERSERVICENAME" property="letterservicename" jdbcType="VARCHAR" />
+    <result column="LETTERSERVICENO" property="letterserviceno" jdbcType="VARCHAR" />
+    <result column="LETTERSERVICEPHONE" property="letterservicephone" jdbcType="VARCHAR" />
+    <result column="LETTERSERVICEPOSTADDRESS" property="letterservicepostaddress" jdbcType="VARCHAR" />
+    <result column="LETTERSERVICEPOSTZIPCODE" property="letterservicepostzipcode" jdbcType="VARCHAR" />
+    <result column="COMGRADE" property="comgrade" jdbcType="VARCHAR" />
+    <result column="COMAREATYPE" property="comareatype" jdbcType="VARCHAR" />
+    <result column="INPUTDATE" property="inputdate" jdbcType="TIMESTAMP" />
+    <result column="INPUTTIME" property="inputtime" jdbcType="VARCHAR" />
+    <result column="SEQUENCE" property="sequence" jdbcType="VARCHAR" />
+    <result column="PROVINCE" property="province" jdbcType="VARCHAR" />
+    <result column="CITY" property="city" jdbcType="VARCHAR" />
+    <result column="COUNTY" property="county" jdbcType="VARCHAR" />
+    <result column="PREFECTURALLEVELCITY" property="prefecturallevelcity" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    COMCODE, OUTCOMCODE, NAME, SHORTNAME, ADDRESS, ZIPCODE, PHONE, FAX, EMAIL, WEBADDRESS, 
+    SATRAPNAME, INSUMONITORCODE, INSUREID, SIGNID, REGIONALISMCODE, COMNATURE, VALIDCODE, 
+    SIGN, COMCITYSIZE, SERVICENAME, SERVICENO, SERVICEPHONE, SERVICEPOSTADDRESS, SERVICEPOSTZIPCODE, 
+    LETTERSERVICENAME, LETTERSERVICENO, LETTERSERVICEPHONE, LETTERSERVICEPOSTADDRESS, 
+    LETTERSERVICEPOSTZIPCODE, COMGRADE, COMAREATYPE, INPUTDATE, INPUTTIME, SEQUENCE, 
+    PROVINCE, CITY, COUNTY, PREFECTURALLEVELCITY
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.LdComExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from ldcom
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from ldcom
+    where COMCODE = #{comcode,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    delete from ldcom
+    where COMCODE = #{comcode,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.LdComExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    delete from ldcom
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.LdCom" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    <selectKey resultType="java.lang.String" keyProperty="comcode" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into ldcom (COMCODE, OUTCOMCODE, NAME, 
+      SHORTNAME, ADDRESS, ZIPCODE, 
+      PHONE, FAX, EMAIL, 
+      WEBADDRESS, SATRAPNAME, INSUMONITORCODE, 
+      INSUREID, SIGNID, REGIONALISMCODE, 
+      COMNATURE, VALIDCODE, SIGN, 
+      COMCITYSIZE, SERVICENAME, SERVICENO, 
+      SERVICEPHONE, SERVICEPOSTADDRESS, SERVICEPOSTZIPCODE, 
+      LETTERSERVICENAME, LETTERSERVICENO, LETTERSERVICEPHONE, 
+      LETTERSERVICEPOSTADDRESS, LETTERSERVICEPOSTZIPCODE, 
+      COMGRADE, COMAREATYPE, INPUTDATE, 
+      INPUTTIME, SEQUENCE, PROVINCE, 
+      CITY, COUNTY, PREFECTURALLEVELCITY
+      )
+    values (#{comcode,jdbcType=VARCHAR}, #{outcomcode,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{shortname,jdbcType=VARCHAR}, #{address,jdbcType=VARCHAR}, #{zipcode,jdbcType=VARCHAR}, 
+      #{phone,jdbcType=VARCHAR}, #{fax,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, 
+      #{webaddress,jdbcType=VARCHAR}, #{satrapname,jdbcType=VARCHAR}, #{insumonitorcode,jdbcType=VARCHAR}, 
+      #{insureid,jdbcType=VARCHAR}, #{signid,jdbcType=VARCHAR}, #{regionalismcode,jdbcType=VARCHAR}, 
+      #{comnature,jdbcType=VARCHAR}, #{validcode,jdbcType=VARCHAR}, #{sign,jdbcType=VARCHAR}, 
+      #{comcitysize,jdbcType=VARCHAR}, #{servicename,jdbcType=VARCHAR}, #{serviceno,jdbcType=VARCHAR}, 
+      #{servicephone,jdbcType=VARCHAR}, #{servicepostaddress,jdbcType=VARCHAR}, #{servicepostzipcode,jdbcType=VARCHAR}, 
+      #{letterservicename,jdbcType=VARCHAR}, #{letterserviceno,jdbcType=VARCHAR}, #{letterservicephone,jdbcType=VARCHAR}, 
+      #{letterservicepostaddress,jdbcType=VARCHAR}, #{letterservicepostzipcode,jdbcType=VARCHAR}, 
+      #{comgrade,jdbcType=VARCHAR}, #{comareatype,jdbcType=VARCHAR}, #{inputdate,jdbcType=TIMESTAMP}, 
+      #{inputtime,jdbcType=VARCHAR}, #{sequence,jdbcType=VARCHAR}, #{province,jdbcType=VARCHAR}, 
+      #{city,jdbcType=VARCHAR}, #{county,jdbcType=VARCHAR}, #{prefecturallevelcity,jdbcType=VARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.LdCom" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    <selectKey resultType="java.lang.String" keyProperty="comcode" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into ldcom
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      COMCODE,
+      <if test="outcomcode != null" >
+        OUTCOMCODE,
+      </if>
+      <if test="name != null" >
+        NAME,
+      </if>
+      <if test="shortname != null" >
+        SHORTNAME,
+      </if>
+      <if test="address != null" >
+        ADDRESS,
+      </if>
+      <if test="zipcode != null" >
+        ZIPCODE,
+      </if>
+      <if test="phone != null" >
+        PHONE,
+      </if>
+      <if test="fax != null" >
+        FAX,
+      </if>
+      <if test="email != null" >
+        EMAIL,
+      </if>
+      <if test="webaddress != null" >
+        WEBADDRESS,
+      </if>
+      <if test="satrapname != null" >
+        SATRAPNAME,
+      </if>
+      <if test="insumonitorcode != null" >
+        INSUMONITORCODE,
+      </if>
+      <if test="insureid != null" >
+        INSUREID,
+      </if>
+      <if test="signid != null" >
+        SIGNID,
+      </if>
+      <if test="regionalismcode != null" >
+        REGIONALISMCODE,
+      </if>
+      <if test="comnature != null" >
+        COMNATURE,
+      </if>
+      <if test="validcode != null" >
+        VALIDCODE,
+      </if>
+      <if test="sign != null" >
+        SIGN,
+      </if>
+      <if test="comcitysize != null" >
+        COMCITYSIZE,
+      </if>
+      <if test="servicename != null" >
+        SERVICENAME,
+      </if>
+      <if test="serviceno != null" >
+        SERVICENO,
+      </if>
+      <if test="servicephone != null" >
+        SERVICEPHONE,
+      </if>
+      <if test="servicepostaddress != null" >
+        SERVICEPOSTADDRESS,
+      </if>
+      <if test="servicepostzipcode != null" >
+        SERVICEPOSTZIPCODE,
+      </if>
+      <if test="letterservicename != null" >
+        LETTERSERVICENAME,
+      </if>
+      <if test="letterserviceno != null" >
+        LETTERSERVICENO,
+      </if>
+      <if test="letterservicephone != null" >
+        LETTERSERVICEPHONE,
+      </if>
+      <if test="letterservicepostaddress != null" >
+        LETTERSERVICEPOSTADDRESS,
+      </if>
+      <if test="letterservicepostzipcode != null" >
+        LETTERSERVICEPOSTZIPCODE,
+      </if>
+      <if test="comgrade != null" >
+        COMGRADE,
+      </if>
+      <if test="comareatype != null" >
+        COMAREATYPE,
+      </if>
+      <if test="inputdate != null" >
+        INPUTDATE,
+      </if>
+      <if test="inputtime != null" >
+        INPUTTIME,
+      </if>
+      <if test="sequence != null" >
+        SEQUENCE,
+      </if>
+      <if test="province != null" >
+        PROVINCE,
+      </if>
+      <if test="city != null" >
+        CITY,
+      </if>
+      <if test="county != null" >
+        COUNTY,
+      </if>
+      <if test="prefecturallevelcity != null" >
+        PREFECTURALLEVELCITY,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{comcode,jdbcType=VARCHAR},
+      <if test="outcomcode != null" >
+        #{outcomcode,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="shortname != null" >
+        #{shortname,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null" >
+        #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="zipcode != null" >
+        #{zipcode,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="fax != null" >
+        #{fax,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="webaddress != null" >
+        #{webaddress,jdbcType=VARCHAR},
+      </if>
+      <if test="satrapname != null" >
+        #{satrapname,jdbcType=VARCHAR},
+      </if>
+      <if test="insumonitorcode != null" >
+        #{insumonitorcode,jdbcType=VARCHAR},
+      </if>
+      <if test="insureid != null" >
+        #{insureid,jdbcType=VARCHAR},
+      </if>
+      <if test="signid != null" >
+        #{signid,jdbcType=VARCHAR},
+      </if>
+      <if test="regionalismcode != null" >
+        #{regionalismcode,jdbcType=VARCHAR},
+      </if>
+      <if test="comnature != null" >
+        #{comnature,jdbcType=VARCHAR},
+      </if>
+      <if test="validcode != null" >
+        #{validcode,jdbcType=VARCHAR},
+      </if>
+      <if test="sign != null" >
+        #{sign,jdbcType=VARCHAR},
+      </if>
+      <if test="comcitysize != null" >
+        #{comcitysize,jdbcType=VARCHAR},
+      </if>
+      <if test="servicename != null" >
+        #{servicename,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceno != null" >
+        #{serviceno,jdbcType=VARCHAR},
+      </if>
+      <if test="servicephone != null" >
+        #{servicephone,jdbcType=VARCHAR},
+      </if>
+      <if test="servicepostaddress != null" >
+        #{servicepostaddress,jdbcType=VARCHAR},
+      </if>
+      <if test="servicepostzipcode != null" >
+        #{servicepostzipcode,jdbcType=VARCHAR},
+      </if>
+      <if test="letterservicename != null" >
+        #{letterservicename,jdbcType=VARCHAR},
+      </if>
+      <if test="letterserviceno != null" >
+        #{letterserviceno,jdbcType=VARCHAR},
+      </if>
+      <if test="letterservicephone != null" >
+        #{letterservicephone,jdbcType=VARCHAR},
+      </if>
+      <if test="letterservicepostaddress != null" >
+        #{letterservicepostaddress,jdbcType=VARCHAR},
+      </if>
+      <if test="letterservicepostzipcode != null" >
+        #{letterservicepostzipcode,jdbcType=VARCHAR},
+      </if>
+      <if test="comgrade != null" >
+        #{comgrade,jdbcType=VARCHAR},
+      </if>
+      <if test="comareatype != null" >
+        #{comareatype,jdbcType=VARCHAR},
+      </if>
+      <if test="inputdate != null" >
+        #{inputdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="inputtime != null" >
+        #{inputtime,jdbcType=VARCHAR},
+      </if>
+      <if test="sequence != null" >
+        #{sequence,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null" >
+        #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null" >
+        #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="county != null" >
+        #{county,jdbcType=VARCHAR},
+      </if>
+      <if test="prefecturallevelcity != null" >
+        #{prefecturallevelcity,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.LdComExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    select count(*) from ldcom
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    update ldcom
+    <set >
+      <if test="record.comcode != null" >
+        COMCODE = #{record.comcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.outcomcode != null" >
+        OUTCOMCODE = #{record.outcomcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.name != null" >
+        NAME = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shortname != null" >
+        SHORTNAME = #{record.shortname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.address != null" >
+        ADDRESS = #{record.address,jdbcType=VARCHAR},
+      </if>
+      <if test="record.zipcode != null" >
+        ZIPCODE = #{record.zipcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.phone != null" >
+        PHONE = #{record.phone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.fax != null" >
+        FAX = #{record.fax,jdbcType=VARCHAR},
+      </if>
+      <if test="record.email != null" >
+        EMAIL = #{record.email,jdbcType=VARCHAR},
+      </if>
+      <if test="record.webaddress != null" >
+        WEBADDRESS = #{record.webaddress,jdbcType=VARCHAR},
+      </if>
+      <if test="record.satrapname != null" >
+        SATRAPNAME = #{record.satrapname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.insumonitorcode != null" >
+        INSUMONITORCODE = #{record.insumonitorcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.insureid != null" >
+        INSUREID = #{record.insureid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.signid != null" >
+        SIGNID = #{record.signid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.regionalismcode != null" >
+        REGIONALISMCODE = #{record.regionalismcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.comnature != null" >
+        COMNATURE = #{record.comnature,jdbcType=VARCHAR},
+      </if>
+      <if test="record.validcode != null" >
+        VALIDCODE = #{record.validcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sign != null" >
+        SIGN = #{record.sign,jdbcType=VARCHAR},
+      </if>
+      <if test="record.comcitysize != null" >
+        COMCITYSIZE = #{record.comcitysize,jdbcType=VARCHAR},
+      </if>
+      <if test="record.servicename != null" >
+        SERVICENAME = #{record.servicename,jdbcType=VARCHAR},
+      </if>
+      <if test="record.serviceno != null" >
+        SERVICENO = #{record.serviceno,jdbcType=VARCHAR},
+      </if>
+      <if test="record.servicephone != null" >
+        SERVICEPHONE = #{record.servicephone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.servicepostaddress != null" >
+        SERVICEPOSTADDRESS = #{record.servicepostaddress,jdbcType=VARCHAR},
+      </if>
+      <if test="record.servicepostzipcode != null" >
+        SERVICEPOSTZIPCODE = #{record.servicepostzipcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.letterservicename != null" >
+        LETTERSERVICENAME = #{record.letterservicename,jdbcType=VARCHAR},
+      </if>
+      <if test="record.letterserviceno != null" >
+        LETTERSERVICENO = #{record.letterserviceno,jdbcType=VARCHAR},
+      </if>
+      <if test="record.letterservicephone != null" >
+        LETTERSERVICEPHONE = #{record.letterservicephone,jdbcType=VARCHAR},
+      </if>
+      <if test="record.letterservicepostaddress != null" >
+        LETTERSERVICEPOSTADDRESS = #{record.letterservicepostaddress,jdbcType=VARCHAR},
+      </if>
+      <if test="record.letterservicepostzipcode != null" >
+        LETTERSERVICEPOSTZIPCODE = #{record.letterservicepostzipcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.comgrade != null" >
+        COMGRADE = #{record.comgrade,jdbcType=VARCHAR},
+      </if>
+      <if test="record.comareatype != null" >
+        COMAREATYPE = #{record.comareatype,jdbcType=VARCHAR},
+      </if>
+      <if test="record.inputdate != null" >
+        INPUTDATE = #{record.inputdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.inputtime != null" >
+        INPUTTIME = #{record.inputtime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sequence != null" >
+        SEQUENCE = #{record.sequence,jdbcType=VARCHAR},
+      </if>
+      <if test="record.province != null" >
+        PROVINCE = #{record.province,jdbcType=VARCHAR},
+      </if>
+      <if test="record.city != null" >
+        CITY = #{record.city,jdbcType=VARCHAR},
+      </if>
+      <if test="record.county != null" >
+        COUNTY = #{record.county,jdbcType=VARCHAR},
+      </if>
+      <if test="record.prefecturallevelcity != null" >
+        PREFECTURALLEVELCITY = #{record.prefecturallevelcity,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    update ldcom
+    set COMCODE = #{record.comcode,jdbcType=VARCHAR},
+      OUTCOMCODE = #{record.outcomcode,jdbcType=VARCHAR},
+      NAME = #{record.name,jdbcType=VARCHAR},
+      SHORTNAME = #{record.shortname,jdbcType=VARCHAR},
+      ADDRESS = #{record.address,jdbcType=VARCHAR},
+      ZIPCODE = #{record.zipcode,jdbcType=VARCHAR},
+      PHONE = #{record.phone,jdbcType=VARCHAR},
+      FAX = #{record.fax,jdbcType=VARCHAR},
+      EMAIL = #{record.email,jdbcType=VARCHAR},
+      WEBADDRESS = #{record.webaddress,jdbcType=VARCHAR},
+      SATRAPNAME = #{record.satrapname,jdbcType=VARCHAR},
+      INSUMONITORCODE = #{record.insumonitorcode,jdbcType=VARCHAR},
+      INSUREID = #{record.insureid,jdbcType=VARCHAR},
+      SIGNID = #{record.signid,jdbcType=VARCHAR},
+      REGIONALISMCODE = #{record.regionalismcode,jdbcType=VARCHAR},
+      COMNATURE = #{record.comnature,jdbcType=VARCHAR},
+      VALIDCODE = #{record.validcode,jdbcType=VARCHAR},
+      SIGN = #{record.sign,jdbcType=VARCHAR},
+      COMCITYSIZE = #{record.comcitysize,jdbcType=VARCHAR},
+      SERVICENAME = #{record.servicename,jdbcType=VARCHAR},
+      SERVICENO = #{record.serviceno,jdbcType=VARCHAR},
+      SERVICEPHONE = #{record.servicephone,jdbcType=VARCHAR},
+      SERVICEPOSTADDRESS = #{record.servicepostaddress,jdbcType=VARCHAR},
+      SERVICEPOSTZIPCODE = #{record.servicepostzipcode,jdbcType=VARCHAR},
+      LETTERSERVICENAME = #{record.letterservicename,jdbcType=VARCHAR},
+      LETTERSERVICENO = #{record.letterserviceno,jdbcType=VARCHAR},
+      LETTERSERVICEPHONE = #{record.letterservicephone,jdbcType=VARCHAR},
+      LETTERSERVICEPOSTADDRESS = #{record.letterservicepostaddress,jdbcType=VARCHAR},
+      LETTERSERVICEPOSTZIPCODE = #{record.letterservicepostzipcode,jdbcType=VARCHAR},
+      COMGRADE = #{record.comgrade,jdbcType=VARCHAR},
+      COMAREATYPE = #{record.comareatype,jdbcType=VARCHAR},
+      INPUTDATE = #{record.inputdate,jdbcType=TIMESTAMP},
+      INPUTTIME = #{record.inputtime,jdbcType=VARCHAR},
+      SEQUENCE = #{record.sequence,jdbcType=VARCHAR},
+      PROVINCE = #{record.province,jdbcType=VARCHAR},
+      CITY = #{record.city,jdbcType=VARCHAR},
+      COUNTY = #{record.county,jdbcType=VARCHAR},
+      PREFECTURALLEVELCITY = #{record.prefecturallevelcity,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.LdCom" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    update ldcom
+    <set >
+      <if test="outcomcode != null" >
+        OUTCOMCODE = #{outcomcode,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null" >
+        NAME = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="shortname != null" >
+        SHORTNAME = #{shortname,jdbcType=VARCHAR},
+      </if>
+      <if test="address != null" >
+        ADDRESS = #{address,jdbcType=VARCHAR},
+      </if>
+      <if test="zipcode != null" >
+        ZIPCODE = #{zipcode,jdbcType=VARCHAR},
+      </if>
+      <if test="phone != null" >
+        PHONE = #{phone,jdbcType=VARCHAR},
+      </if>
+      <if test="fax != null" >
+        FAX = #{fax,jdbcType=VARCHAR},
+      </if>
+      <if test="email != null" >
+        EMAIL = #{email,jdbcType=VARCHAR},
+      </if>
+      <if test="webaddress != null" >
+        WEBADDRESS = #{webaddress,jdbcType=VARCHAR},
+      </if>
+      <if test="satrapname != null" >
+        SATRAPNAME = #{satrapname,jdbcType=VARCHAR},
+      </if>
+      <if test="insumonitorcode != null" >
+        INSUMONITORCODE = #{insumonitorcode,jdbcType=VARCHAR},
+      </if>
+      <if test="insureid != null" >
+        INSUREID = #{insureid,jdbcType=VARCHAR},
+      </if>
+      <if test="signid != null" >
+        SIGNID = #{signid,jdbcType=VARCHAR},
+      </if>
+      <if test="regionalismcode != null" >
+        REGIONALISMCODE = #{regionalismcode,jdbcType=VARCHAR},
+      </if>
+      <if test="comnature != null" >
+        COMNATURE = #{comnature,jdbcType=VARCHAR},
+      </if>
+      <if test="validcode != null" >
+        VALIDCODE = #{validcode,jdbcType=VARCHAR},
+      </if>
+      <if test="sign != null" >
+        SIGN = #{sign,jdbcType=VARCHAR},
+      </if>
+      <if test="comcitysize != null" >
+        COMCITYSIZE = #{comcitysize,jdbcType=VARCHAR},
+      </if>
+      <if test="servicename != null" >
+        SERVICENAME = #{servicename,jdbcType=VARCHAR},
+      </if>
+      <if test="serviceno != null" >
+        SERVICENO = #{serviceno,jdbcType=VARCHAR},
+      </if>
+      <if test="servicephone != null" >
+        SERVICEPHONE = #{servicephone,jdbcType=VARCHAR},
+      </if>
+      <if test="servicepostaddress != null" >
+        SERVICEPOSTADDRESS = #{servicepostaddress,jdbcType=VARCHAR},
+      </if>
+      <if test="servicepostzipcode != null" >
+        SERVICEPOSTZIPCODE = #{servicepostzipcode,jdbcType=VARCHAR},
+      </if>
+      <if test="letterservicename != null" >
+        LETTERSERVICENAME = #{letterservicename,jdbcType=VARCHAR},
+      </if>
+      <if test="letterserviceno != null" >
+        LETTERSERVICENO = #{letterserviceno,jdbcType=VARCHAR},
+      </if>
+      <if test="letterservicephone != null" >
+        LETTERSERVICEPHONE = #{letterservicephone,jdbcType=VARCHAR},
+      </if>
+      <if test="letterservicepostaddress != null" >
+        LETTERSERVICEPOSTADDRESS = #{letterservicepostaddress,jdbcType=VARCHAR},
+      </if>
+      <if test="letterservicepostzipcode != null" >
+        LETTERSERVICEPOSTZIPCODE = #{letterservicepostzipcode,jdbcType=VARCHAR},
+      </if>
+      <if test="comgrade != null" >
+        COMGRADE = #{comgrade,jdbcType=VARCHAR},
+      </if>
+      <if test="comareatype != null" >
+        COMAREATYPE = #{comareatype,jdbcType=VARCHAR},
+      </if>
+      <if test="inputdate != null" >
+        INPUTDATE = #{inputdate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="inputtime != null" >
+        INPUTTIME = #{inputtime,jdbcType=VARCHAR},
+      </if>
+      <if test="sequence != null" >
+        SEQUENCE = #{sequence,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null" >
+        PROVINCE = #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null" >
+        CITY = #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="county != null" >
+        COUNTY = #{county,jdbcType=VARCHAR},
+      </if>
+      <if test="prefecturallevelcity != null" >
+        PREFECTURALLEVELCITY = #{prefecturallevelcity,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where COMCODE = #{comcode,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.LdCom" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    update ldcom
+    set OUTCOMCODE = #{outcomcode,jdbcType=VARCHAR},
+      NAME = #{name,jdbcType=VARCHAR},
+      SHORTNAME = #{shortname,jdbcType=VARCHAR},
+      ADDRESS = #{address,jdbcType=VARCHAR},
+      ZIPCODE = #{zipcode,jdbcType=VARCHAR},
+      PHONE = #{phone,jdbcType=VARCHAR},
+      FAX = #{fax,jdbcType=VARCHAR},
+      EMAIL = #{email,jdbcType=VARCHAR},
+      WEBADDRESS = #{webaddress,jdbcType=VARCHAR},
+      SATRAPNAME = #{satrapname,jdbcType=VARCHAR},
+      INSUMONITORCODE = #{insumonitorcode,jdbcType=VARCHAR},
+      INSUREID = #{insureid,jdbcType=VARCHAR},
+      SIGNID = #{signid,jdbcType=VARCHAR},
+      REGIONALISMCODE = #{regionalismcode,jdbcType=VARCHAR},
+      COMNATURE = #{comnature,jdbcType=VARCHAR},
+      VALIDCODE = #{validcode,jdbcType=VARCHAR},
+      SIGN = #{sign,jdbcType=VARCHAR},
+      COMCITYSIZE = #{comcitysize,jdbcType=VARCHAR},
+      SERVICENAME = #{servicename,jdbcType=VARCHAR},
+      SERVICENO = #{serviceno,jdbcType=VARCHAR},
+      SERVICEPHONE = #{servicephone,jdbcType=VARCHAR},
+      SERVICEPOSTADDRESS = #{servicepostaddress,jdbcType=VARCHAR},
+      SERVICEPOSTZIPCODE = #{servicepostzipcode,jdbcType=VARCHAR},
+      LETTERSERVICENAME = #{letterservicename,jdbcType=VARCHAR},
+      LETTERSERVICENO = #{letterserviceno,jdbcType=VARCHAR},
+      LETTERSERVICEPHONE = #{letterservicephone,jdbcType=VARCHAR},
+      LETTERSERVICEPOSTADDRESS = #{letterservicepostaddress,jdbcType=VARCHAR},
+      LETTERSERVICEPOSTZIPCODE = #{letterservicepostzipcode,jdbcType=VARCHAR},
+      COMGRADE = #{comgrade,jdbcType=VARCHAR},
+      COMAREATYPE = #{comareatype,jdbcType=VARCHAR},
+      INPUTDATE = #{inputdate,jdbcType=TIMESTAMP},
+      INPUTTIME = #{inputtime,jdbcType=VARCHAR},
+      SEQUENCE = #{sequence,jdbcType=VARCHAR},
+      PROVINCE = #{province,jdbcType=VARCHAR},
+      CITY = #{city,jdbcType=VARCHAR},
+      COUNTY = #{county,jdbcType=VARCHAR},
+      PREFECTURALLEVELCITY = #{prefecturallevelcity,jdbcType=VARCHAR}
+    where COMCODE = #{comcode,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/LdComPartyMapper.xml b/ruoyi-content/src/main/resources/mapper/content/LdComPartyMapper.xml
new file mode 100644
index 000000000..991f918fa
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/LdComPartyMapper.xml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.LdComPartyMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.LdComParty" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    <id column="PARTY_ID" property="partyId" jdbcType="VARCHAR" />
+    <result column="COMCODE" property="comcode" jdbcType="VARCHAR" />
+    <result column="SHORTNAME" property="shortname" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    PARTY_ID, COMCODE, SHORTNAME, COMPANY_ID
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.LdComPartyExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from ldcom_party
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from ldcom_party
+    where PARTY_ID = #{partyId,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    delete from ldcom_party
+    where PARTY_ID = #{partyId,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.LdComPartyExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    delete from ldcom_party
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.LdComParty" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    <selectKey resultType="java.lang.String" keyProperty="partyId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into ldcom_party (PARTY_ID, COMCODE, SHORTNAME, 
+      COMPANY_ID)
+    values (#{partyId,jdbcType=VARCHAR}, #{comcode,jdbcType=VARCHAR}, #{shortname,jdbcType=VARCHAR}, 
+      #{companyId,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.LdComParty" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    <selectKey resultType="java.lang.String" keyProperty="partyId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into ldcom_party
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      PARTY_ID,
+      <if test="comcode != null" >
+        COMCODE,
+      </if>
+      <if test="shortname != null" >
+        SHORTNAME,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{partyId,jdbcType=VARCHAR},
+      <if test="comcode != null" >
+        #{comcode,jdbcType=VARCHAR},
+      </if>
+      <if test="shortname != null" >
+        #{shortname,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.LdComPartyExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    select count(*) from ldcom_party
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    update ldcom_party
+    <set >
+      <if test="record.partyId != null" >
+        PARTY_ID = #{record.partyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.comcode != null" >
+        COMCODE = #{record.comcode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.shortname != null" >
+        SHORTNAME = #{record.shortname,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    update ldcom_party
+    set PARTY_ID = #{record.partyId,jdbcType=VARCHAR},
+      COMCODE = #{record.comcode,jdbcType=VARCHAR},
+      SHORTNAME = #{record.shortname,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.LdComParty" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    update ldcom_party
+    <set >
+      <if test="comcode != null" >
+        COMCODE = #{comcode,jdbcType=VARCHAR},
+      </if>
+      <if test="shortname != null" >
+        SHORTNAME = #{shortname,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where PARTY_ID = #{partyId,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.LdComParty" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Sep 25 15:09:32 CST 2018.
+    -->
+    update ldcom_party
+    set COMCODE = #{comcode,jdbcType=VARCHAR},
+      SHORTNAME = #{shortname,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+    where PARTY_ID = #{partyId,jdbcType=VARCHAR}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/LdComQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/LdComQueryMapper.xml
new file mode 100644
index 000000000..c45264417
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/LdComQueryMapper.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.LdComQueryMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.LdCom" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jul 24 14:14:03 CST 2018.
+    -->
+    <id column="COMCODE" property="comcode" jdbcType="VARCHAR" />
+    <result column="OUTCOMCODE" property="outcomcode" jdbcType="VARCHAR" />
+    <result column="NAME" property="name" jdbcType="VARCHAR" />
+    <result column="SHORTNAME" property="shortname" jdbcType="VARCHAR" />
+    <result column="ADDRESS" property="address" jdbcType="VARCHAR" />
+    <result column="ZIPCODE" property="zipcode" jdbcType="VARCHAR" />
+    <result column="PHONE" property="phone" jdbcType="VARCHAR" />
+    <result column="FAX" property="fax" jdbcType="VARCHAR" />
+    <result column="EMAIL" property="email" jdbcType="VARCHAR" />
+    <result column="WEBADDRESS" property="webaddress" jdbcType="VARCHAR" />
+    <result column="SATRAPNAME" property="satrapname" jdbcType="VARCHAR" />
+    <result column="INSUMONITORCODE" property="insumonitorcode" jdbcType="VARCHAR" />
+    <result column="INSUREID" property="insureid" jdbcType="VARCHAR" />
+    <result column="SIGNID" property="signid" jdbcType="VARCHAR" />
+    <result column="REGIONALISMCODE" property="regionalismcode" jdbcType="VARCHAR" />
+    <result column="COMNATURE" property="comnature" jdbcType="VARCHAR" />
+    <result column="VALIDCODE" property="validcode" jdbcType="VARCHAR" />
+    <result column="SIGN" property="sign" jdbcType="VARCHAR" />
+    <result column="COMCITYSIZE" property="comcitysize" jdbcType="VARCHAR" />
+    <result column="SERVICENAME" property="servicename" jdbcType="VARCHAR" />
+    <result column="SERVICENO" property="serviceno" jdbcType="VARCHAR" />
+    <result column="SERVICEPHONE" property="servicephone" jdbcType="VARCHAR" />
+    <result column="SERVICEPOSTADDRESS" property="servicepostaddress" jdbcType="VARCHAR" />
+    <result column="SERVICEPOSTZIPCODE" property="servicepostzipcode" jdbcType="VARCHAR" />
+    <result column="LETTERSERVICENAME" property="letterservicename" jdbcType="VARCHAR" />
+    <result column="LETTERSERVICENO" property="letterserviceno" jdbcType="VARCHAR" />
+    <result column="LETTERSERVICEPHONE" property="letterservicephone" jdbcType="VARCHAR" />
+    <result column="LETTERSERVICEPOSTADDRESS" property="letterservicepostaddress" jdbcType="VARCHAR" />
+    <result column="LETTERSERVICEPOSTZIPCODE" property="letterservicepostzipcode" jdbcType="VARCHAR" />
+    <result column="COMGRADE" property="comgrade" jdbcType="VARCHAR" />
+    <result column="COMAREATYPE" property="comareatype" jdbcType="VARCHAR" />
+    <result column="INPUTDATE" property="inputdate" jdbcType="TIMESTAMP" />
+    <result column="INPUTTIME" property="inputtime" jdbcType="VARCHAR" />
+    <result column="SEQUENCE" property="sequence" jdbcType="VARCHAR" />
+    <result column="PROVINCE" property="province" jdbcType="VARCHAR" />
+    <result column="CITY" property="city" jdbcType="VARCHAR" />
+    <result column="COUNTY" property="county" jdbcType="VARCHAR" />
+    <result column="PREFECTURALLEVELCITY" property="prefecturallevelcity" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <sql id="Base_Column_List" >
+    COMCODE, OUTCOMCODE, NAME, SHORTNAME, ADDRESS, ZIPCODE, PHONE, FAX, EMAIL, WEBADDRESS, 
+    SATRAPNAME, INSUMONITORCODE, INSUREID, SIGNID, REGIONALISMCODE, COMNATURE, VALIDCODE, 
+    SIGN, COMCITYSIZE, SERVICENAME, SERVICENO, SERVICEPHONE, SERVICEPOSTADDRESS, SERVICEPOSTZIPCODE, 
+    LETTERSERVICENAME, LETTERSERVICENO, LETTERSERVICEPHONE, LETTERSERVICEPOSTADDRESS, 
+    LETTERSERVICEPOSTZIPCODE, COMGRADE, COMAREATYPE, INPUTDATE, INPUTTIME, SEQUENCE, 
+    PROVINCE, CITY, COUNTY, PREFECTURALLEVELCITY
+  </sql>
+ 
+  <select id="queryAll" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from ldcom
+  </select>
+  
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/PicAdInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/PicAdInfoMapper.xml
new file mode 100644
index 000000000..b4867508d
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/PicAdInfoMapper.xml
@@ -0,0 +1,415 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.PicAdInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.PicAdInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    <id column="PIC_AD_ID" property="picAdId" jdbcType="INTEGER" />
+    <result column="PIC_AD_TYPE" property="picAdType" jdbcType="VARCHAR" />
+    <result column="PIC_AD_TITLE" property="picAdTitle" jdbcType="VARCHAR" />
+    <result column="PIC_AD_NAME" property="picAdName" jdbcType="VARCHAR" />
+    <result column="PIC_AD_URL" property="picAdUrl" jdbcType="VARCHAR" />
+    <result column="PIC_AD_STATE" property="picAdState" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    PIC_AD_ID, PIC_AD_TYPE, PIC_AD_TITLE, PIC_AD_NAME, PIC_AD_URL, PIC_AD_STATE, COMPANY_ID, 
+    CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.PicAdInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from pic_ad_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from pic_ad_info
+    where PIC_AD_ID = #{picAdId,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    delete from pic_ad_info
+    where PIC_AD_ID = #{picAdId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.PicAdInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    delete from pic_ad_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.PicAdInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="picAdId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into pic_ad_info (PIC_AD_ID, PIC_AD_TYPE, PIC_AD_TITLE, 
+      PIC_AD_NAME, PIC_AD_URL, PIC_AD_STATE, 
+      COMPANY_ID, CREATE_DATE, CREATE_TIME, 
+      CREATE_USER, UPDATE_USER, UPDATE_DATE, 
+      UPDATE_TIME)
+    values (#{picAdId,jdbcType=INTEGER}, #{picAdType,jdbcType=VARCHAR}, #{picAdTitle,jdbcType=VARCHAR}, 
+      #{picAdName,jdbcType=VARCHAR}, #{picAdUrl,jdbcType=VARCHAR}, #{picAdState,jdbcType=VARCHAR}, 
+      #{companyId,jdbcType=VARCHAR}, #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, 
+      #{createUser,jdbcType=VARCHAR}, #{updateUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.PicAdInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    <!-- <selectKey resultType="java.lang.Integer" keyProperty="picAdId" order="BEFORE" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey> -->
+    insert into pic_ad_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      PIC_AD_ID,
+      <if test="picAdType != null" >
+        PIC_AD_TYPE,
+      </if>
+      <if test="picAdTitle != null" >
+        PIC_AD_TITLE,
+      </if>
+      <if test="picAdName != null" >
+        PIC_AD_NAME,
+      </if>
+      <if test="picAdUrl != null" >
+        PIC_AD_URL,
+      </if>
+      <if test="picAdState != null" >
+        PIC_AD_STATE,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER,
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{picAdId,jdbcType=INTEGER},
+      <if test="picAdType != null" >
+        #{picAdType,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdTitle != null" >
+        #{picAdTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdName != null" >
+        #{picAdName,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdUrl != null" >
+        #{picAdUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdState != null" >
+        #{picAdState,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.PicAdInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    select count(*) from pic_ad_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    update pic_ad_info
+    <set >
+      <if test="record.picAdId != null" >
+        PIC_AD_ID = #{record.picAdId,jdbcType=INTEGER},
+      </if>
+      <if test="record.picAdType != null" >
+        PIC_AD_TYPE = #{record.picAdType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.picAdTitle != null" >
+        PIC_AD_TITLE = #{record.picAdTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="record.picAdName != null" >
+        PIC_AD_NAME = #{record.picAdName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.picAdUrl != null" >
+        PIC_AD_URL = #{record.picAdUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.picAdState != null" >
+        PIC_AD_STATE = #{record.picAdState,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createDate != null" >
+        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateUser != null" >
+        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateDate != null" >
+        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    update pic_ad_info
+    set PIC_AD_ID = #{record.picAdId,jdbcType=INTEGER},
+      PIC_AD_TYPE = #{record.picAdType,jdbcType=VARCHAR},
+      PIC_AD_TITLE = #{record.picAdTitle,jdbcType=VARCHAR},
+      PIC_AD_NAME = #{record.picAdName,jdbcType=VARCHAR},
+      PIC_AD_URL = #{record.picAdUrl,jdbcType=VARCHAR},
+      PIC_AD_STATE = #{record.picAdState,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.PicAdInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    update pic_ad_info
+    <set >
+      <if test="picAdType != null" >
+        PIC_AD_TYPE = #{picAdType,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdTitle != null" >
+        PIC_AD_TITLE = #{picAdTitle,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdName != null" >
+        PIC_AD_NAME = #{picAdName,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdUrl != null" >
+        PIC_AD_URL = #{picAdUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="picAdState != null" >
+        PIC_AD_STATE = #{picAdState,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="createDate != null" >
+        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateUser != null" >
+        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      </if>
+      <if test="updateDate != null" >
+        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where PIC_AD_ID = #{picAdId,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.PicAdInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Jun 12 09:41:05 CST 2018.
+    -->
+    update pic_ad_info
+    set PIC_AD_TYPE = #{picAdType,jdbcType=VARCHAR},
+      PIC_AD_TITLE = #{picAdTitle,jdbcType=VARCHAR},
+      PIC_AD_NAME = #{picAdName,jdbcType=VARCHAR},
+      PIC_AD_URL = #{picAdUrl,jdbcType=VARCHAR},
+      PIC_AD_STATE = #{picAdState,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
+      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
+    where PIC_AD_ID = #{picAdId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/PicAdQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/PicAdQueryMapper.xml
new file mode 100644
index 000000000..1ded98ec2
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/PicAdQueryMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.PicAdQueryMapper" >
+  
+  <resultMap id="PicAdMap" type="com.ruoyi.content.domain.PicAdInfo" >
+    <id column="PIC_AD_ID" property="picAdId" jdbcType="INTEGER" />
+    <result column="PIC_AD_TYPE" property="picAdType" jdbcType="VARCHAR" />
+    <result column="PIC_AD_TITLE" property="picAdTitle" jdbcType="VARCHAR" />
+    <result column="PIC_AD_NAME" property="picAdName" jdbcType="VARCHAR" />
+    <result column="PIC_AD_URL" property="picAdUrl" jdbcType="VARCHAR" />
+    <result column="PIC_AD_STATE" property="picAdState" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
+    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+  </resultMap>
+  
+  <sql id="Advertisement_Column_List" >
+    PIC_AD_ID, PIC_AD_TYPE, PIC_AD_TITLE, PIC_AD_NAME, PIC_AD_URL, PIC_AD_STATE, COMPANY_ID, 
+    CREATE_DATE, CREATE_TIME, CREATE_USER, UPDATE_USER, UPDATE_DATE, UPDATE_TIME
+  </sql>
+  
+  <select id="selectAllWithLimit" resultMap="PicAdMap">
+	SELECT
+	<include refid="Advertisement_Column_List" />
+	FROM pic_ad_info 	
+	WHERE
+	1=1
+	<if test="companyId != null and companyId !=''">
+		and COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+	</if>
+	<if test="picAdTitle != null and picAdTitle !=''">
+	    and PIC_AD_TITLE like CONCAT(CONCAT('%', #{picAdTitle,jdbcType=VARCHAR}), '%')
+	</if>
+	 AND PIC_AD_STATE = '0' AND CREATE_USER = 'company'
+	 order by CREATE_DATE DESC,CREATE_TIME DESC, UPDATE_DATE
+	DESC,UPDATE_TIME DESC
+	limit
+	#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+</select>	
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/mapper/content/UserInfoMapper.xml b/ruoyi-content/src/main/resources/mapper/content/UserInfoMapper.xml
new file mode 100644
index 000000000..6e8f54c1a
--- /dev/null
+++ b/ruoyi-content/src/main/resources/mapper/content/UserInfoMapper.xml
@@ -0,0 +1,735 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.content.mapper.UserInfoMapper" >
+  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.UserInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    <id column="USER_ID" property="userId" jdbcType="INTEGER" />
+    <result column="OPENID" property="openid" jdbcType="VARCHAR" />
+    <result column="HEAD_IMG_URL" property="headImgUrl" jdbcType="VARCHAR" />
+    <result column="NICK_NAME" property="nickName" jdbcType="VARCHAR" />
+    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
+    <result column="AGENT_CODE" property="agentCode" jdbcType="VARCHAR" />
+    <result column="USER_NAME" property="userName" jdbcType="VARCHAR" />
+    <result column="ID_TYPE" property="idType" jdbcType="VARCHAR" />
+    <result column="ID_NO" property="idNo" jdbcType="VARCHAR" />
+    <result column="GENDER" property="gender" jdbcType="VARCHAR" />
+    <result column="USER_POSITION" property="userPosition" jdbcType="VARCHAR" />
+    <result column="BIRTHDAY" property="birthday" jdbcType="VARCHAR" />
+    <result column="EDUCATION" property="education" jdbcType="VARCHAR" />
+    <result column="MOBILE" property="mobile" jdbcType="VARCHAR" />
+    <result column="USER_EMAIL" property="userEmail" jdbcType="VARCHAR" />
+    <result column="PROVINCE" property="province" jdbcType="VARCHAR" />
+    <result column="CITY" property="city" jdbcType="VARCHAR" />
+    <result column="AREA" property="area" jdbcType="VARCHAR" />
+    <result column="REFEREE_USERID" property="refereeUserid" jdbcType="VARCHAR" />
+    <result column="STATE" property="state" jdbcType="VARCHAR" />
+    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
+    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
+    <result column="UPDATE_REMARK" property="updateRemark" jdbcType="VARCHAR" />
+    <result column="SOURCE" property="source" jdbcType="VARCHAR" />
+    <!-- <result column="AGE" property="age" jdbcType="VARCHAR" /> -->
+     <result column="CARD_IMG_URL" property="cardImgUrl" jdbcType="VARCHAR" />
+  </resultMap>
+  <sql id="Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    <where >
+      <foreach collection="oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    <where >
+      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
+        <if test="criteria.valid" >
+          <trim prefix="(" suffix=")" prefixOverrides="and" >
+            <foreach collection="criteria.criteria" item="criterion" >
+              <choose >
+                <when test="criterion.noValue" >
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue" >
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue" >
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue" >
+                  and ${criterion.condition}
+                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    USER_ID, OPENID, HEAD_IMG_URL, NICK_NAME, COMPANY_ID, AGENT_CODE, USER_NAME, ID_TYPE, 
+    ID_NO, GENDER, USER_POSITION, BIRTHDAY, EDUCATION, MOBILE, USER_EMAIL, PROVINCE, 
+    CITY, AREA, REFEREE_USERID, STATE, CREATE_USER, CREATE_TIME, UPDATE_TIME, UPDATE_REMARK, 
+    SOURCE<!-- ,AGE -->, CARD_IMG_URL
+  </sql>
+  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.UserInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    select
+    <if test="distinct" >
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from user_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null" >
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from user_info
+    where USER_ID = #{userId,jdbcType=INTEGER}
+  </select>
+  
+  <!--  <select id="selectByOpenId" resultMap="BaseResultMap" parameterType="java.lang.String" >
+    
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    
+    select 
+    <include refid="Base_Column_List" />
+    from user_info
+    where OPENID = #{openId,jdbcType=INTEGER}
+  </select>-->
+  
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    delete from user_info
+    where USER_ID = #{userId,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.UserInfoExample" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    delete from user_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ruoyi.content.domain.UserInfo" useGeneratedKeys="true">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="userId" order="AFTER" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into user_info (USER_ID, OPENID, HEAD_IMG_URL, 
+      NICK_NAME, COMPANY_ID, AGENT_CODE, 
+      USER_NAME, ID_TYPE, ID_NO, 
+      GENDER, USER_POSITION, BIRTHDAY, 
+      EDUCATION, MOBILE, USER_EMAIL, 
+      PROVINCE, CITY, AREA, 
+      REFEREE_USERID, STATE, CREATE_USER, 
+      CREATE_TIME, UPDATE_TIME, UPDATE_REMARK, 
+      SOURCE<!-- ,AGE -->,CARD_IMG_URL)
+    values (#{userId,jdbcType=INTEGER}, #{openid,jdbcType=VARCHAR}, #{headImgUrl,jdbcType=VARCHAR}, 
+      #{nickName,jdbcType=VARCHAR}, #{companyId,jdbcType=VARCHAR}, #{agentCode,jdbcType=VARCHAR}, 
+      #{userName,jdbcType=VARCHAR}, #{idType,jdbcType=VARCHAR}, #{idNo,jdbcType=VARCHAR}, 
+      #{gender,jdbcType=VARCHAR}, #{userPosition,jdbcType=VARCHAR}, #{birthday,jdbcType=VARCHAR}, 
+      #{education,jdbcType=VARCHAR}, #{mobile,jdbcType=VARCHAR}, #{userEmail,jdbcType=VARCHAR}, 
+      #{province,jdbcType=VARCHAR}, #{city,jdbcType=VARCHAR}, #{area,jdbcType=VARCHAR}, 
+      #{refereeUserid,jdbcType=VARCHAR}, #{state,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
+      #{createTime,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}, #{updateRemark,jdbcType=VARCHAR}, 
+      #{source,jdbcType=VARCHAR}<!-- , #{age,jdbcType=VARCHAR} -->,#{cardImgUrl,jdbcType=VARCHAR})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.UserInfo" useGeneratedKeys="true">
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    <selectKey resultType="java.lang.Integer" keyProperty="userId" order="AFTER" >
+       SELECT LAST_INSERT_ID() 
+    </selectKey>
+    insert into user_info
+    <trim prefix="(" suffix=")" suffixOverrides="," >
+      USER_ID,
+      <if test="openid != null" >
+        OPENID,
+      </if>
+      <if test="headImgUrl != null" >
+        HEAD_IMG_URL,
+      </if>
+      <if test="nickName != null" >
+        NICK_NAME,
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID,
+      </if>
+      <if test="agentCode != null" >
+        AGENT_CODE,
+      </if>
+      <if test="userName != null" >
+        USER_NAME,
+      </if>
+      <if test="idType != null" >
+        ID_TYPE,
+      </if>
+      <if test="idNo != null" >
+        ID_NO,
+      </if>
+      <if test="gender != null" >
+        GENDER,
+      </if>
+      <if test="userPosition != null" >
+        USER_POSITION,
+      </if>
+      <if test="birthday != null" >
+        BIRTHDAY,
+      </if>
+      <if test="education != null" >
+        EDUCATION,
+      </if>
+      <if test="mobile != null" >
+        MOBILE,
+      </if>
+      <if test="userEmail != null" >
+        USER_EMAIL,
+      </if>
+      <if test="province != null" >
+        PROVINCE,
+      </if>
+      <if test="city != null" >
+        CITY,
+      </if>
+      <if test="area != null" >
+        AREA,
+      </if>
+      <if test="refereeUserid != null" >
+        REFEREE_USERID,
+      </if>
+      <if test="state != null" >
+        STATE,
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER,
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME,
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME,
+      </if>
+      <if test="updateRemark != null" >
+        UPDATE_REMARK,
+      </if>
+      <if test="source != null" >
+        SOURCE,
+      </if>
+      <!-- <if test="age != null" >
+        AGE,
+      </if> -->
+      <if test="cardImgUrl != null" >
+        CARD_IMG_URL,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides="," >
+      #{userId,jdbcType=INTEGER},
+      <if test="openid != null" >
+        #{openid,jdbcType=VARCHAR},
+      </if>
+      <if test="headImgUrl != null" >
+        #{headImgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="nickName != null" >
+        #{nickName,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="agentCode != null" >
+        #{agentCode,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="idType != null" >
+        #{idType,jdbcType=VARCHAR},
+      </if>
+      <if test="idNo != null" >
+        #{idNo,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        #{gender,jdbcType=VARCHAR},
+      </if>
+      <if test="userPosition != null" >
+        #{userPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="birthday != null" >
+        #{birthday,jdbcType=VARCHAR},
+      </if>
+      <if test="education != null" >
+        #{education,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null" >
+        #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="userEmail != null" >
+        #{userEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null" >
+        #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null" >
+        #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="area != null" >
+        #{area,jdbcType=VARCHAR},
+      </if>
+      <if test="refereeUserid != null" >
+        #{refereeUserid,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateRemark != null" >
+        #{updateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="source != null" >
+        #{source,jdbcType=VARCHAR},
+      </if>
+      <!-- <if test="age != null" >
+        #{age,jdbcType=VARCHAR},
+      </if> -->
+       <if test="cardImgUrl != null" >
+        #{cardImgUrl,jdbcType=VARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ruoyi.content.domain.UserInfoExample" resultType="java.lang.Integer" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    select count(*) from user_info
+    <if test="_parameter != null" >
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    update user_info
+    <set >
+      <if test="record.userId != null" >
+        USER_ID = #{record.userId,jdbcType=INTEGER},
+      </if>
+      <if test="record.openid != null" >
+        OPENID = #{record.openid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.headImgUrl != null" >
+        HEAD_IMG_URL = #{record.headImgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="record.nickName != null" >
+        NICK_NAME = #{record.nickName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.companyId != null" >
+        COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="record.agentCode != null" >
+        AGENT_CODE = #{record.agentCode,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userName != null" >
+        USER_NAME = #{record.userName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.idType != null" >
+        ID_TYPE = #{record.idType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.idNo != null" >
+        ID_NO = #{record.idNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.gender != null" >
+        GENDER = #{record.gender,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userPosition != null" >
+        USER_POSITION = #{record.userPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="record.birthday != null" >
+        BIRTHDAY = #{record.birthday,jdbcType=VARCHAR},
+      </if>
+      <if test="record.education != null" >
+        EDUCATION = #{record.education,jdbcType=VARCHAR},
+      </if>
+      <if test="record.mobile != null" >
+        MOBILE = #{record.mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="record.userEmail != null" >
+        USER_EMAIL = #{record.userEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="record.province != null" >
+        PROVINCE = #{record.province,jdbcType=VARCHAR},
+      </if>
+      <if test="record.city != null" >
+        CITY = #{record.city,jdbcType=VARCHAR},
+      </if>
+      <if test="record.area != null" >
+        AREA = #{record.area,jdbcType=VARCHAR},
+      </if>
+      <if test="record.refereeUserid != null" >
+        REFEREE_USERID = #{record.refereeUserid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.state != null" >
+        STATE = #{record.state,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createUser != null" >
+        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="record.createTime != null" >
+        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateTime != null" >
+        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="record.updateRemark != null" >
+        UPDATE_REMARK = #{record.updateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="record.source != null" >
+        SOURCE = #{record.source,jdbcType=VARCHAR},
+      </if>
+      <!-- <if test="age != null">
+      	AGE = #{age,jdbcType=VARCHAR},
+      </if> -->
+      <if test="record.cardImgUrl != null" >
+        CARD_IMG_URL = #{record.cardImgUrl,jdbcType=VARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    update user_info
+    set USER_ID = #{record.userId,jdbcType=INTEGER},
+      OPENID = #{record.openid,jdbcType=VARCHAR},
+      HEAD_IMG_URL = #{record.headImgUrl,jdbcType=VARCHAR},
+      NICK_NAME = #{record.nickName,jdbcType=VARCHAR},
+      COMPANY_ID = #{record.companyId,jdbcType=VARCHAR},
+      AGENT_CODE = #{record.agentCode,jdbcType=VARCHAR},
+      USER_NAME = #{record.userName,jdbcType=VARCHAR},
+      ID_TYPE = #{record.idType,jdbcType=VARCHAR},
+      ID_NO = #{record.idNo,jdbcType=VARCHAR},
+      GENDER = #{record.gender,jdbcType=VARCHAR},
+      USER_POSITION = #{record.userPosition,jdbcType=VARCHAR},
+      BIRTHDAY = #{record.birthday,jdbcType=VARCHAR},
+      EDUCATION = #{record.education,jdbcType=VARCHAR},
+      MOBILE = #{record.mobile,jdbcType=VARCHAR},
+      USER_EMAIL = #{record.userEmail,jdbcType=VARCHAR},
+      PROVINCE = #{record.province,jdbcType=VARCHAR},
+      CITY = #{record.city,jdbcType=VARCHAR},
+      AREA = #{record.area,jdbcType=VARCHAR},
+      REFEREE_USERID = #{record.refereeUserid,jdbcType=VARCHAR},
+      STATE = #{record.state,jdbcType=VARCHAR},
+      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
+      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
+      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
+      UPDATE_REMARK = #{record.updateRemark,jdbcType=VARCHAR},
+      SOURCE = #{record.source,jdbcType=VARCHAR},
+      CARD_IMG_URL = #{record.cardImgUrl,jdbcType=VARCHAR}
+    <if test="_parameter != null" >
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.UserInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    update user_info
+    <set >
+      <if test="openid != null" >
+        OPENID = #{openid,jdbcType=VARCHAR},
+      </if>
+      <if test="headImgUrl != null" >
+        HEAD_IMG_URL = #{headImgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="nickName != null" >
+        NICK_NAME = #{nickName,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="agentCode != null" >
+        AGENT_CODE = #{agentCode,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        USER_NAME = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="idType != null" >
+        ID_TYPE = #{idType,jdbcType=VARCHAR},
+      </if>
+      <if test="idNo != null" >
+        ID_NO = #{idNo,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        GENDER = #{gender,jdbcType=VARCHAR},
+      </if>
+      <if test="userPosition != null" >
+        USER_POSITION = #{userPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="birthday != null" >
+        BIRTHDAY = #{birthday,jdbcType=VARCHAR},
+      </if>
+      <if test="education != null" >
+        EDUCATION = #{education,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null" >
+        MOBILE = #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="userEmail != null" >
+        USER_EMAIL = #{userEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null" >
+        PROVINCE = #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null" >
+        CITY = #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="area != null" >
+        AREA = #{area,jdbcType=VARCHAR},
+      </if>
+      <if test="refereeUserid != null" >
+        REFEREE_USERID = #{refereeUserid,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        STATE = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateRemark != null" >
+        UPDATE_REMARK = #{updateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="source != null" >
+        SOURCE = #{source,jdbcType=VARCHAR},
+      </if>
+      <!-- <if test="age != null">
+      	AGE = #{age,jdbcType=VARCHAR},
+      </if> -->
+      <if test="cardImgUrl != null" >
+        CARD_IMG_URL = #{cardImgUrl,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where USER_ID = #{userId,jdbcType=INTEGER}
+  </update>
+  
+  <!-- <update id="updateByOpenId" parameterType="com.ruoyi.content.domain.UserInfo" >
+    
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    
+    update user_info
+    <set >
+      <if test="openid != null" >
+        OPENID = #{openid,jdbcType=VARCHAR},
+      </if>
+      <if test="headImgUrl != null" >
+        HEAD_IMG_URL = #{headImgUrl,jdbcType=VARCHAR},
+      </if>
+      <if test="nickName != null" >
+        NICK_NAME = #{nickName,jdbcType=VARCHAR},
+      </if>
+      <if test="companyId != null" >
+        COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      </if>
+      <if test="agentCode != null" >
+        AGENT_CODE = #{agentCode,jdbcType=VARCHAR},
+      </if>
+      <if test="userName != null" >
+        USER_NAME = #{userName,jdbcType=VARCHAR},
+      </if>
+      <if test="idType != null" >
+        ID_TYPE = #{idType,jdbcType=VARCHAR},
+      </if>
+      <if test="idNo != null" >
+        ID_NO = #{idNo,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null" >
+        GENDER = #{gender,jdbcType=VARCHAR},
+      </if>
+      <if test="userPosition != null" >
+        USER_POSITION = #{userPosition,jdbcType=VARCHAR},
+      </if>
+      <if test="birthday != null" >
+        BIRTHDAY = #{birthday,jdbcType=VARCHAR},
+      </if>
+      <if test="education != null" >
+        EDUCATION = #{education,jdbcType=VARCHAR},
+      </if>
+      <if test="mobile != null" >
+        MOBILE = #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="userEmail != null" >
+        USER_EMAIL = #{userEmail,jdbcType=VARCHAR},
+      </if>
+      <if test="province != null" >
+        PROVINCE = #{province,jdbcType=VARCHAR},
+      </if>
+      <if test="city != null" >
+        CITY = #{city,jdbcType=VARCHAR},
+      </if>
+      <if test="area != null" >
+        AREA = #{area,jdbcType=VARCHAR},
+      </if>
+      <if test="refereeUserid != null" >
+        REFEREE_USERID = #{refereeUserid,jdbcType=VARCHAR},
+      </if>
+      <if test="state != null" >
+        STATE = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="createUser != null" >
+        CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null" >
+        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      </if>
+      <if test="updateRemark != null" >
+        UPDATE_REMARK = #{updateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="source != null" >
+        SOURCE = #{source,jdbcType=VARCHAR},
+      </if>
+      <if test="age != null">
+      	AGE = #{age,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where OPENID = #{openid,jdbcType=INTEGER}
+  </update> -->
+  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.UserInfo" >
+    <!--
+      WARNING - @mbggenerated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Tue Apr 03 16:25:50 CST 2018.
+    -->
+    update user_info
+    set OPENID = #{openid,jdbcType=VARCHAR},
+      HEAD_IMG_URL = #{headImgUrl,jdbcType=VARCHAR},
+      NICK_NAME = #{nickName,jdbcType=VARCHAR},
+      COMPANY_ID = #{companyId,jdbcType=VARCHAR},
+      AGENT_CODE = #{agentCode,jdbcType=VARCHAR},
+      USER_NAME = #{userName,jdbcType=VARCHAR},
+      ID_TYPE = #{idType,jdbcType=VARCHAR},
+      ID_NO = #{idNo,jdbcType=VARCHAR},
+      GENDER = #{gender,jdbcType=VARCHAR},
+      USER_POSITION = #{userPosition,jdbcType=VARCHAR},
+      BIRTHDAY = #{birthday,jdbcType=VARCHAR},
+      EDUCATION = #{education,jdbcType=VARCHAR},
+      MOBILE = #{mobile,jdbcType=VARCHAR},
+      USER_EMAIL = #{userEmail,jdbcType=VARCHAR},
+      PROVINCE = #{province,jdbcType=VARCHAR},
+      CITY = #{city,jdbcType=VARCHAR},
+      AREA = #{area,jdbcType=VARCHAR},
+      REFEREE_USERID = #{refereeUserid,jdbcType=VARCHAR},
+      STATE = #{state,jdbcType=VARCHAR},
+      CREATE_USER = #{createUser,jdbcType=VARCHAR},
+      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
+      UPDATE_REMARK = #{updateRemark,jdbcType=VARCHAR},
+      SOURCE = #{source,jdbcType=VARCHAR},
+        CARD_IMG_URL = #{cardImgUrl,jdbcType=VARCHAR}
+      <!-- ,
+      AGE = #{age,jdbcType=VARCHAR} -->
+    where USER_ID = #{userId,jdbcType=INTEGER}
+  </update>
+</mapper>
\ No newline at end of file

From 78851e6969ba6242c938fe87e121ed6786d37be0 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Thu, 25 Mar 2021 18:02:41 +0800
Subject: [PATCH 06/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8C=E5=90=8D?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{CommonController.java => ContentCommonController.java}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename ruoyi-content/src/main/java/com/ruoyi/content/controller/{CommonController.java => ContentCommonController.java} (94%)

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/CommonController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ContentCommonController.java
similarity index 94%
rename from ruoyi-content/src/main/java/com/ruoyi/content/controller/CommonController.java
rename to ruoyi-content/src/main/java/com/ruoyi/content/controller/ContentCommonController.java
index 4f4db69d7..88d170b0e 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/CommonController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ContentCommonController.java
@@ -22,8 +22,8 @@ import java.util.List;
  */
 @Controller
 @RequestMapping("/common")
-public class CommonController {
-    private static Logger logger = LoggerFactory.getLogger(CommonController.class);
+public class ContentCommonController {
+    private static Logger logger = LoggerFactory.getLogger(ContentCommonController.class);
     @Autowired
     private CmsRoleAuthorityService authorityService;
 

From 6adbcb3c7130e957d45bcaaff4755c53e8c0b9b7 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Thu, 25 Mar 2021 18:05:19 +0800
Subject: [PATCH 07/30] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/content/ArticleForwardTrackMapper.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleForwardTrackMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleForwardTrackMapper.xml
index 107f39bcd..cf03333ef 100644
--- a/ruoyi-content/src/main/resources/mapper/content/ArticleForwardTrackMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleForwardTrackMapper.xml
@@ -155,7 +155,7 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
-  <insert id="insert" parameterType="com.micro.cms.modules.mybatis.entity.ArticleForwardTrack" >
+  <insert id="insert" parameterType="com.ruoyi.content.domain.ArticleForwardTrack" >
     <!--
       WARNING - @mbggenerated
       This element is automatically generated by MyBatis Generator, do not modify.

From aca61b6b79617b7f3fbdd9a5cb889433fa66b867 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Fri, 26 Mar 2021 12:36:15 +0800
Subject: [PATCH 08/30] =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/controller/GalleryController.java |  58 +++++
 .../content/domain/GalleryPicInfoEx.java      |  14 +
 .../content/mapper/GalleryQueryMapper.java    |   6 +-
 .../ruoyi/content/service/GalleryService.java |   6 +-
 .../service/impl/GalleryServiceImpl.java      |  50 +---
 .../mapper/content/GalleryQueryMapper.xml     | 205 ++++++++-------
 .../templates/content/adverts/adverts.html    |   2 +-
 .../templates/content/gallery/list.html       | 241 ++++++++++++++++++
 .../content/picAdverts/picAdverts.html        |   2 +-
 9 files changed, 433 insertions(+), 151 deletions(-)
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfoEx.java
 create mode 100644 ruoyi-content/src/main/resources/templates/content/gallery/list.html

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java
index c0a2fc2f1..5663bd700 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/GalleryController.java
@@ -1,6 +1,9 @@
 package com.ruoyi.content.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.content.domain.GalleryPicInfoEx;
 import com.ruoyi.content.message.Message;
 import com.ruoyi.content.service.GalleryService;
 import org.slf4j.Logger;
@@ -10,6 +13,9 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * @program: ruoyi->GalleryController
  * @description:
@@ -53,4 +59,56 @@ public class GalleryController extends BaseController {
         return msg;
     }
 
+    /**
+     * 根据栏目图库列表
+     *
+     * @param request
+     * @return
+     */
+    @RequestMapping("/galleryImgList")
+    @ResponseBody
+    public TableDataInfo galleryImgList(HttpServletRequest request) {
+        LOGGER.info("上传图库图片控制层方法开始");
+        String channel = request.getParameter("channel");
+        String picState = "0";
+        String special = "GALLERY";
+        startPage();
+        List<GalleryPicInfoEx> galleryPicInfos = galleryService.galleryImgList(channel, picState, special);
+        LOGGER.info("查询图库列表的控制层方法结束！");
+        return getDataTable(galleryPicInfos);
+    }
+
+    /**
+     * 图片删除
+     *
+     * @return
+     */
+    @RequestMapping("/remove")
+    @ResponseBody
+    public AjaxResult delGalleryPic(String ids) {
+        LOGGER.info("删除图片信息控制层方法开始");
+        try {
+            return toAjax(galleryService.delGalleryPic(ids));
+        } catch (Exception e) {
+            LOGGER.info("删除文章信息失败【{}】", e.getMessage());
+        }
+        LOGGER.info("删除图片信息的控制层方法结束！");
+        return toAjax(0);
+    }
+
+    /**
+     * 图片图库栏目录入
+     *
+     * @return
+     */
+    @PostMapping("/addGallery")
+    @ResponseBody
+    public Message addGallery(String channelId, String picId) {
+        LOGGER.info("图库图片分配栏目控制层方法开始");
+        LOGGER.info(channelId + "------" + picId);
+        Message msg = galleryService.addGallery(channelId, picId);
+        LOGGER.info("图库图片分配栏目控制层方法结束");
+        return msg;
+    }
+
 }
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfoEx.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfoEx.java
new file mode 100644
index 000000000..9a87baddc
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/GalleryPicInfoEx.java
@@ -0,0 +1,14 @@
+package com.ruoyi.content.domain;
+
+public class GalleryPicInfoEx extends GalleryPicInfo {
+
+    private String codeName;
+
+    public String getCodeName() {
+        return codeName;
+    }
+
+    public void setCodeName(String codeName) {
+        this.codeName = codeName;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryQueryMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryQueryMapper.java
index 3cfb4b4a8..e0d6e68a9 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryQueryMapper.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/GalleryQueryMapper.java
@@ -1,6 +1,7 @@
 package com.ruoyi.content.mapper;
 
 import com.ruoyi.content.domain.GalleryPicInfo;
+import com.ruoyi.content.domain.GalleryPicInfoEx;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -9,9 +10,8 @@ import java.util.List;
 @Repository
 public interface GalleryQueryMapper {
 
-    public List<GalleryPicInfo> selectAllWithLimit(@Param(value = "companyId") String companyId, @Param(value = "branchId") String branchId,
-                                                   @Param(value = "picState") List<String> picState, @Param(value = "picId") List<Integer> picId,
-                                                   @Param(value = "startRow") int startRow, @Param(value = "rows") int rows);
+    public List<GalleryPicInfoEx> selectAllWithLimit(@Param(value = "companyId") String companyId, @Param(value = "branchId") String branchId,
+                                                     @Param(value = "picState") List<String> picState, @Param(value = "picId") List<Integer> picId);
 
     public List<String> selectChannelId(@Param(value = "picId") Integer picId);
 
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/GalleryService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/GalleryService.java
index a694f79ba..cf9acf385 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/GalleryService.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/GalleryService.java
@@ -1,6 +1,6 @@
 package com.ruoyi.content.service;
 
-import com.ruoyi.content.domain.GalleryDTO;
+import com.ruoyi.content.domain.GalleryPicInfoEx;
 import com.ruoyi.content.message.Message;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -25,7 +25,7 @@ public interface GalleryService {
      * @param picState
      * @return
      */
-    public List<GalleryDTO> galleryImgList(int startRow, int rows, String channelId, String picState, String special);
+    public List<GalleryPicInfoEx> galleryImgList(String channelId, String picState, String special);
 
     /**
      * 图片个数
@@ -60,5 +60,5 @@ public interface GalleryService {
      * @param ids
      * @return
      */
-    public Message delGalleryPic(String ids);
+    public Integer delGalleryPic(String ids);
 }
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/GalleryServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/GalleryServiceImpl.java
index 2e46cac76..71cda5091 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/GalleryServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/GalleryServiceImpl.java
@@ -130,8 +130,8 @@ public class GalleryServiceImpl implements GalleryService {
     }
 
     @Override
-    public List<GalleryDTO> galleryImgList(int startRow, int rows, String channelId, String picState, String special) {
-        LOGGER.info("拿到的参数startRow【{}】，rows【{}】，所属栏目【{}】，图片状态【{}】", startRow, rows, channelId, picState);
+    public List<GalleryPicInfoEx> galleryImgList(String channelId, String picState, String special) {
+        LOGGER.info("拿到的参数，所属栏目【{}】，图片状态【{}】", channelId, picState);
         String companyId = "1";// 公司id
         String branchId = "86";
         List<String> list = new ArrayList<String>();
@@ -161,32 +161,15 @@ public class GalleryServiceImpl implements GalleryService {
             }
         }
 
-        List<GalleryPicInfo> galleryList = galleryQueryMapper.selectAllWithLimit(companyId, branchId, list, picIds, startRow, rows);
+        List<GalleryPicInfoEx> galleryList = galleryQueryMapper.selectAllWithLimit(companyId, branchId, list, picIds);
         if (galleryList == null || galleryList.size() < 1) {
             LOGGER.info("未查询到数据");
             throw new BusinessException("图库暂没有海报！");
         }
 
         //所属二级栏目
-        List<GalleryDTO> galleryDTOs = new ArrayList<>();
-        for (GalleryPicInfo galleryPicInfo : galleryList) {
-            GalleryDTO galleryDTO = new GalleryDTO();
-            galleryDTO.setPicId(galleryPicInfo.getPicId());
-            galleryDTO.setImgUrl(galleryPicInfo.getImgUrl());
-            galleryDTO.setPicAdId(galleryPicInfo.getPicAdId());
-            galleryDTO.setPicState(galleryPicInfo.getPicState());
-            galleryDTO.setCompanyId(galleryPicInfo.getCompanyId());
-            galleryDTO.setCreateDate(galleryPicInfo.getCreateDate());
-            galleryDTO.setCreateTime(galleryPicInfo.getCreateTime());
-            LOGGER.info("图库数据【{}】", JsonUtil.objectToJackson(galleryDTO));
-            List<String> codeName = new ArrayList<>();
-//			List<String> channelIds = galleryQueryMapper.selectChannelId(galleryPicInfo.getPicId());
-//			for (String string : channelIds) {
-//				LOGGER.info("栏目id【{}】", string);
-//				BaseCodeExample example = new BaseCodeExample();
-//				BaseCodeExample.Criteria criteria = example.createCriteria();
-//				criteria.andCodeCodeEqualTo(string).andStateEqualTo("0").andCodeTypeEqualTo("GALLERY");
-
+        for (GalleryPicInfoEx galleryPicInfo : galleryList) {
+            String codeName = "";
             GalleryChannelExample channelexample = new GalleryChannelExample();
             channelexample.createCriteria().andPicIdEqualTo(galleryPicInfo.getPicId()).andStateEqualTo("0");
             List<GalleryChannel> galleryChannels = this.galleryChannelMapper.selectByExample(channelexample);
@@ -199,14 +182,13 @@ public class GalleryServiceImpl implements GalleryService {
                 List<BaseCode> baseCodes = this.baseCodeMapper.selectByExample(example);
                 LOGGER.info("栏目数据【{}】", JsonUtil.objectToJackson(baseCodes));
                 if ((baseCodes != null) && (baseCodes.size() > 0)) {
-                    codeName.add(((BaseCode) baseCodes.get(0)).getCodeCname());
+                    codeName = codeName + baseCodes.get(0).getCodeCname() + ",";
                 }
             }
-            galleryDTO.setCodeName(codeName);
-            galleryDTOs.add(galleryDTO);
+            galleryPicInfo.setCodeName(StringUtils.isNotBlank(codeName) ? codeName.substring(0, codeName.length() - 1) : "");
         }
 
-        return galleryDTOs;
+        return galleryList;
     }
 
     @Override
@@ -348,16 +330,13 @@ public class GalleryServiceImpl implements GalleryService {
     }
 
     @Override
-    public Message delGalleryPic(String ids) {
+    public Integer delGalleryPic(String ids) {
         LOGGER.info("删除图片信息的业务层方法开始！");
         LOGGER.info("删除图片信息的业务层方法中拿到的图片的id【{}】", ids);
-        Message msg = new Message();
         if (StringUtils.isBlank(ids)) {
             LOGGER.info("删除图片信息失败，缺少参数");
             throw new ParameterException("未查询到图片信息");
         }
-        msg.setInfo("删除失败！");
-        msg.setResult(false);
         try {
             String[] arrId = ids.split(",");
             for (String picId : arrId) {
@@ -369,8 +348,6 @@ public class GalleryServiceImpl implements GalleryService {
                     for (GalleryChannel galleryChannel : galleryChannels) {
                         galleryChannel.setState("1");
                         if (galleryChannelMapper.updateByPrimaryKey(galleryChannel) > 0) {
-                            msg.setInfo("删除成功！");
-                            msg.setResult(true);
                             LOGGER.info("删除此图片图库栏目关系成功！");
                             //redisManager.deleteZSet("gallery_channel_"+galleryChannel.getChannelId(),picId);
 //							redisManager.delete("gallery_channel_"+galleryChannel.getChannelId());
@@ -381,8 +358,6 @@ public class GalleryServiceImpl implements GalleryService {
                     if (galleryPicInfo != null) {
                         galleryPicInfo.setPicState("1");
                         if (galleryInfoMapper.updateByPrimaryKey(galleryPicInfo) > 0) {
-                            msg.setInfo("删除成功！");
-                            msg.setResult(true);
                             LOGGER.info("删除图片信息成功！");
                             redisManager.delete("gallery_pic_Id" + galleryPicInfo.getPicId());
                         }
@@ -391,13 +366,10 @@ public class GalleryServiceImpl implements GalleryService {
             }
 
         } catch (Exception e) {
-            LOGGER.info("删除图片信息失败【{}】", e.getMessage());
-            e.printStackTrace();
-            msg.setInfo("删除失败，请稍候再试！");
-            msg.setResult(true);
+            LOGGER.error("删除图片信息失败【{}】", e);
         }
         LOGGER.info("删除图片信息的业务层方法结束！");
-        return msg;
+        return 1;
     }
 
 }
diff --git a/ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml
index c1317e675..abb28fe7d 100644
--- a/ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/GalleryQueryMapper.xml
@@ -1,118 +1,115 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ruoyi.content.mapper.GalleryQueryMapper">
-  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.GalleryPicInfo" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 11 10:57:31 CST 2018.
-    -->
-    <id column="PIC_ID" property="picId" jdbcType="INTEGER" />
-    <result column="IMG_URL" property="imgUrl" jdbcType="VARCHAR" />
-    <result column="PIC_AD_ID" property="picAdId" jdbcType="VARCHAR" />
-    <result column="PIC_STATE" property="picState" jdbcType="VARCHAR" />
-    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
-    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
-    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
-    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
-    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
-    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
-  </resultMap>
-  
-   <sql id="adTitleSQL">
+    <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.GalleryPicInfoEx">
+        <!--
+          WARNING - @mbggenerated
+          This element is automatically generated by MyBatis Generator, do not modify.
+          This element was generated on Mon Jun 11 10:57:31 CST 2018.
+        -->
+        <id column="PIC_ID" property="picId" jdbcType="INTEGER"/>
+        <result column="IMG_URL" property="imgUrl" jdbcType="VARCHAR"/>
+        <result column="PIC_AD_ID" property="picAdId" jdbcType="VARCHAR"/>
+        <result column="PIC_STATE" property="picState" jdbcType="VARCHAR"/>
+        <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR"/>
+        <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR"/>
+        <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR"/>
+        <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR"/>
+        <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR"/>
+        <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="adTitleSQL">
    	 SELECT ad.PIC_AD_NAME
    	 FROM pic_ad_info ad
    	 WHERE ad.PIC_AD_ID = pi.PIC_AD_ID	 
    </sql>
-	<select id="selectAllWithLimit"
-		resultMap="BaseResultMap">
-		SELECT
-		pi.PIC_ID,
-		pi.IMG_URL,
-       (
-		<include refid="adTitleSQL" />
-		) as PIC_AD_ID,
-		pi.PIC_STATE,
-		pi.COMPANY_ID,
-		pi.CREATE_DATE,
-		pi.CREATE_TIME,
-		pi.CREATE_USER,
-		pi.UPDATE_DATE,
-		pi.UPDATE_TIME
-		FROM gallery_pic_info pi
-		WHERE
-		1=1
-		<if test="companyId != null and companyId !=''">
-			and pi.COMPANY_ID = #{companyId,jdbcType=VARCHAR}
-		</if>
-		<if test="branchId != null and branchId !=''">
-		    and pi.BRANCH_ID like CONCAT(CONCAT('%',#{branchId,jdbcType=VARCHAR},'%'))
-		</if>
-		<if test="picState != null">
-			and pi.PIC_STATE in
-			<foreach collection="picState" item="picState" index="index"
-				open="(" close=")" separator=",">
-				#{picState}
-			</foreach>
+    <select id="selectAllWithLimit"
+            resultMap="BaseResultMap">
+        SELECT
+        pi.PIC_ID,
+        pi.IMG_URL,
+        (
+        <include refid="adTitleSQL"/>
+        ) as PIC_AD_ID,
+        pi.PIC_STATE,
+        pi.COMPANY_ID,
+        pi.CREATE_DATE,
+        pi.CREATE_TIME,
+        pi.CREATE_USER,
+        pi.UPDATE_DATE,
+        pi.UPDATE_TIME
+        FROM gallery_pic_info pi
+        WHERE
+        1=1
+        <if test="companyId != null and companyId !=''">
+            and pi.COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+        </if>
+        <if test="branchId != null and branchId !=''">
+            and pi.BRANCH_ID like CONCAT(CONCAT('%',#{branchId,jdbcType=VARCHAR},'%'))
+        </if>
+        <if test="picState != null">
+            and pi.PIC_STATE in
+            <foreach collection="picState" item="picState" index="index"
+                     open="(" close=")" separator=",">
+                #{picState}
+            </foreach>
 
-		</if>
-		<if test="picId != null and picId.size() > 0">
-			and pi.PIC_ID in
-			<foreach collection="picId" item="picId" index="index"
-				open="(" close=")" separator=",">
-				#{picId}
-			</foreach>
-		</if>
-		order by pi.CREATE_DATE DESC,pi.CREATE_TIME DESC, pi.UPDATE_DATE
-		DESC,pi.UPDATE_TIME DESC
-		limit
-		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
-	</select>	
-	
-	<select id="selectChannelId" resultType="java.lang.String" parameterType="java.lang.Integer" >
+        </if>
+        <if test="picId != null and picId.size() > 0">
+            and pi.PIC_ID in
+            <foreach collection="picId" item="picId" index="index"
+                     open="(" close=")" separator=",">
+                #{picId}
+            </foreach>
+        </if>
+        order by pi.CREATE_DATE DESC,pi.CREATE_TIME DESC, pi.UPDATE_DATE DESC,pi.UPDATE_TIME DESC
+    </select>
+
+    <select id="selectChannelId" resultType="java.lang.String" parameterType="java.lang.Integer">
 		SELECT distinct CHANNEL_ID
 		FROM cms_gallery_channel
 		WHERE PIC_ID = #{picId,jdbcType=INTEGER} and STATE = '0'
 	</select>
-	
-	<select id="selectAllPicInfo"
-		resultMap="BaseResultMap">
-		SELECT
-		pi.PIC_ID,
-		pi.IMG_URL,
-       (
-		<include refid="adTitleSQL" />
-		) as PIC_AD_ID,
-		pi.PIC_STATE,
-		pi.COMPANY_ID,
-		pi.CREATE_DATE,
-		pi.CREATE_TIME,
-		pi.CREATE_USER,
-		pi.UPDATE_DATE,
-		pi.UPDATE_TIME
-		FROM gallery_pic_info pi
-		WHERE
-		1=1
-		<if test="companyId != null and companyId !=''">
-			and pi.COMPANY_ID = #{companyId,jdbcType=VARCHAR}
-		</if>
-		<if test="branchId != null and branchId !=''">
-		    and pi.BRANCH_ID like CONCAT(CONCAT('%',#{branchId,jdbcType=VARCHAR},'%'))
-		</if>
-		<if test="picState != null">
-			and pi.PIC_STATE in
-			<foreach collection="picState" item="picState" index="index"
-				open="(" close=")" separator=",">
-				#{picState}
-			</foreach>
 
-		</if>
-		<if test="picId != null and picId.size() > 0">
-			and pi.PIC_ID in
-			<foreach collection="picId" item="picId" index="index"
-				open="(" close=")" separator=",">
-				#{picId}
-			</foreach>
-		</if>
-	</select>	
+    <select id="selectAllPicInfo"
+            resultMap="BaseResultMap">
+        SELECT
+        pi.PIC_ID,
+        pi.IMG_URL,
+        (
+        <include refid="adTitleSQL"/>
+        ) as PIC_AD_ID,
+        pi.PIC_STATE,
+        pi.COMPANY_ID,
+        pi.CREATE_DATE,
+        pi.CREATE_TIME,
+        pi.CREATE_USER,
+        pi.UPDATE_DATE,
+        pi.UPDATE_TIME
+        FROM gallery_pic_info pi
+        WHERE
+        1=1
+        <if test="companyId != null and companyId !=''">
+            and pi.COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+        </if>
+        <if test="branchId != null and branchId !=''">
+            and pi.BRANCH_ID like CONCAT(CONCAT('%',#{branchId,jdbcType=VARCHAR},'%'))
+        </if>
+        <if test="picState != null">
+            and pi.PIC_STATE in
+            <foreach collection="picState" item="picState" index="index"
+                     open="(" close=")" separator=",">
+                #{picState}
+            </foreach>
+
+        </if>
+        <if test="picId != null and picId.size() > 0">
+            and pi.PIC_ID in
+            <foreach collection="picId" item="picId" index="index"
+                     open="(" close=")" separator=",">
+                #{picId}
+            </foreach>
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html
index 669943484..d16627776 100644
--- a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html
+++ b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html
@@ -90,7 +90,7 @@
                     title: '跳转地址',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-xs" href="javascript:void(0)" onclick="$.modal.msg(\'' + row.adLinkUrl + '\');" ><i class="fa"></i>展示</a> ');
+                        actions.push('<a class="btn btn-xs" href="javascript:void(0)" onclick="$.modal.alertSuccess(\'' + row.adLinkUrl + '\');" ><i class="fa"></i>展示</a> ');
                         return actions.join('');
                     }
                 },
diff --git a/ruoyi-content/src/main/resources/templates/content/gallery/list.html b/ruoyi-content/src/main/resources/templates/content/gallery/list.html
new file mode 100644
index 000000000..8b71e5d72
--- /dev/null
+++ b/ruoyi-content/src/main/resources/templates/content/gallery/list.html
@@ -0,0 +1,241 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('图片列表')"/>
+</head>
+<style>
+    .article-table-img {
+        width: 50px;
+        height: 50px;
+        border-radius: 4px;
+        display: block;
+        border-style: none;
+    }
+</style>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>所属栏目：</label>
+                            <div class="col-sm-8">
+                                <select name="channel" th:id="channel" class="form-control" required>
+
+                                </select>
+                            </div>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()">
+                <i class="fa fa-remove"></i> 删除
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<div class="modal inmodal" id="myModal2" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content animated flipInY">
+            <div class="modal-header">
+                <input th:hidden="true" value="" th:id="pictureId"/>
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left;">分配栏目</h5>
+            </div>
+            <div class="modal-body">
+                <div class="select-list">
+                    <ul style="margin-top: -15px;">
+                        <li>
+                            <label style="width: 80px;"><i style="color: #dc1212">*</i>专栏选择：</label>
+                            <div class="col-sm-8">
+                                <select th:id="columnId" class="form-control">
+
+                                </select>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary" th:onclick="saveData()">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var prefix = ctx + "content/gallery";
+    var prefix1 = ctx + "column/queryBasicData";
+    var prefix2 = ctx + "column/queryColumn";
+    var prefix3 = ctx + "content/gallery/addGallery";
+
+    $(function () {
+        var options = {
+            url: prefix + "/galleryImgList",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "图片列表",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'picId',
+                    title: '图片编号',
+                },
+                {
+                    field: 'imgUrl',
+                    title: '图片',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<img class="article-table-img" src="' + row.imgUrl + '" ></img> ');
+                        return actions.join('');
+                    }
+                },
+                {
+                    field: 'picAdId',
+                    title: '广告'
+                },
+                {
+                    field: 'codeName',
+                    title: '所属栏目'
+                },
+                {
+                    field: 'picState',
+                    title: '状态',
+                    formatter: function (value, row, index) {
+                        if (row.picState == '0') {
+                            return '展示';
+                        } else {
+                            return '不展示';
+                        }
+                    }
+                },
+                {
+                    field: 'createDate',
+                    title: '创建日期'
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs" data-toggle="modal" data-target="#myModal2" onclick="changeId(\'' + row.picId + '\')"><i class="fa fa-object-group"></i>分配栏目</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.picId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+
+        $.ajax({
+            type: "post",
+            url: prefix1,
+            data: {
+                "bType": "GALLERY"
+            },
+            async: false,
+            success: function (data) {
+                if (data.result) {// 跳转到列表页面
+                    var baseDataList = data.object.baseList;
+                    $("#channel").append("<option value=''>请选择</option>");
+                    for (var i = 0; i < baseDataList.length; i++) {
+                        $("#channel").append("<option value='" + baseDataList[i].codeCode + "' data-value='" + baseDataList[i].codeType + "'>" + baseDataList[i].codeCname + "</option>");
+                    }
+                } else {
+                }
+            }
+        });
+
+        $.ajax({
+            type: "post",
+            url: prefix2,
+            data: {},
+            async: false,
+            success: function (data) {
+                if (data.result) {
+                    var obj = data.object.columnList;
+                    for (var i = 0; i < obj.length; i++) {
+                        if (obj[i].codeType == "FIRST_COLUMN" && obj[i].codeCode.indexOf("GALLERY") != -1) {
+                            $("#columnId").append("<optgroup id=" + obj[i].codeCode + " label=" + obj[i].codeCname + "></optgroup>");
+                        }
+                        //先循环出标签并给标签id
+                        if (obj[i].codeType != "FIRST_COLUMN") {
+                            if (obj[i].codeType == "GALLERY") {
+                                $("#GALLERY").append("<option value='" + obj[i].id + "'>" + obj[i].codeCname + "</option>");
+                            }
+
+                            if (obj[i].codeType == "INCREASE_GALLERY") {
+                                if ($("#INCREASE_GALLERY").length == 0) {
+                                    $("#columnId").append("<optgroup id='INCREASE_GALLERY' label='增员图库'></optgroup>");
+                                }
+                                $("#INCREASE_GALLERY").append("<option value='" + obj[i].id + "'>" + obj[i].codeCname + "</option>");
+                            }
+                        }
+
+                    }
+                } else {
+
+                }
+            }
+        });
+    });
+
+    function changeId(id) {
+        $('#pictureId').val(id);
+    }
+
+    function saveData() {
+        // 打开遮罩层
+        $.modal.loading("请稍后...");
+        var channelId = $('#columnId').val();//栏目id
+        var picId = $('#pictureId').val();
+        $.ajax({
+            url: prefix3,
+            data: {
+                "channelId": channelId,
+                "picId": picId,
+            },
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
+                const code = {
+                    'code': 0
+                };
+                $.operate.successCallback(code);
+            },
+            error: function (textStatus, e) {
+                const code = {
+                    'code' : 500,
+                    'msg' : '操作失败'
+                }
+                $.operate.successCallback(code);
+            }
+        });
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html
index b9ab23cd9..dd80c88d3 100644
--- a/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html
+++ b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html
@@ -71,7 +71,7 @@
                     title: '广告链接',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-xs" href="javascript:void(0)" onclick="$.modal.msg(\'' + row.picAdUrl + '\');" ><i class="fa"></i>展示</a> ');
+                        actions.push('<a class="btn btn-xs" href="javascript:void(0)" onclick="$.modal.alertSuccess(\'' + row.picAdUrl + '\');" ><i class="fa"></i>展示</a> ');
                         return actions.join('');
                     }
                 },

From 453ff2e880790714d1c277651636187e512efcc0 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Fri, 26 Mar 2021 13:52:02 +0800
Subject: [PATCH 09/30] =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseCodeController.java        |  45 ++-
 .../content/mapper/BaseCodeExMapper.java      |   3 +-
 .../content/service/BaseCodeService.java      |   4 +-
 .../service/impl/BaseCodeServiceImpl.java     |   9 +-
 .../mapper/content/BaseCodeExMapper.xml       |   4 +-
 .../templates/content/column/column.html      | 260 ++++++++++++++++++
 6 files changed, 286 insertions(+), 39 deletions(-)
 create mode 100644 ruoyi-content/src/main/resources/templates/content/column/column.html

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
index 98dc7855d..47f075250 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
@@ -1,8 +1,9 @@
 package com.ruoyi.content.controller;
 
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.content.domain.BaseCode;
 import com.ruoyi.content.domain.BaseCodeTree;
-import com.ruoyi.content.domain.PageDTO;
 import com.ruoyi.content.message.Message;
 import com.ruoyi.content.service.BaseCodeService;
 import com.ruoyi.content.utils.DateUtil;
@@ -12,6 +13,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -27,11 +29,19 @@ import java.util.*;
  */
 @Controller
 @RequestMapping("/column")
-public class BaseCodeController {
+public class BaseCodeController extends BaseController {
+
     private final static Logger logger = LoggerFactory.getLogger(BaseCodeController.class);
+    private String prefix = "content/column";
+
     @Autowired
     private BaseCodeService baseCodeService;
 
+    @GetMapping()
+    public String baseCode() {
+        return prefix + "/column";
+    }
+
     /**
      * 分页查询栏目信息
      *
@@ -41,32 +51,15 @@ public class BaseCodeController {
      */
     @RequestMapping("/columnArry")
     @ResponseBody
-    public PageDTO columnArry(HttpServletRequest request, HttpServletResponse response) {
+    public TableDataInfo columnArry(HttpServletRequest request, HttpServletResponse response) {
         logger.info("进入查询当前用户发布的栏目的控制层方法");
-        Thread.currentThread().setName(UUID.randomUUID().toString());
-        PageDTO pageDTO = new PageDTO();
-        try {
-            String rowsVal = request.getParameter("rows");
-            String page = request.getParameter("page");
-            String codeType = request.getParameter("codeType");
-            String codeCname = request.getParameter("codeCname");
-            String orderNo = request.getParameter("orderNo");
-            int rows = Integer.parseInt(rowsVal);
-            int startRow = rows * (Integer.parseInt(page) - 1);
-            List<BaseCode> list = baseCodeService.queryBaseCode(startRow, rows, codeType, codeCname, orderNo);
-            pageDTO.setPage(Integer.parseInt(page));
-            pageDTO.setStartRow(startRow);
-            pageDTO.setDataRows(list);
-            int count = baseCodeService.countBaseCode(codeType, codeCname, orderNo);
-            pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
-            pageDTO.setRecords(count);
-            pageDTO.setPage(Integer.parseInt(page));
-        } catch (Exception e) {
-            logger.info("查询当前用户发布的栏目失败【{}】", e.getMessage());
-            e.printStackTrace();
-        }
+        String codeType = request.getParameter("codeType");
+        String codeCname = request.getParameter("codeCname");
+        String orderNo = request.getParameter("orderNo");
+        startPage();
+        List<BaseCode> list = baseCodeService.queryBaseCode(codeType, codeCname, orderNo);
         logger.info("跳出查询当前用户发布的栏目的控制层方法");
-        return pageDTO;
+        return getDataTable(list);
     }
 
     /**
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
index 0aca77d98..756ed4684 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
@@ -11,8 +11,7 @@ import java.util.List;
 @Repository
 public interface BaseCodeExMapper {
     public List<BaseCode> selectAllWithLimit(@Param(value = "companyId") String companyId, @Param(value = "branchId") String branchId, @Param(value = "codeType") String codeType,
-                                             @Param(value = "codeCname") String codeCname, @Param(value = "orderNo") String orderNo, @Param(value = "startRow") int startRow,
-                                             @Param(value = "rows") int rows);
+                                             @Param(value = "codeCname") String codeCname, @Param(value = "orderNo") String orderNo);
 
     /**
      * 查询栏目树
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
index 19bfac610..2d3c55196 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
@@ -47,14 +47,12 @@ public interface BaseCodeService {
     /**
      * 条件查询基础数据
      *
-     * @param startRow
-     * @param rows
      * @param codeType
      * @param codeCname
      * @param codeCode
      * @return
      */
-    public List<BaseCode> queryBaseCode(int startRow, int rows, String codeType, String codeCname, String codeCode);
+    public List<BaseCode> queryBaseCode(String codeType, String codeCname, String codeCode);
 
     /**
      * 统计条件下有多少数据
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
index e04c8f2f7..d398c2209 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
@@ -382,21 +382,20 @@ public class BaseCodeServiceImpl implements BaseCodeService {
      * 分页查询栏目信息
      */
     @Override
-    public List<BaseCode> queryBaseCode(int startRow, int rows, String codeType, String codeCname, String orderNo) {
+    public List<BaseCode> queryBaseCode(String codeType, String codeCname, String orderNo) {
         logger.info("进入查询栏目信息的业务方法。");
-        logger.info("查询栏目信息的参数startRow【{}】,rows【{}】,codeType【{}】,codeCname【{}】,orderNo【{}】", startRow, rows, codeType, codeCname, orderNo);
+        logger.info("查询栏目信息的参数,codeType【{}】,codeCname【{}】,orderNo【{}】", codeType, codeCname, orderNo);
         List<BaseCode> codeList = null;
         String companyId = "1";//渠道id
         String branchId = "86";//分支公司
         try {
-            codeList = baseCodeExMapper.selectAllWithLimit(companyId, branchId, codeType, codeCname, orderNo, startRow, rows);
+            codeList = baseCodeExMapper.selectAllWithLimit(companyId, branchId, codeType, codeCname, orderNo);
             if (codeList == null || codeList.size() < 1) {
                 logger.info("未查询到基础数据信息【{}】", JsonUtil.objectToJackson(codeList));
                 return codeList;
             }
         } catch (Exception e) {
-            logger.info("查询栏目信息的业务方法异常【{}】", e.getMessage());
-            e.printStackTrace();
+            logger.error("查询栏目信息的业务方法异常【{}】", e);
         }
         logger.info("查询栏目信息的业务方法结束。");
         return codeList;
diff --git a/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
index 1245fbe34..f724839a6 100644
--- a/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
@@ -54,10 +54,8 @@
 			and ORDER_NO = #{orderNo,jdbcType=VARCHAR}
 		</if>
 		order by CODE_TYPE DESC,ORDER_NO*1 ASC, CREATE_TIME ASC, UPDATE_TIME ASC 
-		limit #{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
 	</select>
-	
-	
+
     <resultMap id="BaseTreeResultMap" type="com.ruoyi.content.domain.BaseCodeTree">
         <id column="ID" property="id" jdbcType="INTEGER" />
 	    <result column="CODE_CODE" property="codeCode" jdbcType="VARCHAR" />
diff --git a/ruoyi-content/src/main/resources/templates/content/column/column.html b/ruoyi-content/src/main/resources/templates/content/column/column.html
new file mode 100644
index 000000000..ed2deae70
--- /dev/null
+++ b/ruoyi-content/src/main/resources/templates/content/column/column.html
@@ -0,0 +1,260 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('栏目列表')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label style="width: 95px;">一级栏目名称：</label>
+                            <select name="codeType" th:id="codeType">
+
+                            </select>
+                        </li>
+                        <li>
+                            <label style="width: 95px;">二级栏目名称：</label>
+                            <input type="text" name="codeCname"/>
+                        </li>
+                        <li>
+                            <label>展示序号：</label>
+                            <input type="text" name="orderNo"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.operate.add()">
+                                <i class="fa fa-plus"></i> 添加
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var prefix = ctx + 'column';
+
+    var baseDataList = [];
+    var articleSecList = [];
+
+    $(function () {
+        var options = {
+            url: prefix + "/columnArry",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "基础代码",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'id',
+                    title: '主键ID',
+                    visible: false
+                },
+                {
+                    field: 'codeCode',
+                    title: 'code代码',
+                    visible: false
+                },
+                {
+                    field: 'codeType',
+                    title: '上级栏目名称',
+                    formatter: function (value, row, index) {
+                        const result = queryCnameByid(row.codeType);
+                        if (result != null && result != '') {
+                            return result;
+                        } else {
+                            return "无";
+                        }
+                    }
+                },
+                {
+                    field: 'codeCname',
+                    title: '栏目名称'
+                },
+                {
+                    field: 'orderNo',
+                    title: '展示序号'
+                },
+                {
+                    field: 'codeEname',
+                    title: '栏目英文名',
+                    visible: false
+                },
+                {
+                    field: 'codeTname',
+                    title: '栏目繁体名',
+                    visible: false
+                },
+                {
+                    field: 'state',
+                    title: '状态',
+                    formatter: function (value, row, index) {
+                        if (row.state == '0') {
+                            return '展示';
+                        } else {
+                            return '不展示';
+                        }
+                    }
+                },
+                {
+                    field: 'createUser',
+                    title: '创建者',
+                    formatter: function (value, row, index) {
+                        if (row.createUser == null || row.createUser == '') {
+                            return '无';
+                        } else {
+                            return row.createUser;
+                        }
+                    }
+                },
+                {
+                    field: 'createTime',
+                    title: '创建时间',
+                    formatter: function (value, row, index) {
+                        if (row.createTime == null || row.createTime == '') {
+                            return '无';
+                        } else {
+                            return row.createTime;
+                        }
+                    }
+                },
+                {
+                    field: 'updateUser',
+                    title: '修改者',
+                    formatter: function (value, row, index) {
+                        if (row.updateUser == null || row.updateUser == '') {
+                            return '无';
+                        } else {
+                            return row.updateUser;
+                        }
+                    }
+                },
+                {
+                    field: 'updateTime',
+                    title: '修改时间',
+                    formatter: function (value, row, index) {
+                        if (row.updateTime == null || row.updateTime == '') {
+                            return '无';
+                        } else {
+                            return row.updateTime;
+                        }
+                    }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+
+        getBaseCode("FIRST_COLUMN");
+        setValueTolist();
+        selectArticleSecColumn();
+    });
+
+    // 查询一级栏目
+    function getBaseCode(type) {
+        $.ajax({
+            type: "post",
+            url: prefix + "/queryBasicData",
+            data: {
+                "bType": type
+            },
+            async: false,
+            success: function (data) {
+                if (data.result) {// 跳转到列表页面
+                    var list = data.object.baseList;
+                    for (var i = 0; i < list.length; i++) {
+                        baseDataList.push(list[i]);
+                    }
+                } else {
+
+                }
+            }
+        });
+    }
+
+    function selectArticleSecColumn() {
+        $.ajax({
+            url: prefix + "/columnArry",
+            data: {
+                "codeType": "ARTICLE",
+                "pageSize": "1000",
+                "pageNum": "1"
+            },
+            dataType: "json",
+            async: false,
+            type: "post",
+            success: function (data) {
+                if (data.dataRows != null && data.dataRows.length > 0) {
+                    const dataRows = data.dataRows;
+                    articleSecList = dataRows;
+                    $("#selectSec").empty();
+
+                    $.each(dataRows, function (index, item) {
+                        $("#selectSec").append("<option value='" + item.codeCode + "'>" + item.codeCname + "</option>");
+                    });
+                }
+            }
+        });
+    }
+
+    // 给下拉列表赋值
+    function setValueTolist() {
+        // 给搜索的下拉列表赋值
+        $("#codeType option").remove();
+        var obj = baseDataList;
+        $("#codeType").append("<option value=''>请选择</option>");
+        for (var i = 0; i < obj.length; i++) {
+            $("#codeType").append(
+                "<option value='" + obj[i].codeCode + "'>" + obj[i].codeCname
+                + "</option>");
+        }
+    }
+
+    // 一栏目显示名称
+    function queryCnameByid(id) {
+        if (baseDataList == null) {
+            getBaseCode("FIRST_COLUMN");
+        }
+        if (queryCnameByid == null) {
+            selectArticleSecColumn();
+        }
+        const list = baseDataList.length;
+        for (var i = 0; i < list; i++) {
+            if (id == baseDataList[i].codeCode) {
+                return baseDataList[i].codeCname;
+            }
+        }
+        const articleList = articleSecList.length;
+        for (var i = 0; i < articleList; i++) {
+            if (id == articleSecList[i].codeCode) {
+                return "文库-" + articleSecList[i].codeCname;
+            }
+        }
+    }
+
+</script>
+</body>
+</html>
\ No newline at end of file

From db2df8c70f551aa726971b790e6a9f47283db998 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Fri, 26 Mar 2021 15:51:41 +0800
Subject: [PATCH 10/30] =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |   4 +-
 ruoyi-admin/src/main/resources/logback.xml    |   2 +-
 .../controller/BaseCodeController.java        |  13 +-
 .../content/service/BaseCodeService.java      |   2 +-
 .../service/impl/BaseCodeServiceImpl.java     |  18 +-
 .../mapper/content/BaseCodeExMapper.xml       |   2 +-
 .../templates/content/column/column.html      | 210 +++++++++++++++++-
 .../templates/content/gallery/list.html       |   6 +-
 8 files changed, 219 insertions(+), 38 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index d013a3f1e..5ecc028d4 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -9,7 +9,7 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: /Users/liushenlu/Desktop
   # 获取ip地址开关
   addressEnabled: false
 
@@ -96,7 +96,7 @@ shiro:
     # 首页地址
     indexUrl: /index
     # 验证码开关
-    captchaEnabled: true
+    captchaEnabled: false
     # 验证码类型 math 数组计算 char 字符
     captchaType: math
   cookie:
diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml
index d69a57207..0d98c4388 100644
--- a/ruoyi-admin/src/main/resources/logback.xml
+++ b/ruoyi-admin/src/main/resources/logback.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/ruoyi/logs" />
+	<property name="log.path" value="/Users/liushenlu/Desktop/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
index 47f075250..9092f916b 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.content.controller;
 
 import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.content.domain.BaseCode;
 import com.ruoyi.content.domain.BaseCodeTree;
@@ -187,25 +188,19 @@ public class BaseCodeController extends BaseController {
     /**
      * 删除栏目
      *
-     * @param request
-     * @param response
      * @return
      */
     @RequestMapping("/delColumn")
     @ResponseBody
-    public Message delColumn(HttpServletRequest request, HttpServletResponse response) {
+    public AjaxResult delColumn(String ids) {
         logger.info("进入删除栏目状态栏目控制层方法");
-        Message msg = new Message();
-        Thread.currentThread().setName(UUID.randomUUID().toString());
-        String ids = request.getParameter("ids");
         try {
-            msg = baseCodeService.delBaseCode(ids);
+            return toAjax(baseCodeService.delBaseCode(ids));
         } catch (Exception e) {
             logger.info("修改栏目失败【{}】", e.getMessage());
-            e.printStackTrace();
         }
         logger.info("跳出删除栏目控制层方法");
-        return msg;
+        return toAjax(0);
     }
 
     /**
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
index 2d3c55196..ab32fd6f2 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
@@ -78,7 +78,7 @@ public interface BaseCodeService {
      * @param ids
      * @return
      */
-    Message delBaseCode(String ids);
+    Integer delBaseCode(String ids);
 
     /**
      * 查询栏目树
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
index d398c2209..f8addd28b 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
@@ -311,14 +311,13 @@ public class BaseCodeServiceImpl implements BaseCodeService {
      * 删除栏目信息
      */
     @Override
-    public Message delBaseCode(String ids) {
+    public Integer delBaseCode(String ids) {
         String companyId = "1";
         logger.info("进入删除栏目信息的业务方法。");
         if (StringUtils.isBlank(ids)) {
             logger.info("删除栏目失败，参数不足 ids【{}】", ids);
             throw new ParameterException("栏目删除失败，参数不足！");
         }
-        Message msg = new Message();
         try {
             String[] arr = ids.split(",");
             for (String id : arr) {
@@ -350,32 +349,25 @@ public class BaseCodeServiceImpl implements BaseCodeService {
                             }
                             logger.info("删除的redis的key是：" + "baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
                             redisManager.delete("baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
-                            //redisManager.delete("baseCode_companyId"+companyId+"_branchId"+baseCode.getBranchId()+"_"+baseCode.getCodeType());
                         }
-                        msg.setInfo("成功删除栏目状态。");
-                        msg.setResult(true);
                         logger.info("成功删除栏目状态！");
                     } else {
-                        msg.setInfo("删除栏目状态失败。");
-                        msg.setResult(false);
                         logger.info("删除栏目状态失败！");
+                        return 0;
                     }
 
                 } else {
-                    msg.setInfo("删除栏目状态失败。");
-                    msg.setResult(false);
                     logger.info("删除栏目状态失败！");
+                    return 0;
                 }
             }
 
         } catch (Exception e) {
             logger.info("删除栏目状态异常【{}】", e.getMessage());
-            e.printStackTrace();
-            msg.setInfo("删除栏目状态失败！");
-            msg.setResult(false);
+            return 0;
         }
         logger.info("删除栏目状态的业务方法结束。");
-        return msg;
+        return 1;
     }
 
     /**
diff --git a/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
index f724839a6..d827fea22 100644
--- a/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
@@ -53,7 +53,7 @@
 		<if test="orderNo != null and orderNo!=''">
 			and ORDER_NO = #{orderNo,jdbcType=VARCHAR}
 		</if>
-		order by CODE_TYPE DESC,ORDER_NO*1 ASC, CREATE_TIME ASC, UPDATE_TIME ASC 
+		order by CODE_TYPE DESC,ORDER_NO*1 ASC, CREATE_TIME DESC, UPDATE_TIME DESC
 	</select>
 
     <resultMap id="BaseTreeResultMap" type="com.ruoyi.content.domain.BaseCodeTree">
diff --git a/ruoyi-content/src/main/resources/templates/content/column/column.html b/ruoyi-content/src/main/resources/templates/content/column/column.html
index ed2deae70..ae0efd30d 100644
--- a/ruoyi-content/src/main/resources/templates/content/column/column.html
+++ b/ruoyi-content/src/main/resources/templates/content/column/column.html
@@ -29,7 +29,8 @@
                                     class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
                                     class="fa fa-refresh"></i>&nbsp;重置</a>
-                            <a class="btn btn-success btn-rounded btn-sm" onclick="$.operate.add()">
+                            <a class="btn btn-success btn-rounded btn-sm" data-toggle="modal" data-target="#myModal2"
+                               onclick="">
                                 <i class="fa fa-plus"></i> 添加
                             </a>
                         </li>
@@ -42,21 +43,118 @@
         </div>
     </div>
 </div>
+<div class="modal inmodal" id="myModal2" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content animated flipInY">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5;">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left;">添加栏目</h5>
+            </div>
+            <div class="modal-body" style="background: #ffffff;">
+                <form class="form-horizontal m" id="form-picAdverts-add">
+                    <div class="col-md-12">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">选择栏目所在公司：</label>
+                            <div class="col-sm-8">
+                                <select class="form-control" id="branchId" name="branchId"></select>
+                            </div>
+                        </div>
+                        <div id="articleRadio">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label">栏目层级：</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control" name="sencondType" th:id="sencondType"
+                                            th:onchange="changeTab()">
+                                        <option value="sec">新建二级栏目</option>
+                                        <option value="thr">新建三级栏目</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="addSecColumn">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label is-required">一级栏目名称：</label>
+                                <div class="col-sm-8">
+                                    <select id="codeTypes" name="codeTypes" class="form-control"></select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label is-required">二级栏目名称：</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" id="codeCnames" name="codeCnames">
+                                </div>
+                            </div>
+                            <div class="form-group" style="display:none">
+                                <label class="col-sm-4 control-label">展示序号:</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" id="orderNos" name="orderNos" value="1"/>
+                                    <label class="red">序号越小，展示越靠前。</label>
+                                </div>
+                            </div>
+                        </div>
+                        <div id="addThirdColumn" style="display:none">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label is-required">一级栏目名称：</label>
+                                <div class="col-sm-8">
+                                    <select class="form-control">
+                                        <option>文库</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="form-group" id="articleSelect">
+                                <label class="col-sm-4 control-label is-required">选择二级栏目：</label>
+                                <div class="col-sm-8">
+                                    <select th:id="selectSec" class="form-control" name="selectSec"></select>
+                                </div>
+                            </div>
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label is-required">三级栏目名称：</label>
+                                <div class="col-sm-8">
+                                    <input type="text" class="form-control" id="thirdCodeCnames" name="thirdCodeCnames">
+                                </div>
+                                <br/><br/><br/>
+                                <div class="form-group" style="display:none">
+                                    <label class="col-sm-4 control-label">三级展示序号:</label>
+                                    <div class="col-sm-8">
+                                        <input type="text" class="form-control" id="thirdOrderNos" name="thirdOrderNos"
+                                               value="1" style="width:210px"/>
+                                        <label class="red">序号越小，展示越靠前。</label>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
+                <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary" th:onclick="addColumn()">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
     var prefix = ctx + 'column';
+    var prefix1 = ctx + 'ldcom/queryldcomList';
+    var prefix2 = ctx + 'column/addColumn';
 
     var baseDataList = [];
     var articleSecList = [];
+    var companyList = [];
+
+    var isClick = false;
 
     $(function () {
         var options = {
             url: prefix + "/columnArry",
             createUrl: prefix + "/add",
             updateUrl: prefix + "/edit/{id}",
-            removeUrl: prefix + "/remove",
+            removeUrl: prefix + "/delColumn",
             exportUrl: prefix + "/export",
-            modalName: "基础代码",
+            modalName: "栏目",
             columns: [{
                 checkbox: true
             },
@@ -171,8 +269,39 @@
         getBaseCode("FIRST_COLUMN");
         setValueTolist();
         selectArticleSecColumn();
+        queryCompany();
     });
 
+    function changeTab() {
+        var radioValue = $("#sencondType option:selected").val();
+        if (radioValue == "sec") {
+            $("#addSecColumn").show();
+            $("#addThirdColumn").hide();
+        } else {
+            $("#addSecColumn").hide();
+            $("#addThirdColumn").show();
+            selectArticleSecColumn();
+        }
+    }
+
+    function queryCompany() {
+        $.ajax({
+            type: "post",
+            url: prefix1,
+            data: {},
+            async: false,
+            success: function (data) {
+                companyList = data.object.ldcomList;
+                for (var i = 0; i < companyList.length; i++) {
+                    $("#branchId").append(
+                        "<option value='" + companyList[i].comcode + "'>"
+                        + companyList[i].shortname + "</option>")
+                }
+            }
+
+        })
+    }
+
     // 查询一级栏目
     function getBaseCode(type) {
         $.ajax({
@@ -207,14 +336,14 @@
             async: false,
             type: "post",
             success: function (data) {
-                if (data.dataRows != null && data.dataRows.length > 0) {
-                    const dataRows = data.dataRows;
+                if (data.rows != null && data.rows.length > 0) {
+                    const dataRows = data.rows;
                     articleSecList = dataRows;
                     $("#selectSec").empty();
 
-                    $.each(dataRows, function (index, item) {
-                        $("#selectSec").append("<option value='" + item.codeCode + "'>" + item.codeCname + "</option>");
-                    });
+                    for (var i = 0; i < dataRows.length; i++) {
+                        $("#selectSec").append("<option value='" + dataRows[i].codeCode + "'>" + dataRows[i].codeCname + "</option>");
+                    }
                 }
             }
         });
@@ -230,6 +359,9 @@
             $("#codeType").append(
                 "<option value='" + obj[i].codeCode + "'>" + obj[i].codeCname
                 + "</option>");
+            $("#codeTypes").append(
+                "<option value='" + obj[i].codeCode + "'>" + obj[i].codeCname
+                + "</option>");
         }
     }
 
@@ -255,6 +387,68 @@
         }
     }
 
+    function addColumn() {
+        var consoleDlg = $("#addColumn");
+        var branchId = $("#branchId").val();
+        var radioValue = $("#sencondType option:selected").val();
+        var codeType = $("#codeTypes").val();
+        var codeCname = $("#codeCnames").val();
+        var selectSec = $("#selectSec").val();
+        var thirdCodeCnames = $("#thirdCodeCnames").val();
+        if (isClick) {
+            return false;
+        }
+        if (radioValue == "sec") {
+            if (codeType == '' || codeType == null) {
+                $.modal.alertSuccess("请选择一级栏目！");
+                return false;
+            }
+            if (codeCname == '' || codeCname == null) {
+                $.modal.alertSuccess("请填写二级栏目名称！");
+                return false;
+            }
+        } else {
+            if (selectSec == '' || selectSec == null) {
+                $.modal.alertSuccess("请选择二级栏目！");
+                return false;
+            }
+            if (thirdCodeCnames == '' || thirdCodeCnames == null) {
+                $.modal.alertSuccess("请填写三级栏目！");
+                return false;
+            }
+        }
+        isClick = true;
+        $.ajax({
+            url: prefix2,
+            data: {
+                "branchId": branchId,
+                "radioValue": radioValue,
+                "codeType": codeType,
+                "codeCname": codeCname,
+                "selectSec": selectSec,
+                "thirdCodeCnames": thirdCodeCnames
+            },
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
+                isClick = false;
+                if (data.result) {
+                    const code = {
+                        'code': 0
+                    };
+                    $.operate.successCallback(code);
+                } else {
+                    $.modal.alertSuccess(data.info);
+                }
+            },
+            error: function (textStatus, e) {
+                isClick = false;
+                $.modal.alertSuccess('系统异常,请稍后重试!');
+            }
+        });
+    };
+
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/gallery/list.html b/ruoyi-content/src/main/resources/templates/content/gallery/list.html
index 8b71e5d72..f7c80edd8 100644
--- a/ruoyi-content/src/main/resources/templates/content/gallery/list.html
+++ b/ruoyi-content/src/main/resources/templates/content/gallery/list.html
@@ -51,14 +51,14 @@
 <div class="modal inmodal" id="myModal2" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content animated flipInY">
-            <div class="modal-header">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5;">
                 <input th:hidden="true" value="" th:id="pictureId"/>
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
                         class="sr-only">Close</span>
                 </button>
                 <h5 class="modal-title" style="text-align: left;">分配栏目</h5>
             </div>
-            <div class="modal-body">
+            <div class="modal-body" style="background: #ffffff;">
                 <div class="select-list">
                     <ul style="margin-top: -15px;">
                         <li>
@@ -72,7 +72,7 @@
                     </ul>
                 </div>
             </div>
-            <div class="modal-footer">
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
                 <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
                 <button type="button" class="btn btn-primary" th:onclick="saveData()">确定</button>
             </div>

From d5a62a090d2784c643518391ece7442f2a40ca24 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Fri, 26 Mar 2021 16:41:32 +0800
Subject: [PATCH 11/30] =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/content/column/column.html      | 179 +++++++++++++++++-
 1 file changed, 171 insertions(+), 8 deletions(-)

diff --git a/ruoyi-content/src/main/resources/templates/content/column/column.html b/ruoyi-content/src/main/resources/templates/content/column/column.html
index ae0efd30d..ed338d4ad 100644
--- a/ruoyi-content/src/main/resources/templates/content/column/column.html
+++ b/ruoyi-content/src/main/resources/templates/content/column/column.html
@@ -58,7 +58,7 @@
                         <div class="form-group">
                             <label class="col-sm-4 control-label">选择栏目所在公司：</label>
                             <div class="col-sm-8">
-                                <select class="form-control" id="branchId" name="branchId"></select>
+                                <select class="form-control" th:id="branchId" name="branchId"></select>
                             </div>
                         </div>
                         <div id="articleRadio">
@@ -77,19 +77,19 @@
                             <div class="form-group">
                                 <label class="col-sm-4 control-label is-required">一级栏目名称：</label>
                                 <div class="col-sm-8">
-                                    <select id="codeTypes" name="codeTypes" class="form-control"></select>
+                                    <select th:id="codeTypes" name="codeTypes" class="form-control"></select>
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label class="col-sm-4 control-label is-required">二级栏目名称：</label>
                                 <div class="col-sm-8">
-                                    <input type="text" class="form-control" id="codeCnames" name="codeCnames">
+                                    <input type="text" class="form-control" th:id="codeCnames" name="codeCnames">
                                 </div>
                             </div>
                             <div class="form-group" style="display:none">
                                 <label class="col-sm-4 control-label">展示序号:</label>
                                 <div class="col-sm-8">
-                                    <input type="text" class="form-control" id="orderNos" name="orderNos" value="1"/>
+                                    <input type="text" class="form-control" th:id="orderNos" name="orderNos" value="1"/>
                                     <label class="red">序号越小，展示越靠前。</label>
                                 </div>
                             </div>
@@ -112,13 +112,13 @@
                             <div class="form-group">
                                 <label class="col-sm-4 control-label is-required">三级栏目名称：</label>
                                 <div class="col-sm-8">
-                                    <input type="text" class="form-control" id="thirdCodeCnames" name="thirdCodeCnames">
+                                    <input type="text" class="form-control" th:id="thirdCodeCnames" name="thirdCodeCnames">
                                 </div>
                                 <br/><br/><br/>
                                 <div class="form-group" style="display:none">
                                     <label class="col-sm-4 control-label">三级展示序号:</label>
                                     <div class="col-sm-8">
-                                        <input type="text" class="form-control" id="thirdOrderNos" name="thirdOrderNos"
+                                        <input type="text" class="form-control" th:id="thirdOrderNos" name="thirdOrderNos"
                                                value="1" style="width:210px"/>
                                         <label class="red">序号越小，展示越靠前。</label>
                                     </div>
@@ -135,6 +135,55 @@
         </div>
     </div>
 </div>
+<div class="modal inmodal" id="myModal3" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content animated flipInY">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5;">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left;">修改栏目</h5>
+            </div>
+            <div class="modal-body" style="background: #ffffff;">
+                <form class="form-horizontal m" id="form-picAdverts-edit">
+                    <input th:hidden="true" name="asdid" th:id="asdid">
+                    <div class="col-md-12">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">栏目所在公司：</label>
+                            <div class="col-sm-6">
+                                <select class="form-control" th:id="branchIdEdit" name="branchIdEdit"></select>
+                            </div>
+                        </div>
+                        <div class="form-group" style="display:none" id="secSelect">
+                            <label class="col-sm-4 control-label">所属栏目:</label>
+                            <div class="col-sm-6">
+                                <select class="selectpicker form-control" th:id="cType" name="cType"></select>
+                            </div>
+                        </div>
+
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">栏目名称:</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control" th:id="cName" name="cName"/>
+                            </div>
+                        </div>
+                        <div class="form-group" style="display:none">
+                            <label class="col-sm-4 control-label">展示序号:</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control" th:id="cOrderNo" name="cOrderNo"/>
+                                <label class="red">序号越小，展示越靠前。</label>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
+                <button type="button" class="btn btn-white" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary" th:onclick="editColum()">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
     var prefix = ctx + 'column';
@@ -154,6 +203,7 @@
             updateUrl: prefix + "/edit/{id}",
             removeUrl: prefix + "/delColumn",
             exportUrl: prefix + "/export",
+            uniqueId: "id",
             modalName: "栏目",
             columns: [{
                 checkbox: true
@@ -258,7 +308,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-success btn-xs" data-toggle="modal" data-target="#myModal3" onclick="updateColumn(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
@@ -388,7 +438,6 @@
     }
 
     function addColumn() {
-        var consoleDlg = $("#addColumn");
         var branchId = $("#branchId").val();
         var radioValue = $("#sencondType option:selected").val();
         var codeType = $("#codeTypes").val();
@@ -449,6 +498,120 @@
         });
     };
 
+    function updateColumn(id) {
+        $('#asdid').val(id);
+        var rowData = $("#" + table.options.id).bootstrapTable('getRowByUniqueId', id);
+        $("#cName").val(rowData.codeCname);
+        $("#cOrderNo").val(rowData.orderNo);
+        // 处理公司下拉框
+        $("#branchIdEdit option").remove();
+        $.ajax({
+            type: "post",
+            url: prefix1,
+            data: {},
+            async: false,
+            success: function (data) {
+                var obj = data.object.ldcomList;
+
+                for (var i = 0; i < obj.length; i++) {
+                    if (obj[i].comcode == rowData.branchId) {
+                        $("#branchIdEdit").append(
+                            "<option selected=\"true\" value='"
+                            + obj[i].comcode + "'>" + obj[i].shortname
+                            + "</option>");
+                    } else {
+                        $("#branchIdEdit").append(
+                            "<option value='" + obj[i].comcode + "'>"
+                            + obj[i].shortname + "</option>")
+                    }
+                }
+            }
+
+        })
+
+        // 处理一级栏目下拉
+        $("#cType option").remove();
+        var objc = [];
+        if (rowData.codeType.indexOf("文库-") == -1) {
+            $("#secSelect").hide();
+            objc = baseDataList;
+            for (var i = 0; i < objc.length; i++) {
+                var codeType = rowData.codeType;
+                if (objc[i].codeCname == codeType) {
+                    $("#cType").append(
+                        "<option selected=\"true\" value='" + objc[i].codeCode
+                        + "'>" + objc[i].codeCname + "</option>");
+                } else {
+                    $("#cType").append(
+                        "<option value='" + objc[i].codeCode + "'>"
+                        + objc[i].codeCname + "</option>");
+                }
+            }
+        } else {
+            objc = articleSecList;
+            $("#secSelect").show();
+            for (var i = 0; i < objc.length; i++) {
+                var codeType = rowData.codeType.split("-")[1];
+                if (objc[i].codeCname == codeType) {
+                    $("#cType").append(
+                        "<option selected=\"true\" value='" + objc[i].codeCode
+                        + "'>" + objc[i].codeCname + "</option>");
+                } else {
+                    $("#cType").append(
+                        "<option value='" + objc[i].codeCode + "'>"
+                        + objc[i].codeCname + "</option>");
+                }
+            }
+        }
+    };
+
+    // 编辑后保存操作
+    function editColum() {
+        debugger
+        let id = $('#asdid').val();
+        let rowData = $("#" + table.options.id).bootstrapTable('getRowByUniqueId', id);
+        let cName = $("#cName").val();
+        let cType = $("#cType").val();
+        let branchIdEdit = $("#branchIdEdit").val();
+        if (cName == null || cName == '') {
+            $.modal.alertSuccess("请输入二级栏目名称");
+            return;
+        }
+
+        $.ajax({
+            url: prefix + "/updateColumn",
+            data: {
+                "id": rowData.id,
+                "codeType": cType,
+                "branchId": branchIdEdit,
+                "codeCname": cName,
+                "codeCode": rowData.codeCode,
+                "codeEname": rowData.codeEname,
+                "codeTname": rowData.codeTname,
+                "createTime": rowData.createTime,
+                "createUser": rowData.createUser,
+                "companyId": rowData.companyId,
+                "state": rowData.state
+            },
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
+                if (data.result) {
+                    const code = {
+                        'code': 0
+                    };
+                    $.operate.successCallback(code);
+                } else {
+                    $.modal.alertSuccess(data.info);
+                }
+            },
+            error: function (textStatus, e) {
+                $.modal.alertSuccess('系统异常,请稍后重试!');
+            }
+        });
+    }
+
 </script>
 </body>
 </html>
\ No newline at end of file

From 631870cbe8459b4d33de7466d0dec1bacc5e09b0 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Sat, 27 Mar 2021 10:51:14 +0800
Subject: [PATCH 12/30] =?UTF-8?q?=E6=A0=8F=E7=9B=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseCodeController.java        | 135 ++++++++++++-
 .../content/mapper/BaseCodeExMapper.java      |   2 +
 .../content/service/BaseCodeService.java      |   3 +-
 .../service/impl/BaseCodeServiceImpl.java     |  26 ++-
 .../mapper/content/BaseCodeExMapper.xml       |   9 +-
 .../templates/content/column/column.html      | 184 +++++++++++++-----
 6 files changed, 297 insertions(+), 62 deletions(-)

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
index 9092f916b..0941d928e 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.Serializable;
 import java.util.*;
 
 /**
@@ -261,18 +262,138 @@ public class BaseCodeController extends BaseController {
      */
     @RequestMapping(value = "/columnTree")
     @ResponseBody
-    public Message columnTree(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    public List<Ztree> columnTree(HttpServletRequest request, HttpServletResponse response) throws Exception {
         response.setHeader("Access-Control-Allow-Origin", "*");
         Message msg = new Message();
         Map<String, Object> policyMap = new HashMap<String, Object>();
         String codeCode = request.getParameter("codeCode");
+        String codeType = request.getParameter("codeType");
         // 查询栏目树
-        List<BaseCodeTree> columnList = baseCodeService.columnTree(codeCode);
-        policyMap.put("columnList", columnList);
-        msg.setInfo("成功");
-        msg.setObject(policyMap);
-        msg.setResult(true);
-        return msg;
+        List<BaseCodeTree> columnList = baseCodeService.columnTree(codeCode, codeType);
+//        policyMap.put("columnList", columnList);
+//        msg.setInfo("成功");
+//        msg.setObject(policyMap);
+//        msg.setResult(true);
+
+        return initZtree(columnList);
+    }
+
+    public List<Ztree> initZtree(List<BaseCodeTree> deptList) {
+
+        List<Ztree> ztreeList = new ArrayList<>();
+        if (deptList != null && deptList.size() > 0) {
+            Ztree z = new Ztree();
+            z.setId("FIRST_COLUMN");
+            z.setpId("");
+            z.setName("栏目");
+            z.setTitle("栏目");
+            ztreeList.add(z);
+            for (BaseCodeTree dept : deptList) {
+                Ztree ztree = new Ztree();
+                ztree.setId(dept.getCodeCode());
+                ztree.setpId(dept.getCodeType());
+                ztree.setName(dept.getCodeCname());
+                ztree.setTitle(dept.getCodeCname());
+                ztreeList.add(ztree);
+            }
+        }
+        return ztreeList;
+    }
+
+    static class Ztree implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 节点ID
+         */
+        private String id;
+
+        /**
+         * 节点父ID
+         */
+        private String pId;
+
+        /**
+         * 节点名称
+         */
+        private String name;
+
+        /**
+         * 节点标题
+         */
+        private String title;
+
+        /**
+         * 是否勾选
+         */
+        private boolean checked = false;
+
+        /**
+         * 是否展开
+         */
+        private boolean open = false;
+
+        /**
+         * 是否能勾选
+         */
+        private boolean nocheck = false;
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getpId() {
+            return pId;
+        }
+
+        public void setpId(String pId) {
+            this.pId = pId;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public boolean isChecked() {
+            return checked;
+        }
+
+        public void setChecked(boolean checked) {
+            this.checked = checked;
+        }
+
+        public boolean isOpen() {
+            return open;
+        }
+
+        public void setOpen(boolean open) {
+            this.open = open;
+        }
+
+        public boolean isNocheck() {
+            return nocheck;
+        }
+
+        public void setNocheck(boolean nocheck) {
+            this.nocheck = nocheck;
+        }
     }
 
     /**
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
index 756ed4684..a5afb23b1 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
@@ -21,4 +21,6 @@ public interface BaseCodeExMapper {
      */
     public List<BaseCodeTree> columnTree(HashMap<String, String> parMap);
 
+    public List<BaseCodeTree> getNextNodeTree(HashMap<String, String> parMap);
+
 }
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
index ab32fd6f2..f3a22f26f 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
@@ -84,9 +84,10 @@ public interface BaseCodeService {
      * 查询栏目树
      *
      * @param codeCode
+     * @param codeType
      * @return
      */
-    public List<BaseCodeTree> columnTree(String codeCode);
+    public List<BaseCodeTree> columnTree(String codeCode, String codeType);
 
     /**
      * 操作栏目排序
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
index f8addd28b..a5bdcd276 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
@@ -454,9 +454,9 @@ public class BaseCodeServiceImpl implements BaseCodeService {
     }
 
     @Override
-    public List<BaseCodeTree> columnTree(String codeCode) {
+    public List<BaseCodeTree> columnTree(String codeCode, String codeType) {
         logger.info("进入查询栏目树的方法");
-        if (StringUtils.isBlank(codeCode)) {
+        if (StringUtils.isAllBlank(codeCode, codeType)) {
             logger.info("查询栏目树请求参数不正确codeCode【{}】", codeCode);
             throw new ParameterException("创建失败，参数不足！");
         }
@@ -468,13 +468,33 @@ public class BaseCodeServiceImpl implements BaseCodeService {
         parMap.put("codeCode", codeCode);
         parMap.put("companyId", companyId);
         parMap.put("state", state);
+        parMap.put("codeType", codeType);
         if (!"86".equals(branchId)) {
             parMap.put("branchId", branchId);
         }
         list = baseCodeExMapper.columnTree(parMap);
+        List<BaseCodeTree> baseCodeList = new ArrayList<>();
+        if (list != null && list.size() > 0) {
+            recursion(list, baseCodeList);
+        }
         logger.info("查询栏目树结束，查询到的结果为【{}】" + JsonUtil.objectToJackson(list));
         logger.info("查询栏目信息的方法结束！");
-        return list;
+        return baseCodeList;
+    }
+
+    private void recursion(List<BaseCodeTree> baseCodeList, List<BaseCodeTree> list1) {
+        for (BaseCodeTree baseCode : baseCodeList) {
+            HashMap map = new HashMap();
+            map.put("CODE_CODE", baseCode.getCodeCode());
+            map.put("parentCompanyId", baseCode.getCompanyId());
+            map.put("parentState", baseCode.getState());
+            map.put("parentBranchId", baseCode.getBranchId());
+            List<BaseCodeTree> list = baseCodeExMapper.getNextNodeTree(map);
+            list1.add(baseCode);
+            if (list != null && list.size() > 0) {
+                recursion(list, list1);
+            }
+        }
     }
 
     @Override
diff --git a/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
index d827fea22..873e61a1d 100644
--- a/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
@@ -35,7 +35,7 @@
 		UPDATE_REMARK, BUSINESS_AREA,COMPANY_ID,BRANCH_ID from
 		base_code
 		where
-		STATE in (0,1)
+		STATE = '0'
 		<if test="companyId != null and companyId !=''"> 
 			and COMPANY_ID = #{companyId,jdbcType=VARCHAR} 
 		</if> 
@@ -73,8 +73,8 @@
 	    <result column="BUSINESS_AREA" property="businessArea" jdbcType="VARCHAR" />
 	    <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
 		<result column="BRANCH_ID" property="branchId" jdbcType="VARCHAR" />
-      	<collection column="CODE_CODE=CODE_CODE,parentCompanyId=parentCompanyId,parentState=parentState,parentBranchId=parentBranchId" property="child" javaType="java.util.ArrayList"
-                   ofType="com.ruoyi.content.domain.BaseCodeTree" select="getNextNodeTree"/>
+<!--      	<collection column="CODE_CODE=CODE_CODE,parentCompanyId=parentCompanyId,parentState=parentState,parentBranchId=parentBranchId" property="child" javaType="java.util.ArrayList"-->
+<!--                   ofType="com.ruoyi.content.domain.BaseCodeTree" select="getNextNodeTree"/>-->
    	</resultMap>
  
     <select id="getNextNodeTree" resultMap="BaseTreeResultMap">
@@ -106,6 +106,9 @@
         <if test="codeCode != null and codeCode !=''">
 			and CODE_CODE = #{codeCode,jdbcType=VARCHAR}
 		</if>
+		<if test="codeType != null and codeType !=''">
+			and CODE_TYPE = #{codeType,jdbcType=VARCHAR}
+		</if>
 		<if test="companyId != null and companyId !=''">
 			and COMPANY_ID = #{companyId,jdbcType=VARCHAR}
 		</if>
diff --git a/ruoyi-content/src/main/resources/templates/content/column/column.html b/ruoyi-content/src/main/resources/templates/content/column/column.html
index ed338d4ad..73d0ef5ce 100644
--- a/ruoyi-content/src/main/resources/templates/content/column/column.html
+++ b/ruoyi-content/src/main/resources/templates/content/column/column.html
@@ -2,44 +2,73 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
     <th:block th:include="include :: header('栏目列表')"/>
+    <th:block th:include="include :: layout-latest-css"/>
+    <th:block th:include="include :: ztree-css"/>
 </head>
 <body class="gray-bg">
-<div class="container-div">
-    <div class="row">
-        <div class="col-sm-12 search-collapse">
-            <form id="formId">
-                <div class="select-list">
-                    <ul>
-                        <li>
-                            <label style="width: 95px;">一级栏目名称：</label>
-                            <select name="codeType" th:id="codeType">
-
-                            </select>
-                        </li>
-                        <li>
-                            <label style="width: 95px;">二级栏目名称：</label>
-                            <input type="text" name="codeCname"/>
-                        </li>
-                        <li>
-                            <label>展示序号：</label>
-                            <input type="text" name="orderNo"/>
-                        </li>
-                        <li>
-                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
-                                    class="fa fa-search"></i>&nbsp;搜索</a>
-                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
-                                    class="fa fa-refresh"></i>&nbsp;重置</a>
-                            <a class="btn btn-success btn-rounded btn-sm" data-toggle="modal" data-target="#myModal2"
-                               onclick="">
-                                <i class="fa fa-plus"></i> 添加
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-            </form>
+<div class="ui-layout-west">
+    <div class="box box-main">
+        <div class="box-header">
+            <div class="box-title">
+                <i class="fa icon-grid"></i> 栏目管理
+            </div>
+            <div class="box-tools pull-right">
+                <a type="button" class="btn btn-box-tool" href="#" onclick="" title="管理部门" style="display:none;"><i
+                        class="fa fa-edit"></i></a>
+                <button type="button" class="btn btn-box-tool" id="btnExpand" title="展开" style="display:none;"><i
+                        class="fa fa-chevron-up"></i></button>
+                <button type="button" class="btn btn-box-tool" id="btnCollapse" title="折叠"><i
+                        class="fa fa-chevron-down"></i></button>
+                <button type="button" class="btn btn-box-tool" id="btnRefresh" title="刷新部门"><i
+                        class="fa fa-refresh"></i></button>
+            </div>
         </div>
-        <div class="col-sm-12 select-table table-striped">
-            <table id="bootstrap-table"></table>
+        <div class="ui-layout-content">
+            <div id="tree" class="ztree"></div>
+        </div>
+    </div>
+</div>
+
+<div class="ui-layout-center">
+    <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li style="display: none;">
+                                <!--                                <label style="width: 95px;">一级栏目名称：</label>-->
+                                <!--                                <select name="codeType" th:id="codeType">-->
+
+                                <!--                                </select>-->
+                                <input type="text" name="codeType" th:id="codeType"/>
+                            </li>
+                            <li>
+                                <label style="width: 95px;">栏目名称：</label>
+                                <input type="text" name="codeCname"/>
+                            </li>
+                            <li>
+                                <label>展示序号：</label>
+                                <input type="text" name="orderNo"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                        class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                        class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-rounded btn-sm" data-toggle="modal"
+                                   data-target="#myModal2"
+                                   onclick="">
+                                    <i class="fa fa-plus"></i> 添加
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
         </div>
     </div>
 </div>
@@ -112,13 +141,15 @@
                             <div class="form-group">
                                 <label class="col-sm-4 control-label is-required">三级栏目名称：</label>
                                 <div class="col-sm-8">
-                                    <input type="text" class="form-control" th:id="thirdCodeCnames" name="thirdCodeCnames">
+                                    <input type="text" class="form-control" th:id="thirdCodeCnames"
+                                           name="thirdCodeCnames">
                                 </div>
                                 <br/><br/><br/>
                                 <div class="form-group" style="display:none">
                                     <label class="col-sm-4 control-label">三级展示序号:</label>
                                     <div class="col-sm-8">
-                                        <input type="text" class="form-control" th:id="thirdOrderNos" name="thirdOrderNos"
+                                        <input type="text" class="form-control" th:id="thirdOrderNos"
+                                               name="thirdOrderNos"
                                                value="1" style="width:210px"/>
                                         <label class="red">序号越小，展示越靠前。</label>
                                     </div>
@@ -185,6 +216,8 @@
     </div>
 </div>
 <th:block th:include="include :: footer"/>
+<th:block th:include="include :: layout-latest-js"/>
+<th:block th:include="include :: ztree-js"/>
 <script th:inline="javascript">
     var prefix = ctx + 'column';
     var prefix1 = ctx + 'ldcom/queryldcomList';
@@ -197,6 +230,66 @@
     var isClick = false;
 
     $(function () {
+        var panehHidden = false;
+        if ($(this).width() < 769) {
+            panehHidden = true;
+        }
+        $('body').layout({initClosed: panehHidden, west__size: 185});
+        // 回到顶部绑定
+        if ($.fn.toTop !== undefined) {
+            var opt = {
+                win: $('.ui-layout-center'),
+                doc: $('.ui-layout-center')
+            };
+            $('#scroll-up').toTop(opt);
+        }
+
+        queryTableList();
+
+        queryColumnTree();
+
+        getBaseCode("FIRST_COLUMN");
+        setValueTolist();
+        selectArticleSecColumn();
+        queryCompany();
+
+        $('#btnRefresh').click(function () {
+            queryColumnTree();
+        });
+
+        $('#btnCollapse').click(function () {
+            $._tree.expandAll(false);
+            $(this).hide();
+            $('#btnExpand').show();
+        });
+
+        $('#btnExpand').click(function () {
+            $._tree.expandAll(true);
+            $(this).hide();
+            $('#btnCollapse').show();
+        });
+    });
+
+    function queryColumnTree() {
+        var url = ctx + "column/columnTree?codeType=FIRST_COLUMN";
+        var options = {
+            url: url,
+            expandLevel: 1,
+            onClick: zOnClick
+        };
+        $.tree.init(options);
+
+        function zOnClick(event, treeId, treeNode) {
+            if (treeNode.id != "FIRST_COLUMN") {
+                $("#codeType").val(treeNode.id);
+            } else {
+                $("#codeType").val("");
+            }
+            $.table.search();
+        }
+    }
+
+    function queryTableList() {
         var options = {
             url: prefix + "/columnArry",
             createUrl: prefix + "/add",
@@ -315,12 +408,7 @@
                 }]
         };
         $.table.init(options);
-
-        getBaseCode("FIRST_COLUMN");
-        setValueTolist();
-        selectArticleSecColumn();
-        queryCompany();
-    });
+    }
 
     function changeTab() {
         var radioValue = $("#sencondType option:selected").val();
@@ -402,13 +490,13 @@
     // 给下拉列表赋值
     function setValueTolist() {
         // 给搜索的下拉列表赋值
-        $("#codeType option").remove();
+        // $("#codeType option").remove();
         var obj = baseDataList;
-        $("#codeType").append("<option value=''>请选择</option>");
+        // $("#codeType").append("<option value=''>请选择</option>");
         for (var i = 0; i < obj.length; i++) {
-            $("#codeType").append(
-                "<option value='" + obj[i].codeCode + "'>" + obj[i].codeCname
-                + "</option>");
+            // $("#codeType").append(
+            //     "<option value='" + obj[i].codeCode + "'>" + obj[i].codeCname
+            //     + "</option>");
             $("#codeTypes").append(
                 "<option value='" + obj[i].codeCode + "'>" + obj[i].codeCname
                 + "</option>");

From 1c6f652642957db3d338e009d4c80b99c2aa7718 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Mon, 29 Mar 2021 09:50:24 +0800
Subject: [PATCH 13/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ArticleManageController.java   |  52 +-
 .../StaffArticleManageController.java         |  86 ++-
 .../content/mapper/ArticleQueryMapper.java    |   3 +-
 .../ruoyi/content/service/ArticleService.java |   2 +-
 .../service/StaffArticleManageService.java    |   5 +-
 .../service/impl/ArticleServiceImpl.java      |  14 +-
 .../impl/StaffArticleManageServiceimpl.java   |  27 +-
 .../mapper/content/ArticleQueryMapper.xml     | 592 +++++++++---------
 .../src/main/resources/static/img/admin.png   | Bin 0 -> 3772 bytes
 .../content/article/articleList.html          | 571 +++++++++++++++++
 .../templates/content/column/column.html      |   5 +-
 .../templates/content/gallery/list.html       |   2 +-
 12 files changed, 967 insertions(+), 392 deletions(-)
 create mode 100644 ruoyi-content/src/main/resources/static/img/admin.png
 create mode 100644 ruoyi-content/src/main/resources/templates/content/article/articleList.html

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
index a38227c81..c489332e2 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
@@ -1,5 +1,7 @@
 package com.ruoyi.content.controller;
 
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.content.domain.ArticleInfo;
 import com.ruoyi.content.domain.PageDTO;
@@ -12,6 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
@@ -30,50 +33,39 @@ import java.util.UUID;
  */
 @Controller
 @RequestMapping("/article")
-public class ArticleManageController {
+public class ArticleManageController extends BaseController {
+
     private final static Logger logger = LoggerFactory.getLogger(ArticleManageController.class);
+    private String prefix = "content/article";
+
     @Autowired
     private ArticleService articleService;
 
+    @GetMapping("list")
+    public String articleList() {
+        return prefix + "/articleList";
+    }
+
     /**
      * 查询所有公司发布的文章信息
      *
      * @param request
-     * @param response
      * @return
      */
     @RequestMapping("/articleArry")
     @ResponseBody
-    public PageDTO articleArry(HttpServletRequest request, HttpServletResponse response) {
+    public TableDataInfo articleArry(HttpServletRequest request) throws Exception {
         logger.info("查询文章列表的控制层方法开始！");
-        Thread.currentThread().setName(UUID.randomUUID().toString());
-        PageDTO pageDTO = new PageDTO();
-        try {
-            String rowsVal = request.getParameter("rows");
-            String page = request.getParameter("page");
-            String articelName = request.getParameter("articelName");
-            String articelAuthor = request.getParameter("articelAuthor");
-            String channelId = request.getParameter("channelId");
-            String special = request.getParameter("special");
-            String articleState = request.getParameter("articleState");
-            int rows = Integer.parseInt(rowsVal);
-            int startRow = rows * (Integer.parseInt(page) - 1);
-            List<PublishedArticleInfo> list = articleService.queryArticle(startRow, rows, articelName, articelAuthor,
-                    special, channelId, articleState);
-            pageDTO.setPage(Integer.parseInt(page));
-            pageDTO.setStartRow(startRow);
-            pageDTO.setDataRows(list);
-            int count = articleService.countArticleInfoByState(articelName, articelAuthor, special, channelId,
-                    articleState);
-            pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
-            pageDTO.setRecords(count);
-            pageDTO.setPage(Integer.parseInt(page));
-        } catch (Exception e) {
-            logger.info("查询当前用户发布的文章失败【{}】", e.getMessage());
-            e.printStackTrace();
-        }
+        String articelName = request.getParameter("articleName");
+        String articelAuthor = request.getParameter("articelAuthor");
+        String channelId = request.getParameter("channelId");
+        String special = request.getParameter("special");
+        String articleState = request.getParameter("articleState");
+        startPage();
+        List<PublishedArticleInfo> list = articleService.queryArticle(articelName, articelAuthor,
+                special, channelId, articleState);
         logger.info("查询文章列表的控制层方法结束！");
-        return pageDTO;
+        return getDataTable(list);
     }
 
     /**
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java
index dec476aa6..912100bbd 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java
@@ -1,5 +1,8 @@
 package com.ruoyi.content.controller;
 
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.content.domain.ClickTrackInfo;
 import com.ruoyi.content.domain.ClickUserInfo;
 import com.ruoyi.content.domain.PageDTO;
@@ -42,24 +45,27 @@ public class StaffArticleManageController {
      */
     @RequestMapping("/articleSharingTrackList")
     @ResponseBody
-    public PageDTO articleSharingTrack(HttpServletRequest request) {
+    public TableDataInfo articleSharingTrack(HttpServletRequest request) {
 
         logger.info("查询文章分享阅读轨迹的控制层方法开始！");
         Thread.currentThread().setName(UUID.randomUUID().toString());
-        PageDTO pageDTO = new PageDTO();
+        TableDataInfo pageDTO = new TableDataInfo();
         try {
-            String rowsVal = request.getParameter("rows");
-            String page = request.getParameter("page");
-            int rows = Integer.parseInt(rowsVal);
-            int startRow = rows * (Integer.parseInt(page) - 1);
+            PageDomain pageDomain = TableSupport.buildPageRequest();
+            Integer pageNum = pageDomain.getPageNum() - 1;
+            Integer pageSize = pageDomain.getPageSize();
             String articleId = request.getParameter("articleId");
+            if (StringUtils.isBlank(articleId)) {
+                return pageDTO;
+            }
             // 1.根据文章id去查publish表，找出该文章对应所有业务员
-            pageDTO = staffArticleManageService.querySalesmanByArticleId(articleId, startRow, rows);
-            pageDTO.setPage(Integer.parseInt(page));
-
+            pageDTO = staffArticleManageService.querySalesmanByArticleId(articleId, pageNum, pageSize);
             return pageDTO;
         } catch (Exception e) {
             logger.info("系统异常！", e);
+            pageDTO.setCode(0);
+            pageDTO.setRows(new ArrayList<>());
+            pageDTO.setTotal(0);
             return pageDTO;
         }
 
@@ -73,29 +79,31 @@ public class StaffArticleManageController {
      */
     @RequestMapping("/publishInfoList")
     @ResponseBody
-    public PageDTO publishInfoList(HttpServletRequest request) {
-
-
+    public TableDataInfo publishInfoList(HttpServletRequest request) {
         Thread.currentThread().setName(UUID.randomUUID().toString());
-        PageDTO pageDTO = new PageDTO();
+        TableDataInfo pageDTO = new TableDataInfo();
         try {
-            String rowsVal = request.getParameter("rows");
-            String page = request.getParameter("page");
-            int rows = Integer.parseInt(rowsVal);
-            int startRow = rows * (Integer.parseInt(page) - 1);
+            PageDomain pageDomain = TableSupport.buildPageRequest();
+            Integer pageNum = pageDomain.getPageNum() - 1;
+            Integer pageSize = pageDomain.getPageSize();
             String userId = request.getParameter("userId");
             String articleId = request.getParameter("articleId");
 
+            if (StringUtils.isAnyBlank(articleId, userId)) {
+                return pageDTO;
+            }
+
             logger.info("查询该业务员userId[{}]的文章articleId[{}]发布情况开始！", userId, articleId);
 
-
             // 1.根据文章id去查publish表，找出该文章对应所有业务员
-            pageDTO = staffArticleManageService.queryClickInfoByUserId(userId, articleId, startRow, rows);
-            pageDTO.setPage(Integer.parseInt(page));
+            pageDTO = staffArticleManageService.queryClickInfoByUserId(userId, articleId, pageNum, pageSize);
 
             return pageDTO;
         } catch (Exception e) {
             logger.info("系统异常！", e);
+            pageDTO.setCode(0);
+            pageDTO.setRows(new ArrayList<>());
+            pageDTO.setTotal(0);
             return pageDTO;
         }
 
@@ -109,16 +117,18 @@ public class StaffArticleManageController {
      */
     @RequestMapping("/articleSharingTrackInfo")
     @ResponseBody
-    public Message articleSharingTrackInfo(HttpServletRequest request) {
+    public TableDataInfo articleSharingTrackInfo(HttpServletRequest request) {
         Thread.currentThread().setName(UUID.randomUUID().toString());
         Message msg = new Message();
-        Map<String, Object> returnMap = new HashMap<String, Object>();
         List<ClickUserInfo> clickUserInfos = new ArrayList<ClickUserInfo>();
         ClickTrackInfo clickTrackInfo = new ClickTrackInfo();
         logger.info("查询用户查看分享文章轨迹信息的控制层方法开始！");
         String clickId = request.getParameter("clickId");
+        TableDataInfo pageDTO = new TableDataInfo();
         if (StringUtils.isBlank(clickId)) {
-            returnMap.put("ClickTrackInfo", clickTrackInfo);
+            pageDTO.setCode(0);
+            pageDTO.setRows(new ArrayList<>());
+            pageDTO.setTotal(0);
         } else {
             clickTrackInfo = staffArticleManageService.articleSharingTrackInfo(clickId);
             //发布人id
@@ -135,41 +145,51 @@ public class StaffArticleManageController {
                 logger.info("转换后的用户昵称为:" + userInfo.getNickName());
             } else {
                 userInfo.setNickName("后台管理员");
-                userInfo.setHeadImgUrl("/static/common/image/logo.png");
+                userInfo.setHeadImgUrl("/img/admin.png");
                 userInfo.setOpenid("");
             }
-            returnMap.put("userInfo", userInfo);
+            ClickUserInfo clickUserInfo1 = new ClickUserInfo();
+            clickUserInfo1.setNickName(userInfo.getNickName());
+            clickUserInfo1.setHeadImgUrl(userInfo.getHeadImgUrl());
+            clickUserInfo1.setOpenId(userInfo.getOpenid());
+            clickUserInfos.add(clickUserInfo1);
             String clickUserInfo = clickTrackInfo.getClickUserInfo();
+            List<ClickUserInfo> c = new ArrayList<ClickUserInfo>();
             if (StringUtils.isNotBlank(clickUserInfo)) {
-                clickUserInfos = JsonUtil.JsonToCollectionType(clickUserInfo, List.class, ClickUserInfo.class);
+                c = JsonUtil.JsonToCollectionType(clickUserInfo, List.class, ClickUserInfo.class);
 
-                for (ClickUserInfo clickUserInfo2 : clickUserInfos) {
+                for (ClickUserInfo clickUserInfo2 : c) {
                     try {
                         clickUserInfo2.setNickName(
                                 new String(Base64.getDecoder().decode(clickUserInfo2.getNickName()), "UTF-8"));
+                        clickUserInfos.add(clickUserInfo2);
                     } catch (UnsupportedEncodingException e) {
                         throw new BusinessException("用户昵称解码异常[{" + e.getMessage() + "}]");
                     }
                 }
             }
-            returnMap.put("ClickUserInfoList", clickUserInfos);
 
             String clickUserNickname = clickTrackInfo.getClickUserNickname();
             if (StringUtils.isNotBlank(clickUserNickname)) {
                 try {
                     clickTrackInfo.setClickUserNickname(
                             new String(Base64.getDecoder().decode(clickUserNickname), "UTF-8"));
+                    ClickUserInfo clickUserInfo4 = new ClickUserInfo();
+                    clickUserInfo4.setNickName(clickTrackInfo.getClickUserNickname());
+                    clickUserInfo4.setHeadImgUrl(clickTrackInfo.getClickUserHeadimgurl());
+                    clickUserInfo4.setOpenId(clickTrackInfo.getClickOpenId());
+                    clickUserInfo4.setToShareState(clickTrackInfo.getFromShareState());
+                    clickUserInfos.add(clickUserInfo4);
                 } catch (UnsupportedEncodingException e) {
                     throw new BusinessException("用户昵称解码异常[{" + e.getMessage() + "}]");
                 }
             }
-            returnMap.put("ClickTrackInfo", clickTrackInfo);
-            msg.setInfo("获取浏览详情查询成功");
-            msg.setResult(true);
-            msg.setObject(returnMap);
+            pageDTO.setCode(0);
+            pageDTO.setRows(clickUserInfos);
+            pageDTO.setTotal(clickUserInfos.size());
         }
         logger.info("查询用户查看分享文章轨迹信息的控制层方法结束！");
-        return msg;
+        return pageDTO;
     }
 
 //    // 复制链路
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java
index 2df1fce5e..813dc0721 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleQueryMapper.java
@@ -23,8 +23,7 @@ public interface ArticleQueryMapper {
     int updatePublishedArticle(Map<String, String> articleMap);
 
     public List<PublishedArticleInfo> selectAllWithLimit(@Param(value = "companyId") String companyId,
-                                                         @Param(value = "articleState") List<String> articleState, @Param(value = "startRow") int startRow,
-                                                         @Param(value = "rows") int rows, @Param(value = "articelName") String articelName,
+                                                         @Param(value = "articleState") List<String> articleState, @Param(value = "articelName") String articelName,
                                                          @Param(value = "articelAuthor") String articelAuthor, @Param(value = "special") String special, @Param(value = "channelId") String channelId);
 
     ArticleInfo queryArticleInfoByCompanyId(@Param("companyId") String companyId, @Param("originalUrl") String originalUrl);
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java
index df5359f87..72a8c3c0c 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/ArticleService.java
@@ -85,7 +85,7 @@ public interface ArticleService {
      *
      * @return
      */
-    public List<PublishedArticleInfo> queryArticle(int startRow, int rows, String articelName, String articelAuthor,
+    public List<PublishedArticleInfo> queryArticle(String articelName, String articelAuthor,
                                                    String special, String articelType, String articleState) throws Exception;
 
     /**
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java
index 9b5e2bda1..1ce9ab45e 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/StaffArticleManageService.java
@@ -1,5 +1,6 @@
 package com.ruoyi.content.service;
 
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.content.domain.ArticleInfo;
 import com.ruoyi.content.domain.ClickTrackInfo;
 import com.ruoyi.content.domain.PageDTO;
@@ -34,7 +35,7 @@ public interface StaffArticleManageService {
      * @param rows
      * @return
      */
-    public PageDTO querySalesmanByArticleId(String articleId, int startRow, int rows);
+    public TableDataInfo querySalesmanByArticleId(String articleId, int startRow, int rows);
 
     /**
      * 根据用户id查询浏览表
@@ -44,6 +45,6 @@ public interface StaffArticleManageService {
      * @param rows
      * @return
      */
-    public PageDTO queryClickInfoByUserId(String userId, String articleId, int startRow, int rows);
+    public TableDataInfo queryClickInfoByUserId(String userId, String articleId, int startRow, int rows);
 
 }
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
index a881db6f4..668360fb5 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
@@ -471,13 +471,12 @@ public class ArticleServiceImpl implements ArticleService {
      * 查询用户当前发布的文章，分页展示
      */
     @Override
-    public List<PublishedArticleInfo> queryArticle(int startRow, int rows, String articelName, String articelAuthor,
+    public List<PublishedArticleInfo> queryArticle(String articelName, String articelAuthor,
                                                    String special, String channelId, String articleState) {
         LOGGER.info("查询文章列表的业务层方法开始！");
-        LOGGER.info("拿到的参数 startRow【{}】，rows【{}】，文章名称【{}】，文章作者【{}】，一级分类【{}】，二级分类【{}】，文章状态【{}】", startRow, rows,
+        LOGGER.info("拿到的参数 ，文章名称【{}】，文章作者【{}】，一级分类【{}】，二级分类【{}】，文章状态【{}】",
                 articelName, articelAuthor, special, channelId, articleState);
-        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
-        String companyId = userInfoDTO.getCompanyId();// 公司id
+        String companyId = "1";// 公司id
 
         List<String> list = new ArrayList<String>();
         if (StringUtils.isBlank(articleState)) {
@@ -498,10 +497,10 @@ public class ArticleServiceImpl implements ArticleService {
         if (StringUtils.isBlank(channelId)) {
             channelId = "";
         }
-        List<PublishedArticleInfo> articleList = articleQueryMapper.selectAllWithLimit(companyId, list, startRow, rows,
+        List<PublishedArticleInfo> articleList = articleQueryMapper.selectAllWithLimit(companyId, list,
                 articelName, articelAuthor, special, channelId);
         if (articleList == null || articleList.size() < 1) {
-            LOGGER.info("根据用户查询已发布的文章，未查询到数据【{}】", JsonUtil.objectToJackson(userInfoDTO));
+            LOGGER.info("根据用户查询已发布的文章，未查询到数据");
             throw new BusinessException("您还没有发布过文章！");
         }
         for (PublishedArticleInfo publishedArticleInfo : articleList) {
@@ -916,8 +915,7 @@ public class ArticleServiceImpl implements ArticleService {
         LOGGER.info("文章列表的删除功能的业务层方法开始！");
         String updateDate = DateUtil.currentDate();
         String updateTime = DateUtil.currentTime();
-        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
-        String updateUser = userInfoDTO.getUserId();
+        String updateUser = "1";
         LOGGER.info("管理员updateUser【{}】文章列表的删除功能的业务层方法中拿到的文章的id【{}】", updateUser, id);
         Message msg = new Message();
         if (StringUtils.isBlank(id)) {
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java
index 844016ebd..69987feb4 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/StaffArticleManageServiceimpl.java
@@ -1,5 +1,6 @@
 package com.ruoyi.content.service.impl;
 
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.content.domain.*;
 import com.ruoyi.content.exception.BusinessException;
 import com.ruoyi.content.mapper.*;
@@ -51,7 +52,7 @@ public class StaffArticleManageServiceimpl implements StaffArticleManageService
     }
 
     @Override
-    public PageDTO querySalesmanByArticleId(String articleId, int startRow, int rows) {
+    public TableDataInfo querySalesmanByArticleId(String articleId, int startRow, int rows) {
         List<ArticlePublishTrack> list = articlePublishTrackQueryMapper.queryPublishUserInfo(articleId, startRow, rows);
         List<YwyForwardUserInfo> ywyList = new ArrayList<>();
 
@@ -87,7 +88,7 @@ public class StaffArticleManageServiceimpl implements StaffArticleManageService
                     ywyForwardUserInfo.setNickName("后台管理员");
                     ywyForwardUserInfo.setArticleId(articleId);
                     ywyForwardUserInfo.setCreateDate(apt.getCreateDate());
-                    ywyForwardUserInfo.setHeadImgUrl("/static/common/image/logo.png");
+                    ywyForwardUserInfo.setHeadImgUrl("/img/admin.png");
                     ywyForwardUserInfo.setUserId(publishUserId);
                 }
                 ywyList.add(ywyForwardUserInfo);
@@ -99,16 +100,15 @@ public class StaffArticleManageServiceimpl implements StaffArticleManageService
         ArticlePublishTrackExample.Criteria criteria = example.createCriteria();
         criteria.andArticleIdEqualTo(articleId);
         int count = articlePublishTrackMapper.countByExample(example);
-        PageDTO pageDTO = new PageDTO();
-        pageDTO.setStartRow(startRow);
-        pageDTO.setDataRows(ywyList);
-        pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
-        pageDTO.setRecords(count);
-        return pageDTO;
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(0);
+        rspData.setRows(ywyList);
+        rspData.setTotal(count);
+        return rspData;
     }
 
     @Override
-    public PageDTO queryClickInfoByUserId(String userId, String articleId, int startRow, int rows) {
+    public TableDataInfo queryClickInfoByUserId(String userId, String articleId, int startRow, int rows) {
 
         List<ClickTrackInfo> list = clickTrackInfoQueryMapper.queryClickInfoByUserId(userId, articleId, startRow, rows);
         List<YwyPublishInfo> YwyPublishInfolList = new ArrayList<>();
@@ -139,11 +139,10 @@ public class StaffArticleManageServiceimpl implements StaffArticleManageService
         criteria.andPublishUserIdEqualTo(userId);
         criteria.andArticleIdEqualTo(articleId);
         int count = clickTrackInfoMapper.countByExample(example);
-        PageDTO pageDTO = new PageDTO();
-        pageDTO.setStartRow(startRow);
-        pageDTO.setDataRows(YwyPublishInfolList);
-        pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
-        pageDTO.setRecords(count);
+        TableDataInfo pageDTO = new TableDataInfo();
+        pageDTO.setCode(0);
+        pageDTO.setRows(YwyPublishInfolList);
+        pageDTO.setTotal(count);
         return pageDTO;
     }
 }
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml
index 2fd5e5d84..73f876f10 100644
--- a/ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleQueryMapper.xml
@@ -1,157 +1,157 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.ruoyi.content.mapper.ArticleQueryMapper">
-	<resultMap id="PublishedArticlesMap"
-		type="com.ruoyi.content.domain.PublishedArticleInfo">
-		<result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
-		<result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR" />
-		<result column="PUSH_DATE" property="pushDate" jdbcType="VARCHAR" />
-		<result column="ARTICLE_AUTHOR" property="articleAuthor"
-			jdbcType="VARCHAR" />
-		<result column="SPECIAL" property="special" jdbcType="VARCHAR" />
-		<result column="CHANNEL_ID" property="channelId" jdbcType="VARCHAR" />
-		<result column="ARTICLE_STATE" property="articleState"
-			jdbcType="VARCHAR" />
-		<result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
-		<result column="ORIGINAL_URL" property="originalUrl" jdbcType="VARCHAR" />
-		<result column="SHARE_TITLE" property="shareTitle" jdbcType="VARCHAR" />
-		<result column="SHARE_DES" property="shareDes" jdbcType="VARCHAR" />
-		<result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
-		<result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
-		<result column="MODIFIED_EDIT_URL" property="modifiedEditUrl"
-			jdbcType="VARCHAR" />
-		<result column="MODIFIED_VIEW_URL" property="modifiedViewUrl"
-			jdbcType="VARCHAR" />
-		<result column="VISITOR_COUNT" property="visitorCount"
-			jdbcType="VARCHAR" />
-		<result column="SHARE_COUNT" property="shareCount" jdbcType="VARCHAR" />
-	</resultMap>
+    <resultMap id="PublishedArticlesMap"
+               type="com.ruoyi.content.domain.PublishedArticleInfo">
+        <result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR"/>
+        <result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR"/>
+        <result column="PUSH_DATE" property="pushDate" jdbcType="VARCHAR"/>
+        <result column="ARTICLE_AUTHOR" property="articleAuthor"
+                jdbcType="VARCHAR"/>
+        <result column="SPECIAL" property="special" jdbcType="VARCHAR"/>
+        <result column="CHANNEL_ID" property="channelId" jdbcType="VARCHAR"/>
+        <result column="ARTICLE_STATE" property="articleState"
+                jdbcType="VARCHAR"/>
+        <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR"/>
+        <result column="ORIGINAL_URL" property="originalUrl" jdbcType="VARCHAR"/>
+        <result column="SHARE_TITLE" property="shareTitle" jdbcType="VARCHAR"/>
+        <result column="SHARE_DES" property="shareDes" jdbcType="VARCHAR"/>
+        <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR"/>
+        <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR"/>
+        <result column="MODIFIED_EDIT_URL" property="modifiedEditUrl"
+                jdbcType="VARCHAR"/>
+        <result column="MODIFIED_VIEW_URL" property="modifiedViewUrl"
+                jdbcType="VARCHAR"/>
+        <result column="VISITOR_COUNT" property="visitorCount"
+                jdbcType="VARCHAR"/>
+        <result column="SHARE_COUNT" property="shareCount" jdbcType="VARCHAR"/>
+    </resultMap>
 
-	<resultMap id="BaseResultMap"
-		type="com.ruoyi.content.domain.ArticleInfo">
-		<!-- WARNING - @mbggenerated This element is automatically generated by 
-			MyBatis Generator, do not modify. This element was generated on Fri May 25 
-			15:02:37 CST 2018. -->
-		<id column="ARTICLE_ID" property="articleId" jdbcType="INTEGER" />
-		<result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR" />
-		<result column="PUSH_DATE" property="pushDate" jdbcType="VARCHAR" />
-		<result column="ARTICLE_AUTHOR" property="articleAuthor"
-			jdbcType="VARCHAR" />
-		<result column="ARTICLE_EDIT_URL" property="articleEditUrl"
-			jdbcType="VARCHAR" />
-		<result column="ARTICLE_VIEW_URL" property="articleViewUrl"
-			jdbcType="VARCHAR" />
-		<result column="LIST_PIC_URL" property="listPicUrl" jdbcType="VARCHAR" />
-		<result column="SPECIAL" property="special" jdbcType="VARCHAR" />
-		<result column="CHANNEL_ID" property="channelId" jdbcType="VARCHAR" />
-		<result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR" />
-		<result column="ORIGINAL_URL" property="originalUrl" jdbcType="VARCHAR" />
-		<result column="SHARE_IMG_URL" property="shareImgUrl" jdbcType="VARCHAR" />
-		<result column="SHARE_TITLE" property="shareTitle" jdbcType="VARCHAR" />
-		<result column="ARTICLE_STATE" property="articleState"
-			jdbcType="VARCHAR" />
-		<result column="SHARE_DES" property="shareDes" jdbcType="VARCHAR" />
-		<result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
-		<result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
-		<result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
-		<result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
-		<result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
-		<result column="MODIFIED_EDIT_URL" property="modifiedEditUrl"
-			jdbcType="VARCHAR" />
-		<result column="MODIFIED_VIEW_URL" property="modifiedViewUrl"
-			jdbcType="VARCHAR" />
-	</resultMap>
-	<resultMap id="CompanyArticlesMap"
-		type="com.ruoyi.content.domain.CompanyArticleInfo">
-		<result column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR" />
-		<result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR" />
-		<result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR" />
-		<result column="LIST_PIC_URL" property="listPicUrl" jdbcType="VARCHAR" />
-		<result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
-		<result column="VISITOR_COUNT" property="visitorCount"
-			jdbcType="VARCHAR" />
-		<result column="SHARED_COUNT" property="sharedCount" jdbcType="VARCHAR" />
-		<result column="PUBLISH_VIEW_URL" property="publishViewUrl"
-			jdbcType="VARCHAR" />
-	</resultMap>
-	<!-- 根据文章主键集合查询文章对应的所有标签集合 -->
-	<resultMap id="ArticleLabelRelDTOMap"
-		type="com.ruoyi.content.domain.ArticleLabelRelDTO">
-		<result column="ARTICLE_ID" property="articleId" jdbcType="INTEGER" />
-		<result column="LABEL_NAME" property="labelName" jdbcType="VARCHAR" />
-		<result column="LABEL_ID" property="labelId" jdbcType="INTEGER" />
-	</resultMap>
-	<!-- 查询文章列表 -->
-	<sql id="countVisitorSQL">
+    <resultMap id="BaseResultMap"
+               type="com.ruoyi.content.domain.ArticleInfo">
+        <!-- WARNING - @mbggenerated This element is automatically generated by
+            MyBatis Generator, do not modify. This element was generated on Fri May 25
+            15:02:37 CST 2018. -->
+        <id column="ARTICLE_ID" property="articleId" jdbcType="INTEGER"/>
+        <result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR"/>
+        <result column="PUSH_DATE" property="pushDate" jdbcType="VARCHAR"/>
+        <result column="ARTICLE_AUTHOR" property="articleAuthor"
+                jdbcType="VARCHAR"/>
+        <result column="ARTICLE_EDIT_URL" property="articleEditUrl"
+                jdbcType="VARCHAR"/>
+        <result column="ARTICLE_VIEW_URL" property="articleViewUrl"
+                jdbcType="VARCHAR"/>
+        <result column="LIST_PIC_URL" property="listPicUrl" jdbcType="VARCHAR"/>
+        <result column="SPECIAL" property="special" jdbcType="VARCHAR"/>
+        <result column="CHANNEL_ID" property="channelId" jdbcType="VARCHAR"/>
+        <result column="COMPANY_ID" property="companyId" jdbcType="VARCHAR"/>
+        <result column="ORIGINAL_URL" property="originalUrl" jdbcType="VARCHAR"/>
+        <result column="SHARE_IMG_URL" property="shareImgUrl" jdbcType="VARCHAR"/>
+        <result column="SHARE_TITLE" property="shareTitle" jdbcType="VARCHAR"/>
+        <result column="ARTICLE_STATE" property="articleState"
+                jdbcType="VARCHAR"/>
+        <result column="SHARE_DES" property="shareDes" jdbcType="VARCHAR"/>
+        <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR"/>
+        <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR"/>
+        <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR"/>
+        <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR"/>
+        <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR"/>
+        <result column="MODIFIED_EDIT_URL" property="modifiedEditUrl"
+                jdbcType="VARCHAR"/>
+        <result column="MODIFIED_VIEW_URL" property="modifiedViewUrl"
+                jdbcType="VARCHAR"/>
+    </resultMap>
+    <resultMap id="CompanyArticlesMap"
+               type="com.ruoyi.content.domain.CompanyArticleInfo">
+        <result column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR"/>
+        <result column="ARTICLE_ID" property="articleId" jdbcType="VARCHAR"/>
+        <result column="ARTICLE_NAME" property="articleName" jdbcType="VARCHAR"/>
+        <result column="LIST_PIC_URL" property="listPicUrl" jdbcType="VARCHAR"/>
+        <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR"/>
+        <result column="VISITOR_COUNT" property="visitorCount"
+                jdbcType="VARCHAR"/>
+        <result column="SHARED_COUNT" property="sharedCount" jdbcType="VARCHAR"/>
+        <result column="PUBLISH_VIEW_URL" property="publishViewUrl"
+                jdbcType="VARCHAR"/>
+    </resultMap>
+    <!-- 根据文章主键集合查询文章对应的所有标签集合 -->
+    <resultMap id="ArticleLabelRelDTOMap"
+               type="com.ruoyi.content.domain.ArticleLabelRelDTO">
+        <result column="ARTICLE_ID" property="articleId" jdbcType="INTEGER"/>
+        <result column="LABEL_NAME" property="labelName" jdbcType="VARCHAR"/>
+        <result column="LABEL_ID" property="labelId" jdbcType="INTEGER"/>
+    </resultMap>
+    <!-- 查询文章列表 -->
+    <sql id="countVisitorSQL">
 		SELECT COUNT(ct.CLICK_USER_ID)
 		FROM click_track_info ct
 		WHERE ct.PUBLISH_USER_ID = ap.USER_ID AND ct.ARTICLE_ID =
 		ap.ARTICLE_ID
 	</sql>
 
-	<sql id="countSharedSQL">
+    <sql id="countSharedSQL">
 		SELECT COUNT(ct.CLICK_USER_ID)
 		FROM click_track_info ct
 		WHERE ct.PUBLISH_USER_ID = ap.USER_ID AND ct.ARTICLE_ID =
 		ap.ARTICLE_ID AND
 		ct.SHARE_STATE!='0'
 	</sql>
-	<sql id="pageVisitorSQL">
+    <sql id="pageVisitorSQL">
 		SELECT COUNT(ct.CLICK_ID)
 		FROM click_track_info ct
 		WHERE
 		ct.ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
 	</sql>
 
-	<sql id="sharedSQL">
+    <sql id="sharedSQL">
 		SELECT COUNT(FORWARD_ID)
 		FROM article_forward_track aft
 		WHERE aft.ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
 	</sql>
-	<resultMap id="PublishedDetailsMap"
-		type="com.ruoyi.content.domain.ArticeClickInfo">
-		<result column="CLICK_USER_NICKNAME" property="clickUserNickname"
-			jdbcType="VARCHAR" />
-		<result column="CLICK_USER_HEADIMGURL" property="clickUserHeadimgurl"
-			jdbcType="VARCHAR" />
-		<result column="SHARE_STATE" property="shareState" jdbcType="VARCHAR" />
-		<result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
-		<result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
-		<result column="WATCH_TIME" property="watchTime" jdbcType="VARCHAR" />
-	</resultMap>
+    <resultMap id="PublishedDetailsMap"
+               type="com.ruoyi.content.domain.ArticeClickInfo">
+        <result column="CLICK_USER_NICKNAME" property="clickUserNickname"
+                jdbcType="VARCHAR"/>
+        <result column="CLICK_USER_HEADIMGURL" property="clickUserHeadimgurl"
+                jdbcType="VARCHAR"/>
+        <result column="SHARE_STATE" property="shareState" jdbcType="VARCHAR"/>
+        <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR"/>
+        <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR"/>
+        <result column="WATCH_TIME" property="watchTime" jdbcType="VARCHAR"/>
+    </resultMap>
 
-	<!-- 查询我的发布列表 -->
-	<!-- <select id="queryAllPublishedArticles" resultMap="PublishedArticlesMap" 
-		parameterType="java.lang.String"> SELECT ap.PUBLISH_ID,ap.ARTICLE_ID,ai.ARTICLE_NAME,ai.LIST_PIC_URL,ap.CREATE_DATE 
-		, ( <include refid="countVisitorSQL" /> ) as VISITOR_COUNT, ( <include refid="countSharedSQL" 
-		/> ) as SHARED_COUNT FROM article_publish_track ap, article_info ai WHERE 
-		ap.USER_ID = #{userId,jdbcType=VARCHAR} AND ap.ARTICLE_ID = ai.ARTICLE_ID 
-		ORDER BY ap.CREATE_DATE,ap.CREATE_TIME </select> -->
+    <!-- 查询我的发布列表 -->
+    <!-- <select id="queryAllPublishedArticles" resultMap="PublishedArticlesMap"
+        parameterType="java.lang.String"> SELECT ap.PUBLISH_ID,ap.ARTICLE_ID,ai.ARTICLE_NAME,ai.LIST_PIC_URL,ap.CREATE_DATE
+        , ( <include refid="countVisitorSQL" /> ) as VISITOR_COUNT, ( <include refid="countSharedSQL"
+        /> ) as SHARED_COUNT FROM article_publish_track ap, article_info ai WHERE
+        ap.USER_ID = #{userId,jdbcType=VARCHAR} AND ap.ARTICLE_ID = ai.ARTICLE_ID
+        ORDER BY ap.CREATE_DATE,ap.CREATE_TIME </select> -->
 
-	<!-- 查询单条文章浏览详情 -->
-	<select id="queryPublishedById" resultMap="PublishedArticlesMap"
-		parameterType="java.lang.String">
-		SELECT
-		ap.PUBLISH_ID,ap.ARTICLE_ID,ai.ARTICLE_NAME,ai.LIST_PIC_URL,ap.CREATE_DATE
-		,
-		(
-		<include refid="countVisitorSQL" />
-		) as VISITOR_COUNT,
-		(
-		<include refid="countSharedSQL" />
-		) as SHARED_COUNT
-		FROM article_publish_track ap, article_info ai
-		WHERE
-		ap.USER_ID = #{userId,jdbcType=VARCHAR}
-		AND ap.ARTICLE_ID =
-		#{articleId,jdbcType=VARCHAR}
-		AND ai.ARTICLE_ID =
-		#{articleId,jdbcType=VARCHAR}
-	</select>
+    <!-- 查询单条文章浏览详情 -->
+    <select id="queryPublishedById" resultMap="PublishedArticlesMap"
+            parameterType="java.lang.String">
+        SELECT
+        ap.PUBLISH_ID,ap.ARTICLE_ID,ai.ARTICLE_NAME,ai.LIST_PIC_URL,ap.CREATE_DATE
+        ,
+        (
+        <include refid="countVisitorSQL"/>
+        ) as VISITOR_COUNT,
+        (
+        <include refid="countSharedSQL"/>
+        ) as SHARED_COUNT
+        FROM article_publish_track ap, article_info ai
+        WHERE
+        ap.USER_ID = #{userId,jdbcType=VARCHAR}
+        AND ap.ARTICLE_ID =
+        #{articleId,jdbcType=VARCHAR}
+        AND ai.ARTICLE_ID =
+        #{articleId,jdbcType=VARCHAR}
+    </select>
 
-	<!-- 查询浏览详情 -->
-	<select id="queryPublishedDetails" resultMap="PublishedDetailsMap"
-		parameterType="java.lang.String">
+    <!-- 查询浏览详情 -->
+    <select id="queryPublishedDetails" resultMap="PublishedDetailsMap"
+            parameterType="java.lang.String">
 		SELECT
 		ct.CLICK_USER_NICKNAME,ct.WATCH_TIME,ct.CREATE_DATE,ct.CREATE_TIME,ct.SHARE_STATE,
 		CLICK_USER_HEADIMGURL
@@ -161,17 +161,17 @@
 		=#{articleId,jdbcType=VARCHAR}
 	</select>
 
-	<!-- 根据连接查询文章是否存在 -->
-	<select id="queryArticleByUrl" resultType="java.lang.Integer"
-		parameterType="java.lang.String">
+    <!-- 根据连接查询文章是否存在 -->
+    <select id="queryArticleByUrl" resultType="java.lang.Integer"
+            parameterType="java.lang.String">
 		SELECT COUNT(1) FROM article_info
 		WHERE ORIGINAL_URL =
 		#{originalUrl,jdbcType=VARCHAR}
 	</select>
 
-	<!-- 根据文章的url和创建人查该条数据 -->
-	<select id="queryArticleInfoByCompanyId" resultMap="BaseResultMap"
-		parameterType="java.lang.String">
+    <!-- 根据文章的url和创建人查该条数据 -->
+    <select id="queryArticleInfoByCompanyId" resultMap="BaseResultMap"
+            parameterType="java.lang.String">
 		SELECT ARTICLE_ID, ARTICLE_NAME, PUSH_DATE,
 		ARTICLE_AUTHOR, ARTICLE_EDIT_URL, ARTICLE_VIEW_URL,
 		LIST_PIC_URL,
@@ -190,92 +190,90 @@
 		#{originalUrl,jdbcType=VARCHAR}
 	</select>
 
-	<!-- 更新个人已经发布过的文章 -->
-	<update id="updatePublishedArticle" parameterType="java.util.Map">
-		UPDATE article_info ai,article_publish_track ap
-		set ap.UPDATE_DATE =
-		#{updateDate,jdbcType=VARCHAR},ap.UPDATE_TIME =
-		#{updateTime,jdbcType=VARCHAR}
-		<if test="companyId == null or companyId == ''">
-			,ai.ARTICLE_CONTENT =
-			#{articleContent,jdbcType=LONGVARCHAR}
-		</if>
-		<if test="shareTitle != null and shareTitle != ''">
-			,ai.SHARE_TITLE = #{shareTitle,jdbcType=VARCHAR}
-		</if>
-		<if test="articleName != null and articleName != ''">
-			,ai.ARTICLE_NAME = #{articleName,jdbcType=VARCHAR}
-		</if>
-		<if test="adId != null and adId != ''">
-			,ap.AD_ID = #{adId,jdbcType=VARCHAR}
-		</if>
-		<if test="cardId != null and adId != ''">
-			,ap.CARD_ID = #{cardId,jdbcType=VARCHAR}
-		</if>
-		WHERE ai.ARTICLE_ID=ap.ARTICLE_ID AND ap.PUBLISH_ID =
-		#{publishId,jdbcType=VARCHAR}
-	</update>
+    <!-- 更新个人已经发布过的文章 -->
+    <update id="updatePublishedArticle" parameterType="java.util.Map">
+        UPDATE article_info ai,article_publish_track ap
+        set ap.UPDATE_DATE =
+        #{updateDate,jdbcType=VARCHAR},ap.UPDATE_TIME =
+        #{updateTime,jdbcType=VARCHAR}
+        <if test="companyId == null or companyId == ''">
+            ,ai.ARTICLE_CONTENT =
+            #{articleContent,jdbcType=LONGVARCHAR}
+        </if>
+        <if test="shareTitle != null and shareTitle != ''">
+            ,ai.SHARE_TITLE = #{shareTitle,jdbcType=VARCHAR}
+        </if>
+        <if test="articleName != null and articleName != ''">
+            ,ai.ARTICLE_NAME = #{articleName,jdbcType=VARCHAR}
+        </if>
+        <if test="adId != null and adId != ''">
+            ,ap.AD_ID = #{adId,jdbcType=VARCHAR}
+        </if>
+        <if test="cardId != null and adId != ''">
+            ,ap.CARD_ID = #{cardId,jdbcType=VARCHAR}
+        </if>
+        WHERE ai.ARTICLE_ID=ap.ARTICLE_ID AND ap.PUBLISH_ID =
+        #{publishId,jdbcType=VARCHAR}
+    </update>
 
-	<select id="selectAllWithLimit"
-		parameterType="com.ruoyi.content.domain.PublishedArticleInfo"
-		resultMap="PublishedArticlesMap">
-		SELECT
-		ai.ARTICLE_ID,
-		ai.ARTICLE_NAME,
-		ai.PUSH_DATE,
-		ai.ARTICLE_AUTHOR,
-		ai.LIST_PIC_URL,
-		ai.SPECIAL,
-		ai.CHANNEL_ID,
-		ai.COMPANY_ID,
-		ai.ORIGINAL_URL,
-		ai.SHARE_IMG_URL,
-		ai.SHARE_TITLE,
-		ai.ARTICLE_STATE,
-		ai.SHARE_DES,
-		ai.CREATE_DATE,
-		ai.CREATE_TIME,
-		ai.CREATE_USER,
-		ai.UPDATE_DATE,
-		ai.UPDATE_TIME,
-		ai.MODIFIED_EDIT_URL,
-		ai.MODIFIED_VIEW_URL
-		<!-- , ( <include refid="pageVisitorSQL" /> ) AS VISITOR_COUNT, ( <include 
-			refid="sharedSQL" /> ) AS SHARE_COUNT -->
-		FROM
-		article_info ai WHERE 1=1
-		<if test="articelName != null and articelName!=''">
-			and ai.ARTICLE_NAME like CONCAT(CONCAT('%', #{articelName,
-			jdbcType=VARCHAR}), '%') </if>
-		<if test="articelAuthor != null and articelAuthor!=''">
-			and ai.ARTICLE_AUTHOR like CONCAT(CONCAT('%',
-			#{articelAuthor,
-			jdbcType=VARCHAR}), '%') </if>
-		<if test="special != null and special!=''">
-			and ai.SPECIAL = #{special,jdbcType=VARCHAR}
-		</if>
-		<if test="channelId != null and channelId !=''">
-			and ai.CHANNEL_ID = #{channelId,jdbcType=VARCHAR}
-		</if>
-		<if test="companyId != null and companyId !=''">
-			and ai.COMPANY_ID = #{companyId,jdbcType=VARCHAR}
-		</if>
-		<if test="articleState != null">
-			and ai.ARTICLE_STATE in
-			<foreach collection="articleState" item="articleState" index="index"
-				open="(" close=")" separator=","> #{articleState} </foreach>
-		</if>
-		order by ai.CREATE_DATE DESC,ai.CREATE_TIME DESC, ai.UPDATE_DATE
-		DESC,ai.UPDATE_TIME DESC
-		limit
-		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
-	</select>
+    <select id="selectAllWithLimit"
+            parameterType="com.ruoyi.content.domain.PublishedArticleInfo"
+            resultMap="PublishedArticlesMap">
+        SELECT
+        ai.ARTICLE_ID,
+        ai.ARTICLE_NAME,
+        ai.PUSH_DATE,
+        ai.ARTICLE_AUTHOR,
+        ai.LIST_PIC_URL,
+        ai.SPECIAL,
+        ai.CHANNEL_ID,
+        ai.COMPANY_ID,
+        ai.ORIGINAL_URL,
+        ai.SHARE_IMG_URL,
+        ai.SHARE_TITLE,
+        ai.ARTICLE_STATE,
+        ai.SHARE_DES,
+        ai.CREATE_DATE,
+        ai.CREATE_TIME,
+        ai.CREATE_USER,
+        ai.UPDATE_DATE,
+        ai.UPDATE_TIME,
+        ai.MODIFIED_EDIT_URL,
+        ai.MODIFIED_VIEW_URL
+        <!-- , ( <include refid="pageVisitorSQL" /> ) AS VISITOR_COUNT, ( <include
+            refid="sharedSQL" /> ) AS SHARE_COUNT -->
+        FROM
+        article_info ai WHERE 1=1
+        <if test="articelName != null and articelName!=''">
+            and ai.ARTICLE_NAME like CONCAT(CONCAT('%', #{articelName,
+			jdbcType=VARCHAR}), '%')
+        </if>
+        <if test="articelAuthor != null and articelAuthor!=''">
+            and ai.ARTICLE_AUTHOR like CONCAT(CONCAT('%',
+            #{articelAuthor,
+            jdbcType=VARCHAR}), '%')
+        </if>
+        <if test="special != null and special!=''">
+            and ai.SPECIAL = #{special,jdbcType=VARCHAR}
+        </if>
+        <if test="channelId != null and channelId !=''">
+            and ai.CHANNEL_ID = #{channelId,jdbcType=VARCHAR}
+        </if>
+        <if test="companyId != null and companyId !=''">
+            and ai.COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+        </if>
+        <if test="articleState != null">
+            and ai.ARTICLE_STATE in
+            <foreach collection="articleState" item="articleState" index="index"
+                     open="(" close=")" separator=",">#{articleState}
+            </foreach>
+        </if>
+        order by ai.CREATE_DATE DESC,ai.CREATE_TIME DESC, ai.UPDATE_DATE DESC,ai.UPDATE_TIME DESC
+    </select>
 
 
-
-
-	<select id="queryModifiedEditUrlByArticleId" resultMap="BaseResultMap"
-		parameterType="java.lang.Integer">
+    <select id="queryModifiedEditUrlByArticleId" resultMap="BaseResultMap"
+            parameterType="java.lang.Integer">
 		select ARTICLE_ID, ARTICLE_NAME, PUSH_DATE,
 		ARTICLE_AUTHOR, ARTICLE_EDIT_URL,
 		ARTICLE_VIEW_URL,
@@ -290,89 +288,87 @@
 		#{articleId,jdbcType=INTEGER}
 	</select>
 
-	<!-- 单条查询公司发布文章 -->
-	<select id="queryCompanyArticleById" resultMap="CompanyArticlesMap">
-		SELECT
-		apt.PUBLISH_ID,apt.ARTICLE_ID,apt.PUBLISH_VIEW_URL,ai.ARTICLE_NAME,ai.LIST_PIC_URL,apt.CREATE_DATE
-		,
-		(
-		<include refid="pageVisitorSQL" />
-		) as VISITOR_COUNT,
-		(
-		<include refid="sharedSQL" />
-		) as SHARED_COUNT
-		FROM article_publish_track apt, article_info ai
-		WHERE
-		apt.PUBLISH_ID =#{publishId,jdbcType=VARCHAR}
-		AND ai.ARTICLE_ID =
-		#{articleId,jdbcType=VARCHAR}
-	</select>
+    <!-- 单条查询公司发布文章 -->
+    <select id="queryCompanyArticleById" resultMap="CompanyArticlesMap">
+        SELECT
+        apt.PUBLISH_ID,apt.ARTICLE_ID,apt.PUBLISH_VIEW_URL,ai.ARTICLE_NAME,ai.LIST_PIC_URL,apt.CREATE_DATE
+        ,
+        (
+        <include refid="pageVisitorSQL"/>
+        ) as VISITOR_COUNT,
+        (
+        <include refid="sharedSQL"/>
+        ) as SHARED_COUNT
+        FROM article_publish_track apt, article_info ai
+        WHERE
+        apt.PUBLISH_ID =#{publishId,jdbcType=VARCHAR}
+        AND ai.ARTICLE_ID =
+        #{articleId,jdbcType=VARCHAR}
+    </select>
+
+    <!-- 根据文章主键集合查询文章对应的所有标签集合 -->
+    <select id="findArticleLabelRelByArticleIds" resultMap="ArticleLabelRelDTOMap"
+            parameterType="java.util.ArrayList">
+        SELECT
+        r.ARTICLE_ID,lab.label_id,lab.LABEL_NAME
+        FROM
+        article_label_relationship r
+        INNER JOIN article_label lab ON
+        lab.LABEL_ID = r.LABEL_ID
+        WHERE
+        r.ARTICLE_ID IN
+        <foreach collection="articelId" item="id" index="index" open="("
+                 close=")" separator=",">
+            #{id}
+        </foreach>
+    </select>
+
+    <resultMap id="noSendResult" type="com.ruoyi.content.domain.ArticlePublishSend">
+        <id column="ID" property="id" jdbcType="INTEGER"/>
+        <result column="ARTICLE_ID" property="articleId" jdbcType="INTEGER"/>
+        <result column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR"/>
+        <result column="SEND_TYPE" property="sendType" jdbcType="VARCHAR"/>
+        <result column="GROUP_ID" property="groupId" jdbcType="VARCHAR"/>
+        <result column="GROUP_NAME" property="groupName" jdbcType="VARCHAR"/>
+        <result column="OPERATE_ID" property="operateId" jdbcType="VARCHAR"/>
+        <result column="OPERATE_NAME" property="operateName" jdbcType="VARCHAR"/>
+        <result column="PUBLISH_DATE" property="publishDate" jdbcType="VARCHAR"/>
+        <result column="PUBLISH_TIME" property="publishTime" jdbcType="VARCHAR"/>
+        <result column="OPERATE_DATE" property="operateDate" jdbcType="VARCHAR"/>
+        <result column="OPERATE_TIME" property="operateTime" jdbcType="VARCHAR"/>
+        <result column="SEND_STATE" property="sendState" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="noSendPublishArticle" parameterType="map" resultMap="noSendResult">
+        SELECT
+        ID,
+        ARTICLE_ID,
+        PUBLISH_ID,
+        SEND_TYPE,
+        GROUP_ID,
+        GROUP_NAME,
+        OPERATE_ID,
+        OPERATE_NAME,
+        PUBLISH_DATE,
+        PUBLISH_TIME,
+        OPERATE_DATE,
+        OPERATE_TIME,
+        SEND_STATE
+        FROM
+        article_publish_send WHERE 1=1
+        <if test="articleId != null and articleId !=''">
+            and ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
+        </if>
+        <if test="publishId != null and publishId !=''">
+            and PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
+        </if>
+        <if test="sendState != null and sendState !=''">
+            and SEND_STATE = #{sendState,jdbcType=VARCHAR}
+        </if>
+        order by PUBLISH_DATE desc,PUBLISH_TIME desc
+        limit
+        #{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
+    </select>
+
 
-	<!-- 根据文章主键集合查询文章对应的所有标签集合 -->
-	<select id="findArticleLabelRelByArticleIds" resultMap="ArticleLabelRelDTOMap"
-		parameterType="java.util.ArrayList">
-		SELECT
-		r.ARTICLE_ID,lab.label_id,lab.LABEL_NAME
-		FROM
-		article_label_relationship r
-		INNER JOIN article_label lab ON
-		lab.LABEL_ID = r.LABEL_ID
-		WHERE
-		r.ARTICLE_ID IN
-		<foreach collection="articelId" item="id" index="index" open="("
-			close=")" separator=",">
-			#{id}
-		</foreach>
-	</select>
-	
-	<resultMap id="noSendResult" type="com.ruoyi.content.domain.ArticlePublishSend">
-		<id column="ID" property="id" jdbcType="INTEGER" />
-	    <result column="ARTICLE_ID" property="articleId" jdbcType="INTEGER" />
-	    <result column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR" />
-	    <result column="SEND_TYPE" property="sendType" jdbcType="VARCHAR" />
-	    <result column="GROUP_ID" property="groupId" jdbcType="VARCHAR" />
-	    <result column="GROUP_NAME" property="groupName" jdbcType="VARCHAR" />
-	    <result column="OPERATE_ID" property="operateId" jdbcType="VARCHAR" />
-	    <result column="OPERATE_NAME" property="operateName" jdbcType="VARCHAR" />
-	    <result column="PUBLISH_DATE" property="publishDate" jdbcType="VARCHAR" />
-	    <result column="PUBLISH_TIME" property="publishTime" jdbcType="VARCHAR" />
-	    <result column="OPERATE_DATE" property="operateDate" jdbcType="VARCHAR" />
-	    <result column="OPERATE_TIME" property="operateTime" jdbcType="VARCHAR" />
-	    <result column="SEND_STATE" property="sendState" jdbcType="VARCHAR" />
-	</resultMap>
-	
-	<select id="noSendPublishArticle" parameterType="map" resultMap="noSendResult">
-		SELECT
-		   ID,
-		   ARTICLE_ID,
-		   PUBLISH_ID,
-		   SEND_TYPE,
-		   GROUP_ID,
-		   GROUP_NAME,
-		   OPERATE_ID,
-		   OPERATE_NAME,
-		   PUBLISH_DATE,
-		   PUBLISH_TIME,
-		   OPERATE_DATE,
-		   OPERATE_TIME,
-		   SEND_STATE
-		FROM
-		article_publish_send WHERE 1=1
-		<if test="articleId != null and articleId !=''">
-			and ARTICLE_ID = #{articleId,jdbcType=VARCHAR}
-		</if>
-		<if test="publishId != null and publishId !=''">
-			and PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
-		</if>
-		<if test="sendState != null and sendState !=''">
-			and SEND_STATE = #{sendState,jdbcType=VARCHAR}
-		</if>
-		order by PUBLISH_DATE desc,PUBLISH_TIME desc
-		limit
-		#{startRow,jdbcType=DECIMAL},#{rows,jdbcType=DECIMAL}
-	</select>
-	
-	
-	
-	
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/static/img/admin.png b/ruoyi-content/src/main/resources/static/img/admin.png
new file mode 100644
index 0000000000000000000000000000000000000000..03bcac9819e731f5365093c62ab2dec9a85cda88
GIT binary patch
literal 3772
zcmV;t4ny&YP)<h;3K|Lk000e1NJLTq004jh004jp1^@s6!#-il000hyNkl<ZcwX&Y
zT~Zsl7C!2j<Z)~^Fi;iqI?f6%S;3GM3_QlZRe=?RtN^IGb{=t75VC@BR}kkFrwV2R
z*z<M))904D-Hv~{`y8p&lG?$KpzfA*K7Hp;Iufwvzxv1PEqI*#5j=wyBD4UY4uD$%
z#Mb=K5%2~;+yKB>2pEKqFo0*Z@8h@I@^5SV6YDs#`hSLh1_Jj`!0xi3RmUrVArLM@
z6c^)vH@~Pp?|b{T0f1cT0Z!f_;9gOoX9+C=1Bi=I)Xvt087dEeNbupqdk|vZ>S{ym
zhrz~&sso|20H~i_*Mk?6_W*EcRq)Fn6L1{<uXZ**+8#UYhvvsC34nU<$DV-jq%5je
zolB`25Q3v|`{jk|v##4$4gj0I;feEApDnf1+jjHFwNO>QUl{;M$`{Wcz6v3vE9dPG
z5eIm`@wzH1p%MV7cduFk#8)At53l}1gujKr%Mio>1PlObH_OIb6fc0u79g|&z!sv|
z6#{-&{~7=yj1lnlxU)0RdEVwT-UC2a_>s^7`e9J(>ssouhcVelfPGakR0RZH13*Xk
z2=HG-?2kJ;eUmGx-o26_I20iM;J&vCAn+CdvCf}db7>y|{z1e;(}G_Xb_@h@Dgb`t
z03iaweQn!Uo4{KDG`d&cxCS30e8KzLzO6}~g0n9K{K*3W4o01wSDd!C+jt3p&F+s=
z5crNW86o09*{eRQANAhwFaVHlDg8rncH4RBHfWX7OYZ<6gFFG?XKF?x$``OVe%rjH
z+LrnMI4FgEj!FnYyzwnq<P`uSYJKtWjf(J1_5H3dZdPQh3UNt+Ac`2?ZM?FjsyM*+
z3IJT{4+Xq-z4BL#Lnd<p!iU>V^Oz$X8*RJ+z%-qEO%2+m&ZqjuwFyE|+t!UuP<>GS
zzc&Eb>|ON%#9w&>kk<aF)7(=Xq|Nq??(l;44)D`$d&h42I%5*N003w8M|%IRw&j!l
zOq<i#j+xw0_JA)e-~|9Uy5DE&PYV_WLY(I^k0)-S7XWDVuCDVee;M8#wVS&(sl4d7
z8ojGQUf5WA1f%xOcG2$?ecm|$IDUVXR(~Q888W6=zz1)}IRGf*PiFN-o#w(8?xLu-
z^?ai{yvffZx;F-$1AwA`-~473@KCmm4{E?E065maFV?b(;Ad(e-m0D(+i*QTw*VmY
zWR>YZ0Rg23T;~Uz0${T{JO%-BYj?)ay^hpb`SZ_EHjZl*=M(@`)GP!z8n>ILMTOw<
zc`7{YI=bl=0KK8ip#3XLKt8xhMZr`5INS{ozGiZq;~0ly0OSXNTpLJ5g)g6{3|-fr
zfKvc$_J)`@$+zvM)Bc$NfP9C~<8(T~K2MA(;XeT&XC|Kj5KoRvrh8%llS@70T|NWd
zDFDbIiAOtUba6r&fsS(>ZUOM*27>EUw_5-Z+ozraLAt!df6gfYo<hL@zjP>=+6>}4
zNWx!7*)6Gb_b;6cq6{QCtyPW&R$+WjRe%&Q<q5c^$RaF2ZU}Mg0m!jA2LP2Wt+E=R
z=pVp+y4yJbC_5lh0}f9B>oUO8rci~Mqtt*byyWZo`mAA6^$mR4?c|&RqGSo99zc~?
zfV2AH>0rpuwZpNNeJ{0=jD}m<#ux9#3kHZ&ri{a(02iZn^NoUbvEH=N8-5l5!~s_K
z#$Pfq-T;8Z0+B)J@jgLn|6elczN~&P+`#!I%CQCF;LuZn2vgMN4FkvlP4(x1D$3|v
z{XK3yLuvWreXZrw5qGZu5P^VMY9#_e0B>BEiiwIuA)a&U8M==9r?G~20N}cXGkqEt
zhdeVyi7M}@cdy<BLh#Nlc;fagkIzd0L^%TDeEs}D5a0suY6rHcby@}FoVNDkULxT4
zQG3VBD(Bt;fLm%M0Yan_gg6|xUw%?q#j0)Vy&r!G#8VFC$HMo!w2ij_i0lDo{k;V?
zkoEdSaB3O|vEai)Zu#1o@DaVKXIL2<V7{X|Aeho_;Tyh++(hPEG0QBb^O^yYPV0hT
zrXG^J{{RLc<fRd{zf&)az{&4`*a`qzMeZD|itxP)1m)@DX&Ko|m3sZE`rSl(Y4G9Q
z#;z@cv}m6z!2t7v<VFjNPK?&`p1OK@W2qbfBI7U)zDP@4>rNjn;pRLPMfhS5<muWt
z)03O^zUbn}=a0wSdj(4C7s7||zIIv_%3q#`N;1HLmk<?VdN`))44Vf4ehS6Lu`flR
zb;nnE0L(mv=!UPy!|3wpl2k){6PdUOgJ-8z7kn~rYXg7<R)`Wx;a-uu|7I>^a_68B
zeb<R6-BrGJMxe?>L>EHhV=F*xAwUb{<&y|o%Pb*RHwd@^gs}h^gi*ZU*<f8(dL;uv
z($K4_aWzv-o{zyx6%gOp`S2b=?4b|`RdlcB+|_ddco7C0AADpJuK*xRstJU5i)mJW
zHc+al9@%zzqidA57I5a1E#U<K<cb$KIZ4Z}%QWw((`=|tz7Opi-Qg%LZ5#ukcH{#i
zI0Zl)%y~EgA#(4}@o_5^1u)juHpG5-zj5T!&T$3+xt&UYIOc7vsGb_&oO6&Mnr?7C
zcD1d|Ism4rT}k)sD_~5hf#}j_5GNGirUE%CdL3;R{bw-;0$ie~9oSY2Rso>2iE?SC
zimCysRNJy(iq!67(SHUKLd%<6tpGrE6J_e$6iBsF1)I~pSLE;sm;Q6uz}hC)(g6@t
zK76L`1E!3sB84Js13;Dj)5ad%GmP-2?E8^R1pw=qG$r}D|A&aLbSA_m0Cc{U$pmtz
zGhktR#7Qn-^W*S6Aeg-*SyK(r<>*qTNb{2CGIlJLX&02j0Gr*bbIP}0nR0{=0HU6^
z!9!OK*aQGs7YM}}0FLvo%1Hwx_HR2o2MUDAYHAz+s=|*pQ6lV1YM1sxAjG%4p6jRq
zTL4h$|I{|>D{XQ`^B^z^09E0qm4Kt_1?iMlX%IDu(~U6o>uM?bPpb<=J+sP`W<g*K
z04l<d_RR~}OG}DS6QZLAYyp5n|F@l&hs#2ZHn{@!sT;><&lzL_BLGknK7L2Bv6mI`
zQlU|nl8X+S=3h=_f&q&5J5Go_T(DJwArKS>fQqXpOQYjmZI4QRm{tR-QNScduabo%
znTt^sRQ2$SiOOk(0H7j#m8zKZWUAE-)B%75fl4@7m;Te(M<tS26a?A;;Fd*+2dI|K
z;{;Pw3N4ilfTHwY1O!FP<!AvQuI2Oam3LHHP58-VG<rk1IrFzHJ+D$NtZV>KZl*MP
zN9|^vYqKQnxJ)1`sp9>{Yf81IeP0Uze4|fK__Cwa;8n`UmJI-^EUYR6&I^i~hoYW=
zG61-Gzi3$$PD+)d2DtSH(^iM6_ZLZJs~Cnl-%$bpw+yPOBhseSK$#3c6^GQN|9L=i
zL7-DkR|x=|GN>ktBT)3mRRd)LpiKH-00FaHj@)pnQcjl*01hR~4i|Mx76#3z8OWjO
zvH-wQFFLfGWh`>lugYc?767Ic^o`!sp>OnM4cdenC=CF;;b8!9lGS$;^uPRWiWMWL
z8}Me--r44O9V`G)Zq77vR!SLEYQP*dK!GSD6im8qw&;Jw9(X<>%jt6OS|S0!HT+a)
zhl9+d4M+8aceO^I4@`k5y+8SEW}E&OK=5(68z6kmn@6reNCJSf`gKyYDj=XJoU%JO
zAX@GZrMqod|9Nx70ySe-Q!W5FD7R4wvq4-jiwIvvoo4PO4HSr006?&ci9V?;g5|c{
zN~#n)<^q7T`c*=*x&!7|ztlh}fz9`g0#tOQ?Zsr2Hy(<Wbmw9rO4uD9lUvIO7RUqu
zNB7&h`O3tEb3l|#E+st9yC^`K0Dyc4l{%+RRb>O9d$k`3aqb%B$@i%hY+}{U0N^?O
zFBpUc<&+5kD!*-O_0PNk&Oi$aZtBkF+7l+&$kgheTO2oeg|YJD0;vFC=C==u9-vg2
z2on>}qHf}rQr0^NAgYX;)0Xl`<U6u<Q>Oxe+>zs`2EGk7K<VzHec%XGwGGQ7$T(D!
z3IOtKo8}1})q$<JJ|(LG6Lth;Ko*^Ytmmn?K$bDM0sv0XMCWjZiGj1!0EjnvMWym6
zoD!ao^gm}K(T8eM=4J%|H2u51|AyY;O@wfBeE2HT|NO!t?^#M=?iBz~*1wIwPaa!P
z1`p-;M!s{(IRVZNCQ3DWKQ}2^!UX_uLcg5+y9v6_dIzhIlp07$<5I$7sYX%Twq4?7
zDJDRxfu%k!0)WbIGY&VDDg2q=OI|6bp2?$tO&VFATn$G>2AA!e1prVkPT5&ME_lqS
zfvZ7s3~L?eKbbqqhFjjDya<5a)pg#kA1X!46=2bJrq#eY&_6d~y1apA0RU9Wl%mO^
zf>n8*w0McrNb?|~##I&im-EM29P>xsW&og$W7&@VQ(!Qq2IP0BYh8V}{+H*9v;zdZ
zPLAgP1OROSlAA6lp_%+Y2kDf`k|2_O8n>I77eH6R`d<M6aU6bL<;?&<ZvJ3wFES}$
z&bvr8K!mKL%OoTK-frJ$hgdza{^$FzBFh;7s0bSsCgljsbQ{XzRoNb$)winAe`E&`
zITKl@VbpF$rF!`QnA01k1*!W!X4+b-w%~Lk>A;F+?Lyr#bDksZxikQf9)RT>H)o)-
z4Q22YiCvHk<4Is_d9En?Xg*y2(+21bF>lgUs%3D6XQCY`B!yEltHxA*T%-uNOpHD6
z9n^wO<XL$Dl%)pBdT-f+Pu_1F0Jb__%6Bw2uu#lWN<S^Wbb$dlXt&rm<Db&;2B@^S
z@lINPVG{j}Q~+f)TJBpZpHtbzwC)Q+PH=LT^OpgDiov$-^#4l&fOCvIp`LZ8|5X4m
zs&tpa%a&hCW&L7xD6gZRTwCs%_0J_Lk?jUr?_miar1Jg|0Enbm3Egt?O653!lU^GB
mC`S#@RX+@O%F*i*0Q?`0iNqHJSZrPZ0000<MNUMnLSTYdMeUye

literal 0
HcmV?d00001

diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleList.html b/ruoyi-content/src/main/resources/templates/content/article/articleList.html
new file mode 100644
index 000000000..3265e694a
--- /dev/null
+++ b/ruoyi-content/src/main/resources/templates/content/article/articleList.html
@@ -0,0 +1,571 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('文章列表')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>文章名称：</label>
+                            <input type="text" name="articleName"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<div class="modal inmodal" id="myModal2" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" style="width: 500px;">
+        <div class="modal-content animated fadeIn">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5; padding: 15px 15px;">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left; font-size: 23px;">添加标签</h5>
+            </div>
+            <div class="modal-body" style="background: #ffffff;">
+                <form class="form-horizontal m" id="form-picAdverts-add">
+                    <div class="col-md-12" style="margin-top: -15px;">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">添加标签：</label>
+                            <div class="col-sm-6">
+                                <select class="form-control" th:id="labelChoice" name="labelChoice"></select>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
+                <button type="button" class="btn btn-white" data-dismiss="modal" th:id="modalColse">关闭</button>
+                <button type="button" class="btn btn-primary" th:onclick="addArticleLabel()">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal inmodal" id="myModal3" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" style="width: 800px;">
+        <div class="modal-content animated fadeIn">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5; padding: 15px 15px;">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left; font-size: 23px;">业务员分享情况</h5>
+            </div>
+            <div class="modal-body" style="background: #ffffff; margin-top: -20px;">
+                <form id="form2">
+                    <div class="select-list">
+                        <input type="text" th:hidden="true" name="articleId" th:id="articleId"/>
+                        <input type="text" th:hidden="true" name="userId" th:id="userId"/>
+                    </div>
+                </form>
+                <div class="col-sm-12 select-table table-striped">
+                    <table id="bootstrap-table1"></table>
+                </div>
+            </div>
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal inmodal" id="myModal4" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" style="width: 900px;">
+        <div class="modal-content animated fadeIn">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5; padding: 15px 15px;">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left; font-size: 23px;">客户观看情况</h5>
+            </div>
+            <div class="modal-body" style="background: #ffffff; margin-top: -20px;">
+                <div class="col-sm-12 select-table table-striped">
+                    <table id="bootstrap-table3"></table>
+                </div>
+            </div>
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal inmodal" id="myModal5" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" style="width: 800px;">
+        <div class="modal-content animated fadeIn">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5; padding: 15px 15px;">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left; font-size: 23px;">客户来源</h5>
+            </div>
+            <div class="modal-body" style="background: #ffffff; margin-top: -20px;">
+                <form id="form5">
+                    <div class="select-list">
+                        <input type="text" th:hidden="true" name="clickId" th:id="clickId"/>
+                    </div>
+                </form>
+                <div class="col-sm-12 select-table table-striped">
+                    <table id="bootstrap-table5"></table>
+                </div>
+            </div>
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var path = ctx;
+    var prefix = ctx + "article";
+
+    var labelArticleId = "";
+    var clickCount = 0;
+    var publishCount = 0;
+    var sharingCount = 0;
+
+    $(function () {
+        var options = {
+            id: "bootstrap-table",
+            url: prefix + "/articleArry",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            modalName: "文章信息",
+            columns: [
+                {
+                    field: 'articleId',
+                    title: 'id',
+                    visible: false
+                },
+                {
+                    field: 'articleName',
+                    title: '文章名称'
+                },
+                {
+                    field: 'pushDate',
+                    title: '发布时间',
+                    visible: false
+                },
+                {
+                    field: 'articleAuthor',
+                    title: '文章作者',
+                    visible: false
+                },
+                {
+                    field: 'SPECIAL',
+                    title: '专栏',
+                    visible: false
+                },
+                {
+                    field: 'channelId',
+                    title: '所属栏目id',
+                    visible: false
+                },
+                {
+                    field: 'articleState',
+                    title: '收录状态：0未被收录2已收录1删除',
+                    visible: false
+                },
+                {
+                    field: 'createUser',
+                    title: '创建人',
+                    visible: false
+                },
+                {
+                    field: 'originalUrl',
+                    title: '原文连接地址',
+                    visible: false
+                },
+                {
+                    field: 'shareTitle',
+                    title: '分享标题',
+                    visible: false
+                },
+                {
+                    field: 'shareDes',
+                    title: '分享描述',
+                    visible: false
+                },
+                {
+                    field: 'updateDate',
+                    title: '更新日期'
+                },
+                {
+                    field: 'updateTime',
+                    title: '更新时间'
+                },
+                {
+                    field: 'visitorCount',
+                    title: '浏览量'
+                },
+                {
+                    field: 'shareCount',
+                    title: '分享量'
+                },
+                {
+                    field: 'modifiedEditUrl',
+                    title: '预览路径',
+                    visible: false
+                },
+                {
+                    field: 'modifiedViewUrl',
+                    title: '编辑路径',
+                    visible: false
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModal3" onclick="sharingTrack(\'' + row.articleId + '\')")"><i class="fa fa-eye"></i>分享与浏览情况</a> ');
+                        actions.push('<a class="btn btn-success btn-xs" data-toggle="modal" data-target="#myModal2" onclick="changeArticleId(\'' + row.articleId + '\')"><i class="fa fa-bookmark-o"></i>添加标签</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="delArticleInfo(\'' + row.articleId + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+
+        articleLabelChoice();
+
+        sharingTrack();
+
+        publishInfoList();
+
+        sharingTrackList();
+    });
+
+    function changeArticleId(id) {
+        labelArticleId = id;
+    }
+
+    /**
+     * 查询标签信息
+     */
+    function articleLabelChoice() {
+        $.ajax({
+            type: "post",
+            url: path + 'label/queryLabel',
+            data: {},
+            async: false,
+            success: function (data) {
+                if (data.result) {
+                    var obj = data.object.labelList;
+                    for (var i = 0; i < obj.length; i++) {
+                        $("#labelChoice").append(
+                            "<option value='" + obj[i].labelId + "'>"
+                            + obj[i].labelName + "</option>");
+                    }
+                } else {
+                    $.modal.alertError("网络异常，请稍后再试！");
+                }
+            }
+        });
+    }
+
+    function delArticleInfo(id) {
+        $.ajax({
+            url: "delArticleInfo",
+            data: {
+                ids: id
+            },
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
+                if (data.result) {
+                    const code = {
+                        'code': 0
+                    };
+                    $.operate.successCallback(code);
+                } else {
+                    $.modal.alertError(data.info);
+                }
+            },
+            error: function (textStatus, e) {
+                $.modal.alertError('系统异常,请稍后重试!');
+            }
+        });
+    }
+
+    /**
+     * 文章添加标签
+     */
+    function addArticleLabel() {
+        var labelIds = [];
+        $("#labelChoice option:selected").each(function () {
+            labelIds.push($(this).val())
+        })
+        $.ajax({
+            url: path + "label/addlabel",
+            data: {
+                "labelIds": labelIds.join(','),
+                "articleId": labelArticleId,
+            },
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
+                if (data.result) {
+                    $.modal.alertSuccess(data.info);
+                    $('#modalColse').trigger("click");
+                } else {
+                    $.modal.alertError(data.info);
+                }
+            },
+            error: function (textStatus, e) {
+                $.modal.alertError('系统异常,请稍后重试!');
+            }
+        });
+    }
+
+    function sharingTrack(id) {
+        $('#articleId').val(id);
+        if (clickCount > 0) {
+            $.table.search('form2', 'bootstrap-table1');
+        } else {
+            var options = {
+                id: "bootstrap-table1",
+                url: path + "article/articleSharingTrackList",
+                createUrl: prefix + "/add",
+                removeUrl: prefix + "/remove",
+                updateUrl: prefix + "/edit/{id}",
+                modalName: "业务员分享情况",
+                showSearch: false,
+                showRefresh: false,
+                showToggle: false,
+                showColumns: false,
+                columns: [
+                    {
+                        field: 'userId',
+                        title: '用户ID',
+                        visible: false
+                    },
+                    {
+                        field: 'articleId',
+                        title: '文章id',
+                        visible: false
+                    },
+                    {
+                        field: 'headImgUrl',
+                        title: '发布业务员头像',
+                        formatter: function (value, row, index) {
+                            var actions = [];
+                            actions.push('<img src="'
+                                + decodeURIComponent(row.headImgUrl)
+                                + '"  id="img'
+                                + row.userId
+                                + '"  style = "width:30;height:30px;border-radius:50px" />');
+                            return actions.join('');
+                        }
+                    },
+                    {
+                        field: 'nickName',
+                        title: '发布业务员昵称'
+                    },
+                    {
+                        field: 'createUser',
+                        title: '工号'
+                    },
+                    {
+                        field: 'createDate',
+                        title: '发布日期'
+                    },
+                    {
+                        title: '操作',
+                        align: 'center',
+                        formatter: function (value, row, index) {
+                            var actions = [];
+                            actions.push('<a class="btn btn-success btn-xs" data-toggle="modal" data-target="#myModal4" onclick="publishInfoList(\'' + row.userId + '\')"><i class="fa fa-user"></i>有谁看了</a> ');
+                            return actions.join('');
+                        }
+                    }]
+            };
+            $.table.init(options);
+            clickCount++;
+        }
+    }
+
+    function publishInfoList(id) {
+        $('#userId').val(id);
+        if (publishCount > 0) {
+            $.table.search('form2', 'bootstrap-table3');
+        } else {
+            var options = {
+                id: "bootstrap-table3",
+                url: path + "article/publishInfoList",
+                createUrl: prefix + "/add",
+                removeUrl: prefix + "/remove",
+                updateUrl: prefix + "/edit/{id}",
+                modalName: "客户观看情况",
+                showSearch: false,
+                showRefresh: false,
+                showToggle: false,
+                showColumns: false,
+                columns: [
+                    {
+                        field: 'clickId',
+                        title: '用户clickid',
+                        visible: false
+                    },
+                    {
+                        field: 'openId',
+                        title: '用户openId'
+                    },
+                    {
+                        field: 'clientHeadImgurl',
+                        title: '用户头像',
+                        formatter: function (value, row, index) {
+                            var actions = [];
+                            actions.push('<img src="'
+                                + decodeURIComponent(row.clientHeadImgurl)
+                                + '"  id="img'
+                                + row.userId
+                                + '"  style = "width:30;height:30px;border-radius:50px" />');
+                            return actions.join('');
+                        }
+                    },
+                    {
+                        field: 'clientNickName',
+                        title: '用户昵称',
+                        formatter: function (value, row, index) {
+                            if (row.clientNickName == "") {
+                                return '匿名';
+                            }
+                            return row.clientNickName;
+                        }
+
+                    },
+                    {
+                        field: 'watchTime',
+                        title: '观看时长(s/秒)'
+                    },
+                    {
+                        field: 'clickDate',
+                        title: '观看日期'
+                    },
+                    {
+                        field: 'clickTime',
+                        title: '观看时间'
+                    },
+                    {
+                        field: 'shareState',
+                        title: '分享状态',
+                        formatter: function (value, row, index) {
+                            var actions = [];
+                            if (row.shareState === '0' || row.shareState === '' || row.shareState === null) {
+                                actions.push('未分享');
+                            }
+                            if (row.shareState === '1') {
+                                actions.push('对话框分享');
+                            }
+                            if (row.shareState === '2') {
+                                actions.push('朋友圈分享');
+                            }
+                            if (row.shareState === '5') {
+                                actions.push('对话框和朋友圈都分享');
+                            }
+                            return actions.join('');
+                        }
+                    },
+                    {
+                        title: '操作',
+                        align: 'center',
+                        formatter: function (value, row, index) {
+                            var actions = [];
+                            actions.push('<a class="btn btn-success btn-xs" data-toggle="modal" data-target="#myModal5" onclick="sharingTrackList(\'' + row.clickId + '\')"><i class="fa fa-user"></i>客户来源</a> ');
+                            return actions.join('');
+                        }
+                    }]
+            };
+            $.table.init(options);
+            publishCount++;
+        }
+    }
+
+    function sharingTrackList(id) {
+        $('#clickId').val(id);
+        if (sharingCount > 0) {
+            $.table.search('form5', 'bootstrap-table5');
+        } else {
+            var options = {
+                id: "bootstrap-table5",
+                url: path + "article/articleSharingTrackInfo",
+                createUrl: prefix + "/add",
+                removeUrl: prefix + "/remove",
+                updateUrl: prefix + "/edit/{id}",
+                modalName: "客户来源",
+                showSearch: false,
+                showRefresh: false,
+                showToggle: false,
+                showColumns: false,
+                columns: [
+                    {
+                        title: "序号",
+                        formatter: function (value, row, index) {
+                            return $.table.serialNumber(index);
+                        }
+                    },
+                    {
+                        field: 'headImgUrl',
+                        title: '用户头像',
+                        formatter: function (value, row, index) {
+                            var actions = [];
+                            actions.push('<img src="'
+                                + decodeURIComponent(row.headImgUrl)
+                                + '" style = "width:30;height:30px;border-radius:50px" />');
+                            return actions.join('');
+                        }
+                    },
+                    {
+                        field: 'nickName',
+                        title: '用户昵称',
+                        formatter: function (value, row, index) {
+                            if (row.nickName == "") {
+                                return '匿名';
+                            }
+                            return row.nickName;
+                        }
+                    },
+                    {
+                        field: 'toShareState',
+                        title: '点开方式',
+                        formatter: function (value, row, index) {
+                            var actions = [];
+                            if (row.toShareState == "groupmessage") {
+                                actions.push('群组');
+                            }
+                            if (row.toShareState == "timeline") {
+                                actions.push('朋友圈');
+                            }
+                            if (row.toShareState == "singlemessage") {
+                                actions.push('个人');
+                            }
+                            return actions.join('');
+                        }
+                    },
+                    {
+                        field: 'openId',
+                        title: '用户openId'
+                    }]
+            };
+            $.table.init(options);
+            sharingCount++;
+        }
+    }
+</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/column/column.html b/ruoyi-content/src/main/resources/templates/content/column/column.html
index 73d0ef5ce..71bd113ea 100644
--- a/ruoyi-content/src/main/resources/templates/content/column/column.html
+++ b/ruoyi-content/src/main/resources/templates/content/column/column.html
@@ -28,7 +28,6 @@
         </div>
     </div>
 </div>
-
 <div class="ui-layout-center">
     <div class="container-div">
         <div class="row">
@@ -74,7 +73,7 @@
 </div>
 <div class="modal inmodal" id="myModal2" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog">
-        <div class="modal-content animated flipInY">
+        <div class="modal-content animated fadeIn">
             <div class="modal-header" style="border-bottom: 0px solid #e5e5e5;">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
                         class="sr-only">Close</span>
@@ -168,7 +167,7 @@
 </div>
 <div class="modal inmodal" id="myModal3" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog">
-        <div class="modal-content animated flipInY">
+        <div class="modal-content animated fadeIn">
             <div class="modal-header" style="border-bottom: 0px solid #e5e5e5;">
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
                         class="sr-only">Close</span>
diff --git a/ruoyi-content/src/main/resources/templates/content/gallery/list.html b/ruoyi-content/src/main/resources/templates/content/gallery/list.html
index f7c80edd8..dea24f37b 100644
--- a/ruoyi-content/src/main/resources/templates/content/gallery/list.html
+++ b/ruoyi-content/src/main/resources/templates/content/gallery/list.html
@@ -50,7 +50,7 @@
 </div>
 <div class="modal inmodal" id="myModal2" tabindex="-1" role="dialog" aria-hidden="true">
     <div class="modal-dialog">
-        <div class="modal-content animated flipInY">
+        <div class="modal-content animated fadeIn">
             <div class="modal-header" style="border-bottom: 0px solid #e5e5e5;">
                 <input th:hidden="true" value="" th:id="pictureId"/>
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span

From 6f3dc068e23c82fe81383b84f9856bd4d8894190 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Tue, 30 Mar 2021 09:25:41 +0800
Subject: [PATCH 14/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LibraryManageController.java   |  72 ++-
 .../StaffArticleManageController.java         |   8 +-
 .../content/service/BaseCodeService.java      |   7 +
 .../service/impl/BaseCodeServiceImpl.java     |  42 ++
 .../service/impl/LibraryServiceImpl.java      |  37 +-
 .../content/ArticleChannelQueryMapper.xml     |   4 +-
 .../content/article/articleManage.html        | 437 ++++++++++++++++++
 7 files changed, 564 insertions(+), 43 deletions(-)
 create mode 100644 ruoyi-content/src/main/resources/templates/content/article/articleManage.html

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java
index 13cc296e9..ee325ab56 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java
@@ -1,8 +1,13 @@
 package com.ruoyi.content.controller;
 
 
+import com.ruoyi.common.core.page.PageDomain;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.page.TableSupport;
+import com.ruoyi.content.domain.BaseCodeTree;
 import com.ruoyi.content.domain.PageDTO;
 import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.BaseCodeService;
 import com.ruoyi.content.service.LibraryService;
 import com.ruoyi.content.utils.CheckUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -10,14 +15,13 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * 说明：文章管理
@@ -28,11 +32,47 @@ import java.util.UUID;
 @Controller
 @RequestMapping("/article")
 public class LibraryManageController {
+
+    private String prefix = "content/article";
+
     private final static Logger logger = LoggerFactory.getLogger(LibraryManageController.class);
+
     @Autowired
     private LibraryService libraryService;
     @Autowired
     private CheckUtil checkUtil;
+    @Autowired
+    private BaseCodeService baseCodeService;
+
+    @GetMapping("manage")
+    public String articleList() {
+        return prefix + "/articleManage";
+    }
+
+    /**
+     * 获取栏目树
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/columnTree")
+    @ResponseBody
+    public Message columnTree(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Message msg = new Message();
+        Map<String, Object> policyMap = new HashMap<String, Object>();
+        String codeCode = request.getParameter("codeCode");
+        // 查询栏目树
+        List<BaseCodeTree> columnList = new ArrayList<BaseCodeTree>();
+        columnList = baseCodeService.baseColumnTree(codeCode);
+        policyMap.put("columnList", columnList);
+        msg.setInfo("成功");
+        msg.setObject(policyMap);
+        msg.setResult(true);
+        return msg;
+    }
 
     /**
      * 查询文库信息
@@ -43,35 +83,31 @@ public class LibraryManageController {
      */
     @RequestMapping("/libraryArry")
     @ResponseBody
-    public PageDTO libraryArry(HttpServletRequest request, HttpServletResponse response) {
+    public TableDataInfo libraryArry(HttpServletRequest request, HttpServletResponse response) {
         logger.info("查询文库列表的控制层方法开始！");
         Thread.currentThread().setName(UUID.randomUUID().toString());
-        PageDTO pageDTO = new PageDTO();
+        TableDataInfo pageDTO = new TableDataInfo();
         try {
-            String rowsVal = request.getParameter("rows");
-            String page = request.getParameter("page");
+            PageDomain pageDomain = TableSupport.buildPageRequest();
+            Integer pageSize = pageDomain.getPageSize();
+            Integer pageNum = (pageDomain.getPageNum() - 1) * pageSize;
             String articelName = request.getParameter("articelName");
             String articleThirdTypeInit = request.getParameter("articleThirdTypeInit");
             String channel = request.getParameter("channel");
             String special = request.getParameter("special");
             String articleState = request.getParameter("articleState");
-            if (articleThirdTypeInit != null && !"".equals(articleThirdTypeInit.trim())) {
+            if(articleThirdTypeInit != null && !"".equals(articleThirdTypeInit.trim())) {
                 channel = articleThirdTypeInit;
-            } else {
+            }else {
                 special = channel;
             }
-            int rows = Integer.parseInt(rowsVal);
-            int startRow = rows * (Integer.parseInt(page) - 1);
-            List<HashMap<String, Object>> list = libraryService.queryLibrary(startRow, rows, articelName,
+            List<HashMap<String, Object>> list = libraryService.queryLibrary(pageNum, pageSize, articelName,
                     special, channel, articleState);
-            pageDTO.setPage(Integer.parseInt(page));
-            pageDTO.setStartRow(startRow);
-            pageDTO.setDataRows(list);
             //int count = libraryService.countArticleInfoByState(articelName,special, channel, articleState);
             int count = libraryService.countArticleByParam(articelName, special, channel, articleState);
-            pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
-            pageDTO.setRecords(count);
-            pageDTO.setPage(Integer.parseInt(page));
+            pageDTO.setCode(0);
+            pageDTO.setRows(list);
+            pageDTO.setTotal(count);
         } catch (Exception e) {
             logger.info("查询当前用户发布的文章失败【{}】", e.getMessage());
             e.printStackTrace();
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java
index 912100bbd..eaf8b268a 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/StaffArticleManageController.java
@@ -5,12 +5,10 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableSupport;
 import com.ruoyi.content.domain.ClickTrackInfo;
 import com.ruoyi.content.domain.ClickUserInfo;
-import com.ruoyi.content.domain.PageDTO;
 import com.ruoyi.content.domain.UserInfo;
 import com.ruoyi.content.exception.BusinessException;
 import com.ruoyi.content.mapper.ArticlePublishTrackMapper;
 import com.ruoyi.content.mapper.CmsSysUserExMapper;
-import com.ruoyi.content.message.Message;
 import com.ruoyi.content.service.StaffArticleManageService;
 import com.ruoyi.content.utils.JsonUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -23,7 +21,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+import java.util.UUID;
 
 @Controller
 @RequestMapping("/article")
@@ -119,7 +120,6 @@ public class StaffArticleManageController {
     @ResponseBody
     public TableDataInfo articleSharingTrackInfo(HttpServletRequest request) {
         Thread.currentThread().setName(UUID.randomUUID().toString());
-        Message msg = new Message();
         List<ClickUserInfo> clickUserInfos = new ArrayList<ClickUserInfo>();
         ClickTrackInfo clickTrackInfo = new ClickTrackInfo();
         logger.info("查询用户查看分享文章轨迹信息的控制层方法开始！");
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
index f3a22f26f..02f8ecb65 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
@@ -98,5 +98,12 @@ public interface BaseCodeService {
      */
     public Message operateColumn(String columnId, String operateType);
 
+    /**
+     * 查询栏目树
+     *
+     * @param codeCode
+     * @return
+     */
+    List<BaseCodeTree> baseColumnTree(String codeCode);
 
 }
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
index a5bdcd276..49805a60f 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
@@ -586,4 +586,46 @@ public class BaseCodeServiceImpl implements BaseCodeService {
         logger.info("操作栏目排序业务层方法结束");
         return msg;
     }
+
+    @Override
+    public List<BaseCodeTree> baseColumnTree(String codeCode) {
+        logger.info("进入查询栏目树的方法");
+        if (StringUtils.isBlank(codeCode)) {
+            logger.info("查询栏目树请求参数不正确codeCode【{}】", codeCode);
+            throw new ParameterException("创建失败，参数不足！");
+        }
+        String companyId = "1";
+        String branchId = "86";
+        String state = "0";
+        HashMap<String, String> parMap = new HashMap<>();
+        parMap.put("codeCode", codeCode);
+        parMap.put("companyId", companyId);
+        parMap.put("state", state);
+        if (!"86".equals(branchId)) {
+            parMap.put("branchId", branchId);
+        }
+        List<BaseCodeTree> list = baseCodeExMapper.columnTree(parMap);
+        recursionList(list);
+        logger.info("查询栏目树结束，查询到的结果为【{}】" + JsonUtil.objectToJackson(list));
+        logger.info("查询栏目信息的方法结束！");
+        return list;
+    }
+
+    private void recursionList(List<BaseCodeTree> baseCodeList) {
+        for (BaseCodeTree baseCode : baseCodeList) {
+            HashMap map = new HashMap();
+            map.put("CODE_CODE", baseCode.getCodeCode());
+            map.put("parentCompanyId", baseCode.getCompanyId());
+            map.put("parentState", baseCode.getState());
+            map.put("parentBranchId", baseCode.getBranchId());
+            List<BaseCodeTree> list = baseCodeExMapper.getNextNodeTree(map);
+            if (list != null && list.size() > 0) {
+                recursionList(list);
+                baseCode.setChild(list);
+            } else {
+                baseCode.setChild(new ArrayList<>());
+            }
+        }
+    }
+
 }
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
index 332e5fe6d..0414a29e0 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
@@ -99,8 +99,6 @@ public class LibraryServiceImpl implements LibraryService {
         if (StringUtils.isBlank(channel)) {
             channel = "";
         }
-        //List<ArticleChannel> libraryList = articleChannelQueryMapper.selectAllWithLimit(companyId, branchId,list, startRow, rows,
-        //articelName, special, channel);
         HashMap<String, Object> parMap = new HashMap<String, Object>();
         parMap.put("list", list);
         parMap.put("startRow", startRow);
@@ -115,12 +113,14 @@ public class LibraryServiceImpl implements LibraryService {
             for (HashMap<String, Object> hashMap : resultMap) {
                 publishList.add((String) hashMap.get("publishId"));
             }
-            LOGGER.info("所有的publishId：++++++++++++" + publishList);
-            resultMap = articleChannelQueryMapper.selectByPublishList(publishList);
+            if (publishList.size() > 0) {
+                LOGGER.info("所有的publishId：++++++++++++" + publishList);
+                resultMap = articleChannelQueryMapper.selectByPublishList(publishList);
+            }
         }
         if (resultMap == null || resultMap.size() < 1) {
-            LOGGER.info("未查询到数据");
-            throw new BusinessException("文库暂没有文章！");
+            LOGGER.info("文库暂没有文章！");
+            return resultMap;
         }
         LOGGER.info("查询文库列表的业务层方法结束！");
         return resultMap;
@@ -639,22 +639,22 @@ public class LibraryServiceImpl implements LibraryService {
         LOGGER.info("推送文章的业务层方法开始！");
         LOGGER.info("推送文章的业务层方法中拿到的文章的articleId【{}】,publishId[{}],agentCode[{}],sendType[{}],partyId[{}]", new Object[]{articleId, publishId, agentCode, sendType, partyId});
         Message msg = new Message(true, "推送文章成功");
-        CmsSysUser userInfoDTO = null;
+//        CmsSysUser userInfoDTO = null;
         String companyId = null;
         String email = null;
         ArticlePublishSend aps = null;
         if (sendId != null) {
             aps = articlePublishSendMapper.selectByPrimaryKey(sendId);
-            String userId = aps.getOperateId();
-            CmsSysUserExample user = new CmsSysUserExample();
-            user.createCriteria().andUserIdEqualTo(userId);
-            userInfoDTO = cmsSysUserMapper.selectByExample(user).get(0);
+//            String userId = aps.getOperateId();
+//            CmsSysUserExample user = new CmsSysUserExample();
+//            user.createCriteria().andUserIdEqualTo(userId);
+//            userInfoDTO = cmsSysUserMapper.selectByExample(user).get(0);
 
         } else {
-            userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+//            userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
         }
-        companyId = userInfoDTO.getCompanyId();
-        email = userInfoDTO.getEmail();
+        companyId = "1";
+        email = "13152783264";
         CmsSysUser cmsSysUser = this.cmsSysUserExMapper.queryLoginInfoByEmail(email);
         String userId = cmsSysUser.getUserId();
         String sysUserName = cmsSysUser.getName();
@@ -859,9 +859,8 @@ public class LibraryServiceImpl implements LibraryService {
         LOGGER.info("查询文章列表总数的业务层方法开始！");
         LOGGER.info("拿到的参数 文章名称【{}】，一级分类【{}】，二级分类【{}】，文章状态【{}】", articelName,
                 special, channel, articleState);
-        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
-        String companyId = userInfoDTO.getCompanyId();// 公司id
-        String branchId = userInfoDTO.getBranchId();
+        String companyId = "1";// 公司id
+        String branchId = "86";
         CmsSysUserExample example = new CmsSysUserExample();
         CmsSysUserExample.Criteria criteria = example.createCriteria();
         criteria.andCompanyIdEqualTo(companyId);
@@ -896,8 +895,8 @@ public class LibraryServiceImpl implements LibraryService {
         parMap.put("userlist", userlist);
         List<HashMap<String, Object>> resultMap = articleChannelQueryMapper.selectCountByParam(parMap);
         if (resultMap == null || resultMap.size() < 1) {
-            LOGGER.info("未查询到数据【{}】", JsonUtil.objectToJackson(userInfoDTO));
-            throw new BusinessException("文库暂没有文章！");
+            LOGGER.info("文库暂没有文章！");
+            return 0;
         }
         LOGGER.info("查询文库列表的业务层方法结束！");
         return resultMap.size();
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleChannelQueryMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleChannelQueryMapper.xml
index a81e3ec68..28d3b0b15 100644
--- a/ruoyi-content/src/main/resources/mapper/content/ArticleChannelQueryMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/ArticleChannelQueryMapper.xml
@@ -154,7 +154,7 @@
 			IFNULL(l.ARTICLE_NAME,info.ARTICLE_NAME) "articleName",
 			group_concat(l.channel,"-",l.special separator ',') channelSpecial,
 			MAX(t.ARTICLE_VERSION),
-			max(concat(t.CREATE_DATE, ' ', T.CREATE_TIME)) publishDate,
+			max(concat(t.CREATE_DATE, ' ', t.CREATE_TIME)) publishDate,
 			max(concat(l.UPDATE_DATE, ' ', l.UPDATE_TIME)) updateDate,
 			t.PUBLISH_ID publishId,
 			(select min(f.PUBLISH_DATE) from article_publish_send f where f.PUBLISH_ID = t.PUBLISH_ID and f.SEND_STATE='2') oPbulishTime
@@ -301,7 +301,7 @@
 			IFNULL(l.ARTICLE_NAME,info.ARTICLE_NAME) "articleName",
 			group_concat(l.channel,"-",l.special separator ',') channelSpecial,
 			MAX(t.ARTICLE_VERSION),
-			max(concat(t.CREATE_DATE, ' ', T.CREATE_TIME)) publishDate,
+			max(concat(t.CREATE_DATE, ' ', t.CREATE_TIME)) publishDate,
 			max(concat(l.UPDATE_DATE, ' ', l.UPDATE_TIME)) updateDate,
 			t.PUBLISH_ID publishId
 		FROM
diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
new file mode 100644
index 000000000..3fb3e7124
--- /dev/null
+++ b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
@@ -0,0 +1,437 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('文库管理')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>文章名称：</label>
+                            <input type="text" name="articelName"/>
+                        </li>
+                        <li>
+                            <label style="width: 95px;">二级栏目名称：</label>
+                            <select name="channel" th:id="channel" onchange="autoChangeInitThirdType(value)">
+
+                            </select>
+                        </li>
+                        <li>
+                            <label style="width: 95px;">三级栏目名称：</label>
+                            <select name="articleThirdTypeInit" th:id="articleThirdTypeInit">
+
+                            </select>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-primary" onclick="">
+                <i class="fa fa-plus"></i> 批量收录
+            </a>
+            <a class="btn btn-danger single disabled" style="margin-left: 15px;" onclick="$.operate.edit()">
+                <i class="fa fa-remove"></i> 批量移除
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped" style="overflow-x: scroll;">
+            <table id="bootstrap-table" style="border-collapse: collapse;"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+
+    var path = ctx;
+    var prefix = ctx + "article";
+
+    var baseDataList = [];
+    var baseDataListSecond = [];
+    var cloumnTree = [];
+
+    $(function () {
+        setFirstQuery();
+        autoChangeInitType("ARTICLE");
+
+        var options = {
+            url: prefix + "/libraryArry",
+            createUrl: prefix + "/add",
+            updateUrl: prefix + "/edit/{id}",
+            removeUrl: prefix + "/remove",
+            exportUrl: prefix + "/export",
+            fixedColumns: true,
+            modalName: "文章",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'articleId',
+                    title: '文章ID',
+                    visible: false
+                },
+                {
+                    field: 'articleName',
+                    title: '文章名称'
+                },
+                {
+                    field: 'orderNo',
+                    title: '置顶状态',
+                    visible: false,
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        if (row.orderNo === '1') {
+                            actions.push('已置顶');
+                        }
+                        return actions.join('');
+                    }
+                },
+                {
+                    field: 'channelSpecial',
+                    title: '二级分类',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        var data = queryCnameBySpecialChannel(row.channelSpecial, "ARTICLE", "2");
+                        if (data == null) {
+                            actions.push('未收录');
+                        } else {
+                            actions.push(data);
+                        }
+                        return actions.join('');
+                    }
+                },
+                {
+                    field: 'channelSpecial',
+                    title: '三级分类',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        var data = queryCnameBySecAndThird(row.channelSpecial, "ARTICLE", "2");
+                        if (data === '') {
+                            actions.push('未收录');
+                        } else {
+                            actions.push(data);
+                        }
+                        return actions.join('');
+                    }
+                },
+                {
+                    field: 'articleVersion',
+                    title: '文章版本',
+                    visible: false
+                },
+                {
+                    field: 'articleState',
+                    title: '状态',
+                    visible: false,
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        if (row.articleState === '0') {
+                            actions.push('展示（已发布）');
+                        } else if (row.articleState === '2') {
+                            actions.push('未发布');
+                        } else {
+                            actions.push('');
+                        }
+                        return actions.join('');
+                    }
+                },
+                {
+                    field: 'createUser',
+                    title: '创建人',
+                    visible: false
+                },
+                {
+                    field: 'publishDate',
+                    title: '发布时间',
+                    width: '8',
+                    widthUnit: '%'
+                },
+                {
+                    field: 'updateDate',
+                    title: '更新时间',
+                    width: '8',
+                    widthUnit: '%'
+                },
+                {
+                    field: 'companyId',
+                    title: '公司id',
+                    visible: false
+                },
+                {
+                    field: 'publishId',
+                    title: '发布id',
+                    visible: false
+                },
+                {
+                    title: '推送个人（验证）',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.articleId + '\')">推送个人（验证）</a> ');
+                        return actions.join('');
+                    }
+                },
+                {
+                    title: '推送企业号',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.articleId + '\')">推送企业号</a>');
+                        return actions.join('');
+                    }
+                },
+                {
+                    title: '定时推送',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.articleId + '\')">定时推送</a> ');
+                        return actions.join('');
+                    }
+                },
+                {
+                    title: '展示链路',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-warning btn-xs" href="javascript:void(0)" onclick="articleLinkUrl(\'1\',\'' + row.articleId + '\',\'' + row.publishId + '\');"><i class="fa fa-clone"></i> 展示链路</a>');
+                        return actions.join('');
+                    }
+                },
+                {
+                    title: '预览文章',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="articleLinkUrl(\'' + row.articleId + '\',\'' + row.publishId + '\');"><i class="fa fa-eye"></i> 预览文章</a>');
+                        return actions.join('');
+                    }
+                },
+                {
+                    title: '删除',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="deleteArticle(\'' + row.publishId + '\');"><i class="fa fa-remove"></i> 删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+
+        cloumnTreeInit();
+    });
+
+    function queryCnameBySpecialChannel(id, type, num) {
+        if (baseDataListSecond == null) {
+            articleTypeInit(type, num);
+        }
+        if (id == null || id == "undefined") {
+            return "未收录"
+        }
+        var arr = id.split(",");
+        var returnValue = "";
+        var list = baseDataListSecond.length;
+        for (var j = 0; j < arr.length; j++) {
+            var arrVal = arr[j].split("-");
+            for (var i = 0; i < list; i++) {
+                if (arrVal[1] == "ARTICLE") {
+                    if (arrVal[0] == baseDataListSecond[i].codeCode) {
+                        if (returnValue.indexOf(baseDataListSecond[i].codeCname) == -1) {
+                            returnValue = returnValue + baseDataListSecond[i].codeCname + "  ";
+                        }
+                    }
+                } else {
+                    if (arrVal[1] == baseDataListSecond[i].codeCode) {
+                        if (returnValue.indexOf(baseDataListSecond[i].codeCname) == -1) {
+                            returnValue = returnValue + baseDataListSecond[i].codeCname + "  ";
+                        }
+                    }
+                }
+
+            }
+        }
+        return returnValue;
+    }
+
+    /** **查询公共数据** */
+    function articleTypeInit(type, num) {
+        $.ajax({
+            type: "post",
+            url: path + 'column/queryBasicData',
+            data: {
+                "bType": type
+            },
+            async: false,
+            success: function (data) {
+                if (data.result) {// 跳转到列表页面
+                    if (num == "1") {
+                        baseDataList = data.object.baseList;
+                    } else {
+                        baseDataListSecond = data.object.baseList;
+                    }
+                } else {
+
+                }
+            }
+        });
+    }
+
+    //二三级菜单名称显示
+    function queryCnameBySecAndThird(id) {
+        if (cloumnTree == null || cloumnTree.length == 0) {
+            cloumnTreeInit();
+        }
+        var child = [];
+        if (id == null || id == "undefined") {
+            return "未收录"
+        }
+        var arr = id.split(",");
+        var list = cloumnTree.length;
+        var returnValue = "";
+        for (var k = 0; k < arr.length; k++) {
+            var arrVal = arr[k];
+            if (arrVal.indexOf("ARTICLE") == -1) {
+                var split = arrVal.split("-");
+                for (var i = 0; i < list; i++) {
+                    child = cloumnTree[i].child;
+                    for (var j = 0; j < child.length; j++) {
+                        if (child[j].codeCode == split[0]) {
+                            if (returnValue.indexOf(cloumnTree[i].codeCname + "-" + child[j].codeCname) == -1) {
+                                returnValue = returnValue + cloumnTree[i].codeCname + "-" + child[j].codeCname + "  ";
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return returnValue;
+    }
+
+    function cloumnTreeInit() {
+        $.ajax({
+            url: prefix + "/columnTree",
+            data: {
+                codeCode: "ARTICLE"
+            },
+            dataType: "json",
+            async: false,
+            type: "get",
+            cache: false,
+            success: function (data) {
+                cloumnTree = data.object.columnList[0].child
+            }
+        });
+    }
+
+    //给一级搜索框赋值
+    function setFirstQuery() {
+        articleTypeInit("FIRST_COLUMN", "1")
+        // $("#special option").remove();
+        // var obj = baseDataList;
+        // var secondObj;
+        // $("#special").append("<option value=''>请选择</option>");
+        // for (var i = 0; i < obj.length; i++) {
+        //     if (obj[i].codeCode == "ARTICLE") {
+        //         $("#special").append("<option value='" + obj[i].codeCode + "'>" + obj[i].codeCname + "</option>");
+        //     }
+        // }
+    }
+
+    //搜索时根据选择的一级分类加载二级分类
+    function autoChangeInitType(value) {
+        articleTypeInit(value, "2");
+        $("#channel option").remove();
+        var obj = baseDataListSecond;
+        $("#channel").append("<option value=''>请选择</option>");
+        for (var i = 0; i < obj.length; i++) {
+            $("#channel").append("<option value='" + obj[i].codeCode + "'>" + obj[i].codeCname + "</option>");
+        }
+    }
+
+    //选择二级加载三级
+    function autoChangeInitThirdType(value) {
+        $("#articleThirdTypeInit option").remove();
+        var obj = cloumnTree;
+        $("#articleThirdTypeInit").append("<option value=''>请选择</option>");
+        for (var i = 0; i < obj.length; i++) {
+            if (obj[i].codeCode == value) {
+                var children = obj[i].child;
+                for (var j = 0; j < children.length; j++) {
+                    $("#articleThirdTypeInit").append("<option value='" + children[j].codeCode + "'>" + obj[i].codeCname + "-" + children[j].codeCname + "</option>");
+                }
+                return;
+            }
+        }
+    }
+
+    /** **获取文章推送链接** */
+    function articleLinkUrl(sendType, articleId, publishId, agentCode, partyId) {
+        $.ajax({
+            url: path + "article/articleSend",
+            data: {
+                "articleId": articleId,
+                "publishId": publishId,
+                "agentCode": agentCode,
+                "sendType": sendType,
+                "partyId": partyId
+            },
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
+                if (data.result) {
+                    if (sendType == "0") {
+                        $.modal.alertSuccess("文章推送成功");
+                    }
+                    if (sendType == "1") {
+                        $.modal.alertSuccess(data.object);
+                    }
+                } else {
+                    $.modal.alertWarning(data.info);
+                }
+
+            },
+            error: function (textStatus, e) {
+
+            }
+        });
+
+    }
+
+    function deleteArticle(id) {
+        $.ajax({
+            url: prefix + "/delLibrary",
+            data: {
+                ids: id
+            },
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
+                if (data.result) {
+                    $.modal.alertSuccess("删除成功！");
+                    $.table.search();
+                } else {
+                    $.modal.alertSuccess("删除失败！");
+                }
+            },
+            error: function (textStatus, e) {
+                $.modal.alertSuccess('系统异常,请稍后重试!');
+            }
+        });
+    }
+
+</script>
+</body>
+</html>
\ No newline at end of file

From 777fc2b301a2961e4dfab3585fbe5858bafe78ef Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Tue, 30 Mar 2021 18:05:55 +0800
Subject: [PATCH 15/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/BaseCodeController.java        |  26 +-
 .../controller/LibraryManageController.java   |   8 +-
 .../ruoyi/content/service/LibraryService.java |   3 +-
 .../service/impl/ArticleServiceImpl.java      |   2 +-
 .../service/impl/LibraryServiceImpl.java      |  17 +-
 .../content/article/articleManage.html        | 546 +++++++++++++++++-
 .../content/picAdverts/picAdverts.html        |   2 +-
 7 files changed, 571 insertions(+), 33 deletions(-)

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
index 0941d928e..398763425 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
@@ -268,6 +268,7 @@ public class BaseCodeController extends BaseController {
         Map<String, Object> policyMap = new HashMap<String, Object>();
         String codeCode = request.getParameter("codeCode");
         String codeType = request.getParameter("codeType");
+        String flag = request.getParameter("flag");
         // 查询栏目树
         List<BaseCodeTree> columnList = baseCodeService.columnTree(codeCode, codeType);
 //        policyMap.put("columnList", columnList);
@@ -275,19 +276,28 @@ public class BaseCodeController extends BaseController {
 //        msg.setObject(policyMap);
 //        msg.setResult(true);
 
-        return initZtree(columnList);
+        return initZtree(columnList, flag);
     }
 
-    public List<Ztree> initZtree(List<BaseCodeTree> deptList) {
+    public List<Ztree> initZtree(List<BaseCodeTree> deptList, String flag) {
 
         List<Ztree> ztreeList = new ArrayList<>();
         if (deptList != null && deptList.size() > 0) {
-            Ztree z = new Ztree();
-            z.setId("FIRST_COLUMN");
-            z.setpId("");
-            z.setName("栏目");
-            z.setTitle("栏目");
-            ztreeList.add(z);
+            if (StringUtils.isBlank(flag)) {
+                Ztree z = new Ztree();
+                z.setId("FIRST_COLUMN");
+                z.setpId("");
+                z.setName("栏目");
+                z.setTitle("栏目");
+                ztreeList.add(z);
+            } else if (StringUtils.equals(flag, "1")) {
+                Ztree z = new Ztree();
+                z.setId("ARTICLE");
+                z.setpId("");
+                z.setName("文库");
+                z.setTitle("文库");
+                ztreeList.add(z);
+            }
             for (BaseCodeTree dept : deptList) {
                 Ztree ztree = new Ztree();
                 ztree.setId(dept.getCodeCode());
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java
index ee325ab56..58eb2d3b3 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/LibraryManageController.java
@@ -1,6 +1,7 @@
 package com.ruoyi.content.controller;
 
 
+import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.page.PageDomain;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.page.TableSupport;
@@ -31,7 +32,7 @@ import java.util.*;
  */
 @Controller
 @RequestMapping("/article")
-public class LibraryManageController {
+public class LibraryManageController extends BaseController {
 
     private String prefix = "content/article";
 
@@ -462,10 +463,10 @@ public class LibraryManageController {
      */
     @RequestMapping("/noSendPublishArticle")
     @ResponseBody
-    public PageDTO noSendPublishArticle(HttpServletRequest request, HttpServletResponse response) {
+    public TableDataInfo noSendPublishArticle(HttpServletRequest request, HttpServletResponse response) {
         logger.info("查询未推送出去的文章列表！");
         Thread.currentThread().setName(UUID.randomUUID().toString());
-        PageDTO pageDTO = new PageDTO();
+        TableDataInfo pageDTO = new TableDataInfo();
         try {
             String rowsVal = request.getParameter("rows");
             String page = request.getParameter("page");
@@ -475,7 +476,6 @@ public class LibraryManageController {
             String publishId = request.getParameter("publishId");
             // 1.根据文章id去查publish表，找出该文章对应所有业务员
             pageDTO = libraryService.noSendPublishArticle(articleId, startRow, rows, publishId);
-            pageDTO.setPage(Integer.parseInt(page));
 
             return pageDTO;
         } catch (Exception e) {
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java
index 934f8ef71..d3aa1f87f 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/LibraryService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.content.service;
 
 
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.content.domain.BaseCode;
 import com.ruoyi.content.domain.PageDTO;
 import com.ruoyi.content.message.Message;
@@ -127,7 +128,7 @@ public interface LibraryService {
 
     public Message onkeyExChange(String from, String to, String companyId, String branchId);
 
-    public PageDTO noSendPublishArticle(String articleId, int startRow, int rows, String publishId);
+    public TableDataInfo noSendPublishArticle(String articleId, int startRow, int rows, String publishId);
 
     public Message delOnTimeTask(String delId);
 
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
index 668360fb5..b8d2e3e01 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
@@ -66,7 +66,7 @@ public class ArticleServiceImpl implements ArticleService {
                 originalUrl, createUser, author, ids, isAuthorization, isReserve, automaticName, introduction,
                 isJoinActive);
         String companyId = "1";// 渠道id
-        String email = "";
+        String email = "13152783264";
         // 根据登录人查询登录信息（shiro里有缓存数据不是最新）
         CmsSysUser cmsSysUser = cmsSysUserExMapper.queryLoginInfoByEmail(email);
         // 此时后台管理员
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
index 0414a29e0..d52676a80 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
@@ -1,10 +1,12 @@
 package com.ruoyi.content.service.impl;
 
 
+import com.github.pagehelper.PageInfo;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
+import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.content.constants.PropertiesConstants;
 import com.ruoyi.content.domain.*;
 import com.ruoyi.content.exception.BusinessException;
@@ -962,9 +964,7 @@ public class LibraryServiceImpl implements LibraryService {
         LOGGER.info("接收到的参数：articleId【{}】,publishId[{}],agentCode[{}],sendType[{}],partyId[{}],sendTime[{}]",
                 new Object[]{articleId, publishId, agentCode, sendType, partyId, sendTime});
         Message msg = new Message(true, "推送文章成功");
-        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
-        String companyId = userInfoDTO.getCompanyId();
-        String email = userInfoDTO.getEmail();
+        String email = "13152783264";
         CmsSysUser cmsSysUser = this.cmsSysUserExMapper.queryLoginInfoByEmail(email);
         String userId = cmsSysUser.getUserId();
         String sysUserName = cmsSysUser.getName();
@@ -1019,7 +1019,7 @@ public class LibraryServiceImpl implements LibraryService {
     }
 
     @Override
-    public PageDTO noSendPublishArticle(String articleId, int startRow, int rows, String publishId) {
+    public TableDataInfo noSendPublishArticle(String articleId, int startRow, int rows, String publishId) {
         LOGGER.info("查询未定时推送的文章列表，入参   articleId：【{}】，startRow：【{}】，rows：【{}】，publishId【{}】"
                 , articleId, startRow, rows, publishId);
         HashMap<String, Object> paramMap = new HashMap<>();
@@ -1066,11 +1066,10 @@ public class LibraryServiceImpl implements LibraryService {
         ArticlePublishSendExample ex = new ArticlePublishSendExample();
         ex.createCriteria().andArticleIdEqualTo(Integer.parseInt(articleId)).andPublishIdEqualTo(publishId);
         int count = articlePublishSendMapper.countByExample(ex);
-        PageDTO pageDTO = new PageDTO();
-        pageDTO.setStartRow(startRow);
-        pageDTO.setDataRows(resultDTO);
-        pageDTO.setTotal(count % rows == 0 ? count / rows : (count / rows + 1));
-        pageDTO.setRecords(count);
+        TableDataInfo pageDTO = new TableDataInfo();
+        pageDTO.setCode(0);
+        pageDTO.setRows(resultDTO);
+        pageDTO.setTotal(count);
         return pageDTO;
     }
 
diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
index 3fb3e7124..5f02fa4bb 100644
--- a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
+++ b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
@@ -2,7 +2,15 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
     <th:block th:include="include :: header('文库管理')"/>
+    <th:block th:include="include :: layout-latest-css"/>
+    <th:block th:include="include :: ztree-css"/>
+    <th:block th:include="include :: datetimepicker-css"/>
 </head>
+<style>
+    #tree_1_check {
+        display: none;
+    }
+</style>
 <body class="gray-bg">
 <div class="container-div">
     <div class="row">
@@ -38,19 +46,144 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-primary" onclick="">
+            <a class="btn btn-primary" onclick="includeArticle(1)">
                 <i class="fa fa-plus"></i> 批量收录
             </a>
-            <a class="btn btn-danger single disabled" style="margin-left: 15px;" onclick="$.operate.edit()">
+            <a class="btn btn-danger single disabled" style="margin-left: 15px;" onclick="includeArticle(2)">
                 <i class="fa fa-remove"></i> 批量移除
             </a>
+            <a class="btn btn-success single disabled" style="margin-left: 15px;" onclick="includeArticle(2)">
+                <i class="fa fa-newspaper-o"></i> 创建文章
+            </a>
         </div>
-        <div class="col-sm-12 select-table table-striped" style="overflow-x: scroll;">
-            <table id="bootstrap-table" style="border-collapse: collapse;"></table>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<div class="modal inmodal" id="myModal1" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" style="width: 500px;">
+        <div class="modal-content animated fadeIn">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5; padding: 15px 15px;">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left; font-size: 23px;">批量收录</h5>
+            </div>
+            <div class="modal-body" style="background: #ffffff;">
+                <form class="form-horizontal m" id="form-picAdverts-add">
+                    <div class="col-md-12" style="margin-top: -15px;">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">专栏选择：</label>
+                            <div class="col-sm-6">
+                                <div id="tree" class="ztree"></div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
+                <button type="button" class="btn btn-white" data-dismiss="modal" th:id="modalColse">关闭</button>
+                <button type="button" class="btn btn-primary" th:id="sure">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal inmodal" id="myModal2" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" style="width: 500px;">
+        <div class="modal-content animated fadeIn">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5; padding: 15px 15px;">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left; font-size: 23px;">推送文章</h5>
+            </div>
+            <div class="modal-body" style="background: #ffffff;">
+                <form class="form-horizontal m" id="form-picAdverts-add1">
+                    <div class="col-md-12" style="margin-top: -15px;">
+                        <div class="form-group" th:id="companyChoice">
+                            <label class="col-sm-4 control-label is-required">公司：</label>
+                            <div class="col-sm-6">
+                                <select class="form-control" th:id="partyId" name="partyId"></select>
+                            </div>
+                        </div>
+                        <div class="form-group" th:id="agentCodeText">
+                            <label class="col-sm-4 control-label is-required">工号：</label>
+                            <div class="col-sm-6">
+                                <input name="jobNumber" th:id="jobNumber" class="form-control" type="text">
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
+                <button type="button" class="btn btn-white" data-dismiss="modal" th:id="modalColse">关闭</button>
+                <button type="button" class="btn btn-primary" th:onclick="sendMsg()">确定</button>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="modal inmodal" id="myModal3" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" style="width: 800px;">
+        <div class="modal-content animated fadeIn">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5; padding: 15px 15px;">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left; font-size: 23px;">定时推送</h5>
+            </div>
+            <div class="modal-body" style="background: #ffffff;">
+                <form class="form-horizontal m" id="form-picAdverts-add2">
+                    <div class="col-md-12" style="margin-top: -15px;">
+                        <div class="form-group">
+                            <div class="col-sm-12" style="text-align: center;">
+                                <input type="radio" th:id="c1" th:name="sendCheck" th:value="0" th:checked="true"
+                                       style="vertical-align: middle; margin-bottom: 6px; margin-right: 5px;"
+                                       th:onclick="changeState()">
+                                <label th:for="c1" th:text="推送企业" style="margin-right: 15px;"
+                                       th:onclick="changeState()"></label>
+                                <input type="radio" th:id="c2" th:name="sendCheck" th:value="1"
+                                       style="vertical-align: middle; margin-bottom: 6px; margin-right: 5px;"
+                                       th:onclick="changeState()">
+                                <label th:for="c2" th:text="推送个人" th:onclick="changeState()"></label>
+                            </div>
+                        </div>
+                        <div class="form-group" th:id="companyChoice1">
+                            <label class="col-sm-4 control-label is-required">公司：</label>
+                            <div class="col-sm-6">
+                                <select class="form-control" th:id="partyId1" name="partyId1"></select>
+                            </div>
+                        </div>
+                        <div class="form-group" th:id="agentCodeText1" style="display: none;">
+                            <label class="col-sm-4 control-label is-required">工号：</label>
+                            <div class="col-sm-6">
+                                <input name="jobNumber1" th:id="jobNumber1" class="form-control" type="text">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">发送时间：</label>
+                            <div class="input-group date col-sm-6">
+                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                <input type="text" class="form-control" id="laydate-demo-3">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-md-12" style="margin-top: -15px;">
+                        <table id="bootstrap-table1"></table>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
+                <button type="button" class="btn btn-white" data-dismiss="modal" th:id="modalColse">关闭</button>
+                <button type="button" class="btn btn-primary" th:onclick="onTimeSend()">确定</button>
+            </div>
         </div>
     </div>
 </div>
 <th:block th:include="include :: footer"/>
+<th:block th:include="include :: layout-latest-js"/>
+<th:block th:include="include :: ztree-js"/>
+<th:block th:include="include :: datetimepicker-js"/>
 <script th:inline="javascript">
 
     var path = ctx;
@@ -59,18 +192,24 @@
     var baseDataList = [];
     var baseDataListSecond = [];
     var cloumnTree = [];
+    var article;
+    var publish;
+    var number;
 
     $(function () {
         setFirstQuery();
         autoChangeInitType("ARTICLE");
 
         var options = {
+            id: "bootstrap-table",
             url: prefix + "/libraryArry",
             createUrl: prefix + "/add",
             updateUrl: prefix + "/edit/{id}",
             removeUrl: prefix + "/remove",
             exportUrl: prefix + "/export",
             fixedColumns: true,
+            toolbar: 'toolbar',
+            uniqueId: "articleId",
             modalName: "文章",
             columns: [{
                 checkbox: true
@@ -177,7 +316,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.articleId + '\')">推送个人（验证）</a> ');
+                        actions.push('<a class="btn btn-success btn-xs" onclick="sendMsgModal(\'' + row.publishId + '\',\'' + row.articleId + '\',\'1\')">推送个人（验证）</a> ');
                         return actions.join('');
                     }
                 },
@@ -186,7 +325,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.articleId + '\')">推送企业号</a>');
+                        actions.push('<a class="btn btn-primary btn-xs" onclick="sendMsgModal(\'' + row.publishId + '\',\'' + row.articleId + '\',\'2\')">推送企业号</a>');
                         return actions.join('');
                     }
                 },
@@ -195,7 +334,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.articleId + '\')">定时推送</a> ');
+                        actions.push('<a class="btn btn-info btn-xs" onclick="sendMsgModal(\'' + row.publishId + '\',\'' + row.articleId + '\',\'3\')">定时推送</a> ');
                         return actions.join('');
                     }
                 },
@@ -213,7 +352,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="articleLinkUrl(\'' + row.articleId + '\',\'' + row.publishId + '\');"><i class="fa fa-eye"></i> 预览文章</a>');
+                        actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="loadPreviewData(\'' + row.publishId + '\');"><i class="fa fa-eye"></i> 预览文章</a>');
                         return actions.join('');
                     }
                 },
@@ -230,6 +369,18 @@
         $.table.init(options);
 
         cloumnTreeInit();
+        ldcomList();
+
+        layui.use('laydate', function () {
+            var laydate = layui.laydate;
+
+            laydate.render({
+                elem: '#laydate-demo-3',
+                type: 'datetime',
+                trigger: 'click'
+            });
+
+        });
     });
 
     function queryCnameBySpecialChannel(id, type, num) {
@@ -377,6 +528,7 @@
 
     /** **获取文章推送链接** */
     function articleLinkUrl(sendType, articleId, publishId, agentCode, partyId) {
+        $.modal.loading("努力加载中。。。");
         $.ajax({
             url: path + "article/articleSend",
             data: {
@@ -406,7 +558,7 @@
 
             }
         });
-
+        $.modal.closeLoading();
     }
 
     function deleteArticle(id) {
@@ -432,6 +584,382 @@
         });
     }
 
+    function includeArticle(num) {
+        let arrays = $.table.selectColumns("articleId");
+        if (arrays.length > 0) {
+            //移除绑定事件
+            $('#sure').unbind('click');
+            $('#myModal1').modal('show');
+            const url = ctx + "column/columnTree?codeType=ARTICLE&flag=1";
+            let options = {
+                url: url,
+                expandLevel: 1,                // 展开等级节点
+                view: {
+                    selectedMulti: true,      // 设置是否允许同时选中多个节点
+                    nameIsHTML: true           // 设置 name 属性是否支持 HTML 脚本
+                },
+                check: {
+                    enable: true,             // 置 zTree 的节点上是否显示 checkbox / radio
+                    nocheckInherit: true      // 设置子节点是否自动继承
+                }
+                // onClick: zOnClick
+            };
+            $.tree.init(options);
+            //绑定事件
+            $('#sure').bind('click', function () {
+                if (num === 2) {
+                    removeArticle();
+                } else {
+                    include();
+                }
+            });
+        } else {
+            $.modal.alertWarning('请选择至少一条数据！');
+        }
+        return;
+    }
+
+    function include() {
+        let channel = '';
+        let idNodes = $.tree.getCheckedNodes('id');
+        if (idNodes === '') {
+            $.modal.alertWarning('请选择至少一个栏目！');
+            return;
+        }
+        let pidNodes = $.tree.getCheckedNodes('pId');
+        let channel1 = idNodes.split(',');
+        let channel2 = pidNodes.split(',');
+        for (let i = 1; i < channel1.length; i++) {
+            if (channel === '') {
+                channel = channel2[i - 1] + '-' + channel1[i];
+            } else {
+                channel = channel + ',' + channel2[i - 1] + '-' + channel1[i];
+            }
+        }
+        let arrays = $.table.selectColumns('articleId');
+        let ids = [];
+        for (let i = 0; i < arrays.length; i++) {
+            let item = {
+                "articleId": '',
+                "articleName": '',
+                "originalUrl": '',
+                "publishId": ''
+            }
+            let rowData = $("#" + table.options.id).bootstrapTable('getRowByUniqueId', arrays[i]);
+            item.articleId = rowData.articleId;
+            item.articleName = rowData.articleName;
+            item.originalUrl = rowData.originalUrl;
+            item.publishId = rowData.publishId;
+            ids.push(item);
+        }
+        $.ajax({
+            url: path + "article/addLibrary",
+            data: {
+                "channelId": channel,
+                "articleInfo": JSON.stringify(ids)
+            },
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
+                $.modal.closeLoading();
+                if (data.result) {
+                    $.modal.alertSuccess("收录成功！请到文库管理查看");
+                    $.table.search();
+                } else {
+                    $.modal.alertWarning(data.info);
+                }
+            },
+            error: function (textStatus, e) {
+                $.modal.closeLoading();
+                $.modal.alertError('系统异常,请稍后重试!');
+            }
+        });
+        $('#myModal1').modal('hide');
+        $.modal.loading('正在收录，请稍等！');
+    }
+
+    function removeArticle() {
+        let channel = '';
+        let idNodes = $.tree.getCheckedNodes('id');
+        if (idNodes === '') {
+            $.modal.alertWarning('请选择至少一个栏目！');
+            return;
+        }
+        let pidNodes = $.tree.getCheckedNodes('pId');
+        let channel1 = idNodes.split(',');
+        let channel2 = pidNodes.split(',');
+        for (let i = 1; i < channel1.length; i++) {
+            if (channel === '') {
+                channel = channel2[i - 1] + '-' + channel1[i];
+            } else {
+                channel = channel + ',' + channel2[i - 1] + '-' + channel1[i];
+            }
+        }
+        let arrays = $.table.selectColumns('articleId');
+        let ids = [];
+        for (let i = 0; i < arrays.length; i++) {
+            let item = {
+                "articleId": '',
+                "articleName": '',
+                "originalUrl": '',
+                "publishId": ''
+            }
+            let rowData = $("#" + table.options.id).bootstrapTable('getRowByUniqueId', arrays[i]);
+            item.articleId = rowData.articleId;
+            item.articleName = rowData.articleName;
+            item.originalUrl = rowData.originalUrl;
+            item.publishId = rowData.publishId;
+            ids.push(item);
+        }
+        $.ajax({
+            url: path + "article/removeArticleItem",
+            data: {
+                "channelId": channel,
+                "articleInfo": JSON.stringify(ids)
+            },
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
+                $.modal.closeLoading();
+                if (data.result) {
+                    $.modal.alertSuccess("移除成功！请到文库管理查看");
+                    $.table.search();
+                } else {
+                    $.modal.alertWarning(data.info);
+                }
+            },
+            error: function (textStatus, e) {
+                $.modal.closeLoading();
+                $.modal.alertError('系统异常,请稍后重试!');
+            }
+        });
+        $('#myModal1').modal('hide');
+        $.modal.loading('正在移除，请稍等！');
+    }
+
+    function sendMsgModal(publishId, articleId, num) {
+        number = num;
+        publish = publishId;
+        article = articleId;
+        if (num === '1') {
+            $("#jobNumber").val('');
+            $('#agentCodeText').css('display', 'block');
+            $('#companyChoice').css('display', 'none');
+            $('#myModal2').modal('show');
+        } else if (num === '2') {
+            $('#agentCodeText').css('display', 'none');
+            $('#companyChoice').css('display', 'block');
+            $('#myModal2').modal('show');
+        } else {
+            showSendMsg();
+            // $('#myModal3 ins').bind('click', function () {
+            //     changeState();
+            // });
+            $('#myModal3').modal('show');
+        }
+    }
+
+    function sendMsg() {
+        if (number === '1') {
+            let agentCode = $("#jobNumber").val();
+            if (agentCode == '' || agentCode == null) {
+                $.modal.alertError('请填写工号!');
+                return;
+            }
+            articleLinkUrl("0", article, publish, agentCode, null);
+        } else {
+            let partyId = $("#partyId").val();
+            articleLinkUrl("0", article, publish, null, partyId);
+        }
+    }
+
+    function ldcomList() {
+        $("#partyId option").remove();
+        $.ajax({
+            type: "post",
+            url: path + 'ldcom/queryldcomList',
+            data: {},
+            async: false,
+            success: function (data) {
+                let obj = data.object.ldcomList;
+                for (let i = 0; i < obj.length; i++) {
+                    $("#partyId").append(
+                        "<option value='" + obj[i].partyId + "'>"
+                        + obj[i].shortname + "</option>");
+                    $("#partyId1").append(
+                        "<option value='" + obj[i].partyId + "'>"
+                        + obj[i].shortname + "</option>");
+                }
+
+            }
+
+        })
+    }
+
+    function showSendMsg() {
+        let options = {
+            id: "bootstrap-table1",
+            url: prefix + "/noSendPublishArticle",
+            modalName: "定时推送信息",
+            paginationLoop: true,
+            toolbar: null,
+            queryParams: {
+                articleId: article,
+                publishId: publish,
+                page: '1',
+                rows: '1000'
+            },
+            columns: [
+                {
+                    field: 'id',
+                    title: '任务id',
+                    visible: false
+                },
+                {
+                    field: 'operateName',
+                    title: '操作人员'
+                },
+                {
+                    field: 'operateTime',
+                    title: '操作时间'
+                },
+                {
+                    field: 'groupId',
+                    title: '推送id'
+                },
+                {
+                    field: 'sendType',
+                    title: '推送类型'
+                },
+                {
+                    field: 'publishTime',
+                    title: '推送时间'
+                },
+                {
+                    field: 'sendState',
+                    title: '状态'
+                },
+                {
+                    title: '删除',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="removeSendMsg(\'' + row.id + '\');"><i class="fa fa-remove"></i> 删除</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    }
+
+    function removeSendMsg(id) {
+        $.ajax({
+            url: prefix + "/delOnTimeTask",
+            data: {
+                delId: id
+            },
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
+                if (data.result) {
+                    $.modal.alertSuccess("删除成功！");
+                    $.table.search('', 'bootstrap-table1')
+                } else {
+                    $.modal.alertError("删除失败！");
+                }
+            },
+        });
+    }
+
+    function changeState() {
+        let code = $("input[name='sendCheck']:checked").val();
+        if (code == '1') {
+            $('#agentCodeText1').css('display', 'block');
+            $('#companyChoice1').css('display', 'none');
+        } else {
+            $('#agentCodeText1').css('display', 'none');
+            $('#companyChoice1').css('display', 'block');
+        }
+    }
+
+    function onTimeSend() {
+        var partyId = $("#partyId1").val();
+        var agentCode = $("#jobNumber1").val();
+        var sendTime = $("#laydate-demo-3").val();
+        var sendTimeType = $("input[name='sendCheck']:checked").val();
+
+        if ((partyId == '' || partyId == null) && (agentCode == '' || agentCode == null)) {
+            $.modal.alertError('请选择公司或填写推送人工号!');
+        } else if (sendTime == '' || sendTime == null) {
+            $.modal.alertError('请选择填写推送时间!');
+        }
+        var strtime = sendTime.replace("/-/g", "/");//时间转换
+        //时间
+        var date1 = new Date(strtime);
+        //现在时间
+        var date2 = new Date();
+        if (date1 < date2) {
+            $.modal.alertError('请选择非过期时间!');
+        } else {
+            onTimeSendLinkUrl(article, publish, partyId, agentCode, sendTime, sendTimeType);
+        }
+    }
+
+    /** **定时推送文章请求接口** */
+    function onTimeSendLinkUrl(articleId, publishId, partyId, agentCode, sendTime, sendTimeType) {
+        $.ajax({
+            url: prefix + "/onTimeSend",
+            data: {
+                "articleId": articleId,
+                "publishId": publishId,
+                "agentCode": agentCode,
+                "sendType": sendTimeType,
+                "partyId": partyId,
+                "sendTime": sendTime
+            },
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
+                if (data.result) {
+                    $.modal.alertSuccess("文章定时推送设置成功");
+                    $('#myModal3').modal('hide');
+                } else {
+                    $.modal.alertError(data.info);
+                }
+            },
+            error: function (textStatus, e) {
+
+            }
+        });
+    }
+
+    function loadPreviewData(id) {
+        $.ajax({
+            url : prefix + "/preview",
+            data : {
+                "publishId" : id
+            },
+            dataType : "json",
+            type : "post",
+            cache : false,
+            success : function(data) {
+                if (data.result) {
+                    $.modal.open('文章预览', data.object.editUrl)
+
+                }else{
+                    $.modal.alertError("预览失败，请稍后重试！");
+                }
+            },
+            error : function(textStatus, e) {
+                $.modal.alertError('系统异常,请稍后重试!');
+            }
+        });
+    }
+
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html
index dd80c88d3..422067c28 100644
--- a/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html
+++ b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
     <th:block th:include="include :: header('图片广告列表')"/>
 </head>

From 1dbbb76eb39df523300f26b4ac96347e16bc285d Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Thu, 1 Apr 2021 10:06:29 +0800
Subject: [PATCH 16/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constants/PropertiesConstants.java        |  13 +-
 .../controller/AdvertisementController.java   |  30 ++-
 .../controller/ArticleManageController.java   |   6 +-
 .../controller/BaseCodeController.java        | 165 +++---------
 .../com/ruoyi/content/domain/ZtreeDto.java    | 107 ++++++++
 .../content/mapper/BaseCodeExMapper.java      |   4 +
 .../content/service/BaseCodeService.java      |   4 +-
 .../service/ICmsArticleAdInfoService.java     |   3 +
 .../service/impl/BaseCodeServiceImpl.java     |  88 ++++--
 .../impl/CmsArticleAdInfoServiceImpl.java     |  13 +
 .../mapper/content/BaseCodeExMapper.xml       |  45 ++++
 .../templates/content/adverts/adverts.html    |   2 +-
 .../content/article/articleManage.html        | 254 +++++++++++++++++-
 .../templates/content/column/column.html      |   3 +-
 .../templates/content/gallery/gallery.html    |   2 +-
 .../templates/content/gallery/list.html       |   2 +-
 .../content/picAdverts/picAdverts.html        |   2 +-
 17 files changed, 563 insertions(+), 180 deletions(-)
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ZtreeDto.java

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java b/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java
index 6de0cbd01..9abf1ddaa 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java
@@ -7,11 +7,16 @@ package com.ruoyi.content.constants;
  */
 public class PropertiesConstants {
 
-    public static final String TEMPLATE_VIEW_PATH = "/WEB-INF/static/template/view.flt";
-    public static final String TEMPLATE_EDIT_PATH = "/WEB-INF/static/template/edit.flt";
+//    public static final String TEMPLATE_VIEW_PATH = "/WEB-INF/static/template/view.flt";
+//    public static final String TEMPLATE_EDIT_PATH = "/WEB-INF/static/template/edit.flt";
+//
+//    public static final String FILE_PATH = "/app/contentMKTCms/webapp/WEB-INF/static/";
+//    public static final String PROJECT_LOCALPATH = "/app/contentMKTCms/webapp";
+    public static final String TEMPLATE_VIEW_PATH = "view.flt";
+    public static final String TEMPLATE_EDIT_PATH = "edit.flt";
 
-    public static final String FILE_PATH = "/app/contentMKTCms/webapp/WEB-INF/static/";
-    public static final String PROJECT_LOCALPATH = "/app/contentMKTCms/webapp";
+    public static final String FILE_PATH = "/Users/liushenlu/Desktop/";
+    public static final String PROJECT_LOCALPATH = "/Users/liushenlu/Desktop";
     public static final String ONLINE_IMG_PATH = "network/article/";
     public static final String OSS_URL = "http://cdn.sinosoftec.com/";
     public static final String OSS_URL_HTTPS = "https://cdn.sinosoftec.com/";
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java
index 4d1dc1447..348c9d124 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/AdvertisementController.java
@@ -6,7 +6,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.content.domain.ArticleAdInfo;
 import com.ruoyi.content.domain.CmsArticleAdInfo;
+import com.ruoyi.content.message.Message;
 import com.ruoyi.content.service.ICmsArticleAdInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -14,7 +16,9 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.*;
 
 /**
  * 文章广告Controller
@@ -36,6 +40,30 @@ public class AdvertisementController extends BaseController {
         return prefix + "/adverts";
     }
 
+    /**
+     * 查询所有广告列表（本程序调用）
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping("/queryAdvertisements")
+    @ResponseBody
+    public Message queryAdvertisements(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        Thread.currentThread().setName(UUID.randomUUID().toString());
+        Message msg = new Message();
+        Map<String, Object> adMap = new HashMap<>();
+        String companyId = "1";
+        // 广告列表信息
+        List<ArticleAdInfo> advertiseAdList = cmsArticleAdInfoService.queryAdByCompanyId(companyId);
+        adMap.put("advertiseAdList", advertiseAdList);
+        msg.setInfo("成功");
+        msg.setObject(adMap);
+        msg.setResult(true);
+        return msg;
+    }
+
     /**
      * 查询文章广告列表
      */
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
index c489332e2..c3d3ff2dd 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
@@ -151,13 +151,15 @@ public class ArticleManageController extends BaseController {
         Thread.currentThread().setName(UUID.randomUUID().toString());
         Message msg = new Message();
         logger.info("通过文章链接获取文章内容控制层方法开始");
-        String createUser = request.getParameter("createUser");
+//        String createUser = request.getParameter("createUser");
+        String createUser = "13152783264";
         if (StringUtils.isBlank(createUser)) {
             logger.info("用户已离线");
             throw new BusinessException("通过文章链接获取文章内容,用户已离线");
         }
         String originalUrl = request.getParameter("originalUrl"); // 文章连接,如果是通过连接导入文章,则必传
-        String author = request.getParameter("author"); // 作者
+//        String author = request.getParameter("author"); // 作者
+        String author = "13152783264";
         String ids = request.getParameter("ids"); // 广告ids
         String isAuthorization = request.getParameter("isAuthorization"); // 是否授权
         String isReserve = request.getParameter("isReserve"); // 是否预约
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
index 398763425..72ae5809a 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/BaseCodeController.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.content.domain.BaseCode;
 import com.ruoyi.content.domain.BaseCodeTree;
+import com.ruoyi.content.domain.ZtreeDto;
 import com.ruoyi.content.message.Message;
 import com.ruoyi.content.service.BaseCodeService;
 import com.ruoyi.content.utils.DateUtil;
@@ -20,7 +21,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.Serializable;
 import java.util.*;
 
 /**
@@ -68,12 +68,11 @@ public class BaseCodeController extends BaseController {
      * 添加栏目
      *
      * @param request
-     * @param response
      * @return
      */
     @RequestMapping("/addColumn")
     @ResponseBody
-    public Message addColumn(HttpServletRequest request, HttpServletResponse response) {
+    public Message addColumn(HttpServletRequest request) {
         logger.info("进入新建栏目控制层方法");
         Message msg = new Message();
         Thread.currentThread().setName(UUID.randomUUID().toString());
@@ -115,12 +114,11 @@ public class BaseCodeController extends BaseController {
      * 更新栏目信息
      *
      * @param request
-     * @param response
      * @return
      */
     @RequestMapping("/updateColumn")
     @ResponseBody
-    public Message updateColumn(HttpServletRequest request, HttpServletResponse response) {
+    public Message updateColumn(HttpServletRequest request) {
         logger.info("进入更新栏目控制层方法");
         Message msg = new Message();
         Thread.currentThread().setName(UUID.randomUUID().toString());
@@ -166,12 +164,11 @@ public class BaseCodeController extends BaseController {
      * 修改栏目信息
      *
      * @param request
-     * @param response
      * @return
      */
     @RequestMapping("/changeState")
     @ResponseBody
-    public Message changeState(HttpServletRequest request, HttpServletResponse response) {
+    public Message changeState(HttpServletRequest request) {
         logger.info("进入修改栏目状态栏目控制层方法");
         Message msg = new Message();
         Thread.currentThread().setName(UUID.randomUUID().toString());
@@ -220,8 +217,7 @@ public class BaseCodeController extends BaseController {
         Message msg = new Message();
         Map<String, Object> policyMap = new HashMap<String, Object>();
         // 银行列表信息
-        List<BaseCode> bankList = new ArrayList<BaseCode>();
-        bankList = baseCodeService.queryBaseCodeByType(basicType);
+        List<BaseCode> bankList = baseCodeService.queryBaseCodeByType(basicType);
         policyMap.put("baseList", bankList);
         msg.setInfo("成功");
         msg.setObject(policyMap);
@@ -232,14 +228,12 @@ public class BaseCodeController extends BaseController {
     /**
      * 获取栏目全部信息
      *
-     * @param request
      * @param response
      * @return
-     * @throws Exception
      */
     @RequestMapping(value = "/queryColumn")
     @ResponseBody
-    public Message getColumn(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    public Message getColumn(HttpServletResponse response) {
         response.setHeader("Access-Control-Allow-Origin", "*");
         Message msg = new Message();
         Map<String, Object> policyMap = new HashMap<String, Object>();
@@ -262,148 +256,57 @@ public class BaseCodeController extends BaseController {
      */
     @RequestMapping(value = "/columnTree")
     @ResponseBody
-    public List<Ztree> columnTree(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    public List<ZtreeDto> columnTree(HttpServletRequest request, HttpServletResponse response) {
         response.setHeader("Access-Control-Allow-Origin", "*");
-        Message msg = new Message();
-        Map<String, Object> policyMap = new HashMap<String, Object>();
         String codeCode = request.getParameter("codeCode");
         String codeType = request.getParameter("codeType");
         String flag = request.getParameter("flag");
         // 查询栏目树
-        List<BaseCodeTree> columnList = baseCodeService.columnTree(codeCode, codeType);
-//        policyMap.put("columnList", columnList);
-//        msg.setInfo("成功");
-//        msg.setObject(policyMap);
-//        msg.setResult(true);
+        List<ZtreeDto> columnList = baseCodeService.columnTree(codeCode, codeType);
 
         return initZtree(columnList, flag);
     }
 
-    public List<Ztree> initZtree(List<BaseCodeTree> deptList, String flag) {
+    /**
+     * 获取栏目树
+     *
+     * @param request
+     * @param response
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/columnTrees")
+    @ResponseBody
+    public List<ZtreeDto> columnTrees(HttpServletRequest request, HttpServletResponse response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        String codeCode = request.getParameter("codeCode");
+        String codeType = request.getParameter("codeType");
+        String flag = request.getParameter("flag");
+        // 查询栏目树
+        List<ZtreeDto> columnList = baseCodeService.columnTrees(codeCode, codeType);
 
-        List<Ztree> ztreeList = new ArrayList<>();
+        return initZtree(columnList, flag);
+    }
+
+    public List<ZtreeDto> initZtree(List<ZtreeDto> deptList, String flag) {
         if (deptList != null && deptList.size() > 0) {
             if (StringUtils.isBlank(flag)) {
-                Ztree z = new Ztree();
+                ZtreeDto z = new ZtreeDto();
                 z.setId("FIRST_COLUMN");
                 z.setpId("");
                 z.setName("栏目");
                 z.setTitle("栏目");
-                ztreeList.add(z);
+                deptList.add(z);
             } else if (StringUtils.equals(flag, "1")) {
-                Ztree z = new Ztree();
+                ZtreeDto z = new ZtreeDto();
                 z.setId("ARTICLE");
                 z.setpId("");
                 z.setName("文库");
                 z.setTitle("文库");
-                ztreeList.add(z);
-            }
-            for (BaseCodeTree dept : deptList) {
-                Ztree ztree = new Ztree();
-                ztree.setId(dept.getCodeCode());
-                ztree.setpId(dept.getCodeType());
-                ztree.setName(dept.getCodeCname());
-                ztree.setTitle(dept.getCodeCname());
-                ztreeList.add(ztree);
+                deptList.add(z);
             }
         }
-        return ztreeList;
-    }
-
-    static class Ztree implements Serializable {
-
-        private static final long serialVersionUID = 1L;
-
-        /**
-         * 节点ID
-         */
-        private String id;
-
-        /**
-         * 节点父ID
-         */
-        private String pId;
-
-        /**
-         * 节点名称
-         */
-        private String name;
-
-        /**
-         * 节点标题
-         */
-        private String title;
-
-        /**
-         * 是否勾选
-         */
-        private boolean checked = false;
-
-        /**
-         * 是否展开
-         */
-        private boolean open = false;
-
-        /**
-         * 是否能勾选
-         */
-        private boolean nocheck = false;
-
-        public String getId() {
-            return id;
-        }
-
-        public void setId(String id) {
-            this.id = id;
-        }
-
-        public String getpId() {
-            return pId;
-        }
-
-        public void setpId(String pId) {
-            this.pId = pId;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public String getTitle() {
-            return title;
-        }
-
-        public void setTitle(String title) {
-            this.title = title;
-        }
-
-        public boolean isChecked() {
-            return checked;
-        }
-
-        public void setChecked(boolean checked) {
-            this.checked = checked;
-        }
-
-        public boolean isOpen() {
-            return open;
-        }
-
-        public void setOpen(boolean open) {
-            this.open = open;
-        }
-
-        public boolean isNocheck() {
-            return nocheck;
-        }
-
-        public void setNocheck(boolean nocheck) {
-            this.nocheck = nocheck;
-        }
+        return deptList;
     }
 
     /**
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ZtreeDto.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ZtreeDto.java
new file mode 100644
index 000000000..010f7eac6
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ZtreeDto.java
@@ -0,0 +1,107 @@
+package com.ruoyi.content.domain;
+
+import java.io.Serializable;
+
+/**
+ * @program: ruoyi->ZtreeDto
+ * @description:
+ * @author: LiuShenlu
+ * @create: 2021-03-31 10:16
+ **/
+public class ZtreeDto implements Serializable {
+
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 节点ID
+     */
+    private String id;
+
+    /**
+     * 节点父ID
+     */
+    private String pId;
+
+    /**
+     * 节点名称
+     */
+    private String name;
+
+    /**
+     * 节点标题
+     */
+    private String title;
+
+    /**
+     * 是否勾选
+     */
+    private boolean checked = false;
+
+    /**
+     * 是否展开
+     */
+    private boolean open = false;
+
+    /**
+     * 是否能勾选
+     */
+    private boolean nocheck = false;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getpId() {
+        return pId;
+    }
+
+    public void setpId(String pId) {
+        this.pId = pId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public boolean isChecked() {
+        return checked;
+    }
+
+    public void setChecked(boolean checked) {
+        this.checked = checked;
+    }
+
+    public boolean isOpen() {
+        return open;
+    }
+
+    public void setOpen(boolean open) {
+        this.open = open;
+    }
+
+    public boolean isNocheck() {
+        return nocheck;
+    }
+
+    public void setNocheck(boolean nocheck) {
+        this.nocheck = nocheck;
+    }
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
index a5afb23b1..8ba558720 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/BaseCodeExMapper.java
@@ -2,6 +2,7 @@ package com.ruoyi.content.mapper;
 
 import com.ruoyi.content.domain.BaseCode;
 import com.ruoyi.content.domain.BaseCodeTree;
+import com.ruoyi.content.domain.ZtreeDto;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -23,4 +24,7 @@ public interface BaseCodeExMapper {
 
     public List<BaseCodeTree> getNextNodeTree(HashMap<String, String> parMap);
 
+    List<ZtreeDto> columnTrees(HashMap<String, String> parMap);
+
+    List<ZtreeDto> getNextNodeTrees(HashMap map);
 }
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
index 02f8ecb65..e5f70772f 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/BaseCodeService.java
@@ -2,6 +2,7 @@ package com.ruoyi.content.service;
 
 import com.ruoyi.content.domain.BaseCode;
 import com.ruoyi.content.domain.BaseCodeTree;
+import com.ruoyi.content.domain.ZtreeDto;
 import com.ruoyi.content.message.Message;
 
 import java.util.List;
@@ -87,7 +88,7 @@ public interface BaseCodeService {
      * @param codeType
      * @return
      */
-    public List<BaseCodeTree> columnTree(String codeCode, String codeType);
+    public List<ZtreeDto> columnTree(String codeCode, String codeType);
 
     /**
      * 操作栏目排序
@@ -106,4 +107,5 @@ public interface BaseCodeService {
      */
     List<BaseCodeTree> baseColumnTree(String codeCode);
 
+    List<ZtreeDto> columnTrees(String codeCode, String codeType);
 }
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java
index 2246f7991..cc1bc32ad 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/ICmsArticleAdInfoService.java
@@ -2,6 +2,7 @@ package com.ruoyi.content.service;
 
 import java.util.List;
 
+import com.ruoyi.content.domain.ArticleAdInfo;
 import com.ruoyi.content.domain.CmsArticleAdInfo;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -61,4 +62,6 @@ public interface ICmsArticleAdInfoService {
      * @return 结果
      */
     public int deleteCmsArticleAdInfoById(Long adId);
+
+    List<ArticleAdInfo> queryAdByCompanyId(String companyId);
 }
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
index 49805a60f..1097ef2bd 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/BaseCodeServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.content.service.impl;
 import com.ruoyi.content.domain.BaseCode;
 import com.ruoyi.content.domain.BaseCodeExample;
 import com.ruoyi.content.domain.BaseCodeTree;
+import com.ruoyi.content.domain.ZtreeDto;
 import com.ruoyi.content.exception.ParameterException;
 import com.ruoyi.content.mapper.BaseCodeExMapper;
 import com.ruoyi.content.mapper.BaseCodeMapper;
@@ -31,6 +32,17 @@ import java.util.Set;
 @Service
 public class BaseCodeServiceImpl implements BaseCodeService {
     private static final Logger logger = LoggerFactory.getLogger(BaseCodeServiceImpl.class);
+
+    static List<String> columnList = new ArrayList<>();
+
+    static {
+        columnList.add("INCREASE_ARTICLE");
+        columnList.add("ARTICLE");
+        columnList.add("GALLERY");
+        columnList.add("FIRST_COLUMN");
+        columnList.add("INCREASE_GALLERY");
+    }
+
     @Autowired
     private BaseCodeMapper baseCodeMapper;
     @Autowired
@@ -350,6 +362,7 @@ public class BaseCodeServiceImpl implements BaseCodeService {
                             logger.info("删除的redis的key是：" + "baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
                             redisManager.delete("baseCode_companyId" + companyId + "_branchId" + baseCode.getBranchId() + "_" + delCodeType);
                         }
+                        recursionDelete(baseCode);
                         logger.info("成功删除栏目状态！");
                     } else {
                         logger.info("删除栏目状态失败！");
@@ -370,6 +383,25 @@ public class BaseCodeServiceImpl implements BaseCodeService {
         return 1;
     }
 
+    private void recursionDelete(BaseCode baseCode) {
+        if (!columnList.contains(baseCode.getCodeType())) {
+            return;
+        }
+        BaseCodeExample example = new BaseCodeExample();
+        example.createCriteria().andCodeTypeEqualTo(baseCode.getCodeCode());
+        List<BaseCode> baseCodeList = baseCodeMapper.selectByExample(example);
+        if (baseCodeList != null && baseCodeList.size() > 0) {
+            for (BaseCode base : baseCodeList) {
+                //标志位0:有效1:无效;2删除
+                base.setState("2");
+                base.setUpdateTime(DateUtil.getDate());
+                base.setUpdateUser("");
+                baseCodeMapper.updateByPrimaryKeySelective(base);
+                recursionDelete(base);
+            }
+        }
+    }
+
     /**
      * 分页查询栏目信息
      */
@@ -454,45 +486,35 @@ public class BaseCodeServiceImpl implements BaseCodeService {
     }
 
     @Override
-    public List<BaseCodeTree> columnTree(String codeCode, String codeType) {
+    public List<ZtreeDto> columnTree(String codeCode, String codeType) {
         logger.info("进入查询栏目树的方法");
-        if (StringUtils.isAllBlank(codeCode, codeType)) {
-            logger.info("查询栏目树请求参数不正确codeCode【{}】", codeCode);
-            throw new ParameterException("创建失败，参数不足！");
-        }
-        List<BaseCodeTree> list = null;
-        String companyId = "1";
         String branchId = "86";
         String state = "0";
-        HashMap<String, String> parMap = new HashMap<String, String>();
+        HashMap<String, String> parMap = new HashMap<>();
         parMap.put("codeCode", codeCode);
-        parMap.put("companyId", companyId);
+        parMap.put("companyId", "1");
         parMap.put("state", state);
         parMap.put("codeType", codeType);
         if (!"86".equals(branchId)) {
             parMap.put("branchId", branchId);
         }
-        list = baseCodeExMapper.columnTree(parMap);
-        List<BaseCodeTree> baseCodeList = new ArrayList<>();
-        if (list != null && list.size() > 0) {
-            recursion(list, baseCodeList);
-        }
+        List<ZtreeDto> list = baseCodeExMapper.columnTrees(parMap);
         logger.info("查询栏目树结束，查询到的结果为【{}】" + JsonUtil.objectToJackson(list));
         logger.info("查询栏目信息的方法结束！");
-        return baseCodeList;
+        return list;
     }
 
-    private void recursion(List<BaseCodeTree> baseCodeList, List<BaseCodeTree> list1) {
-        for (BaseCodeTree baseCode : baseCodeList) {
+    private void recursion(List<ZtreeDto> baseCodeList, List<ZtreeDto> list1, String companyId, String state, String branchId) {
+        for (ZtreeDto baseCode : baseCodeList) {
             HashMap map = new HashMap();
-            map.put("CODE_CODE", baseCode.getCodeCode());
-            map.put("parentCompanyId", baseCode.getCompanyId());
-            map.put("parentState", baseCode.getState());
-            map.put("parentBranchId", baseCode.getBranchId());
-            List<BaseCodeTree> list = baseCodeExMapper.getNextNodeTree(map);
+            map.put("CODE_CODE", baseCode.getId());
+            map.put("parentCompanyId", companyId);
+            map.put("parentState", state);
+            map.put("parentBranchId", branchId);
+            List<ZtreeDto> list = baseCodeExMapper.getNextNodeTrees(map);
             list1.add(baseCode);
             if (list != null && list.size() > 0) {
-                recursion(list, list1);
+                recursion(list, list1, companyId, state, branchId);
             }
         }
     }
@@ -587,6 +609,26 @@ public class BaseCodeServiceImpl implements BaseCodeService {
         return msg;
     }
 
+    @Override
+    public List<ZtreeDto> columnTrees(String codeCode, String codeType) {
+        logger.info("进入查询栏目树的方法");
+        String branchId = "86";
+        String state = "0";
+        HashMap<String, String> parMap = new HashMap<>();
+        parMap.put("codeCode", codeCode);
+        parMap.put("companyId", "1");
+        parMap.put("state", state);
+        parMap.put("codeType", codeType);
+        if (!"86".equals(branchId)) {
+            parMap.put("branchId", branchId);
+        }
+        List<ZtreeDto> list = baseCodeExMapper.columnTrees(parMap);
+        List<ZtreeDto> list1 = new ArrayList<>();
+        recursion(list, list1, "1", state, branchId);
+        logger.info("查询栏目信息的方法结束！");
+        return list1;
+    }
+
     @Override
     public List<BaseCodeTree> baseColumnTree(String codeCode) {
         logger.info("进入查询栏目树的方法");
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
index 6c98c2d13..a69a19028 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CmsArticleAdInfoServiceImpl.java
@@ -2,7 +2,9 @@ package com.ruoyi.content.service.impl;
 
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.content.constants.PropertiesConstants;
+import com.ruoyi.content.domain.ArticleAdInfo;
 import com.ruoyi.content.domain.CmsArticleAdInfo;
+import com.ruoyi.content.mapper.ArticleAdQueryMapper;
 import com.ruoyi.content.mapper.CmsArticleAdInfoMapper;
 import com.ruoyi.content.redis.RedisManager;
 import com.ruoyi.content.service.ICmsArticleAdInfoService;
@@ -14,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,6 +33,8 @@ public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService {
     @Autowired
     private CmsArticleAdInfoMapper cmsArticleAdInfoMapper;
     @Autowired
+    private ArticleAdQueryMapper articleAdQueryMapper;
+    @Autowired
     private RedisManager redisManager;
 
     /**
@@ -171,4 +176,12 @@ public class CmsArticleAdInfoServiceImpl implements ICmsArticleAdInfoService {
     public int deleteCmsArticleAdInfoById(Long adId) {
         return cmsArticleAdInfoMapper.deleteCmsArticleAdInfoById(adId);
     }
+
+    @Override
+    public List<ArticleAdInfo> queryAdByCompanyId(String companyId) {
+        LOGGER.info("获取到的公司companyId[{}]",companyId);
+        List<ArticleAdInfo> adList = articleAdQueryMapper.queryAdByCompanyId(companyId);
+        LOGGER.info("该公司查询到的广告【{}】", adList.size());
+        return adList;
+    }
 }
diff --git a/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
index 873e61a1d..1acb8aaf7 100644
--- a/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
+++ b/ruoyi-content/src/main/resources/mapper/content/BaseCodeExMapper.xml
@@ -120,5 +120,50 @@
 		</if>
 		order by ORDER_NO*1,CREATE_TIME
 	</select>
+
+	<select id="columnTrees" resultType="com.ruoyi.content.domain.ZtreeDto" parameterType="map">
+		select  CODE_CODE id,
+				CODE_TYPE pId,
+				CODE_CNAME name,
+				CODE_CNAME title
+		from base_code
+		<where>
+			<if test="codeCode != null and codeCode !=''">
+				and CODE_CODE = #{codeCode,jdbcType=VARCHAR}
+			</if>
+			<if test="codeType != null and codeType !=''">
+				and CODE_TYPE = #{codeType,jdbcType=VARCHAR}
+			</if>
+			<if test="companyId != null and companyId !=''">
+				and COMPANY_ID = #{companyId,jdbcType=VARCHAR}
+			</if>
+			<if test="state != null and state !=''">
+				and STATE = #{state,jdbcType=VARCHAR}
+			</if>
+			<if test="branchId != null and branchId !=''">
+				and BRANCH_ID like concat("%",concat(#{branchId,jdbcType=VARCHAR},"%"))
+			</if>
+		</where>
+		order by ORDER_NO*1,CREATE_TIME
+	</select>
+
+	<select id="getNextNodeTrees" resultType="com.ruoyi.content.domain.ZtreeDto" parameterType="map">
+		select  CODE_CODE id,
+		CODE_TYPE pId,
+		CODE_CNAME name,
+		CODE_CNAME title
+		from base_code
+		WHERE CODE_TYPE = #{CODE_CODE}
+		<if test="parentCompanyId != null and parentCompanyId !=''">
+			and COMPANY_ID = #{parentCompanyId}
+		</if>
+		<if test="parentState != null and parentState !=''">
+			and STATE = #{parentState}
+		</if>
+		<if test="parentBranchId != null and parentBranchId !=''">
+			and BRANCH_ID like concat("%",concat(#{parentBranchId},"%"))
+		</if>
+		order by ORDER_NO*1,CREATE_TIME
+	</select>
 	
 </mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html
index d16627776..8e887db33 100644
--- a/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html
+++ b/ruoyi-content/src/main/resources/templates/content/adverts/adverts.html
@@ -44,7 +44,7 @@
             <a class="btn btn-success" onclick="$.operate.add()">
                 <i class="fa fa-plus"></i> 添加
             </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()">
+            <a class="btn btn-danger multiple" onclick="$.operate.removeAll()">
                 <i class="fa fa-remove"></i> 删除
             </a>
         </div>
diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
index 5f02fa4bb..8056d2f94 100644
--- a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
+++ b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
@@ -49,10 +49,10 @@
             <a class="btn btn-primary" onclick="includeArticle(1)">
                 <i class="fa fa-plus"></i> 批量收录
             </a>
-            <a class="btn btn-danger single disabled" style="margin-left: 15px;" onclick="includeArticle(2)">
+            <a class="btn btn-danger" style="margin-left: 15px;" onclick="includeArticle(2)">
                 <i class="fa fa-remove"></i> 批量移除
             </a>
-            <a class="btn btn-success single disabled" style="margin-left: 15px;" onclick="includeArticle(2)">
+            <a class="btn btn-success" style="margin-left: 15px;" data-toggle="modal" data-target="#myModal4">
                 <i class="fa fa-newspaper-o"></i> 创建文章
             </a>
         </div>
@@ -180,6 +180,72 @@
         </div>
     </div>
 </div>
+<div class="modal inmodal" id="myModal4" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" style="width: 800px;">
+        <div class="modal-content animated fadeIn">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5; padding: 15px 15px;">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left; font-size: 23px;">创建文章</h5>
+            </div>
+            <div class="modal-body" style="background: #ffffff;">
+                <form class="form-horizontal m" id="form-picAdverts-add3">
+                    <div class="col-md-12" style="margin-top: -15px;">
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">广告添加：</label>
+                            <div class="col-sm-8">
+                                <select th:name="advertisementTypeInit" th:id="advertisementTypeInit"
+                                        class="form-control">
+
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">标签添加：</label>
+                            <div class="col-sm-8">
+                                <select th:name="labelTypeInit" th:id="labelTypeInit"
+                                        class="form-control">
+
+                                </select>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">必须授权才能观看：</label>
+                            <div class="col-sm-8">
+                                <input type="checkbox" id="isAuthorization" style="margin-top: 9px;">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">是否添加预约按钮：</label>
+                            <div class="col-sm-8">
+                                <input type="checkbox" id="isReserve" style="margin-top: 9px;">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label">优选活动报名：</label>
+                            <div class="col-sm-8">
+                                <input type="checkbox" id="isJoinActive" style="margin-top: 9px;">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-4 control-label is-required">创建文章地址：</label>
+                            <div class="col-sm-8">
+                                <textarea style="height: 70px;" id="ccomment" name="comment" class="form-control"
+                                          placeholder="复制任意微信文章链接（格式类似http://mp.weixin.qq.com/s/XXXXXX），一键导入重新发布，即可实现对文章观看情况的追踪。"
+                                          required></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
+                <button type="button" class="btn btn-white" data-dismiss="modal" th:id="modalColse">关闭</button>
+                <button type="button" class="btn btn-primary" th:onclick="importArticle()">导入文章</button>
+            </div>
+        </div>
+    </div>
+</div>
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: layout-latest-js"/>
 <th:block th:include="include :: ztree-js"/>
@@ -371,6 +437,9 @@
         cloumnTreeInit();
         ldcomList();
 
+        advertisementTypeInit();
+        labelTypeInit();
+
         layui.use('laydate', function () {
             var laydate = layui.laydate;
 
@@ -590,7 +659,7 @@
             //移除绑定事件
             $('#sure').unbind('click');
             $('#myModal1').modal('show');
-            const url = ctx + "column/columnTree?codeType=ARTICLE&flag=1";
+            const url = ctx + "column/columnTrees?codeType=ARTICLE&flag=1";
             let options = {
                 url: url,
                 expandLevel: 1,                // 展开等级节点
@@ -939,27 +1008,188 @@
 
     function loadPreviewData(id) {
         $.ajax({
-            url : prefix + "/preview",
-            data : {
-                "publishId" : id
+            url: prefix + "/preview",
+            data: {
+                "publishId": id
             },
-            dataType : "json",
-            type : "post",
-            cache : false,
-            success : function(data) {
+            dataType: "json",
+            type: "post",
+            cache: false,
+            success: function (data) {
                 if (data.result) {
                     $.modal.open('文章预览', data.object.editUrl)
 
-                }else{
+                } else {
                     $.modal.alertError("预览失败，请稍后重试！");
                 }
             },
-            error : function(textStatus, e) {
+            error: function (textStatus, e) {
                 $.modal.alertError('系统异常,请稍后重试!');
             }
         });
     }
 
+    //广告列表初始化
+    function advertisementTypeInit() {
+        $.ajax({
+            type: "post",
+            url: path + 'content/adverts/queryAdvertisements',
+            data: {},
+            async: false,
+            success: function (data) {
+                if (data.result) {
+                    let obj = data.object.advertiseAdList;
+                    for (let i = 0; i < obj.length; i++) {
+                        if (i > 0) {
+                            if (obj[i].adTypeName == obj[i - 1].adTypeName) {
+                                $("#advertisementTypeInit").append(
+                                    "<option value='" + obj[i].adId + "'>"
+                                    + obj[i].adTitle + "</option>");
+                            } else {
+                                // 除了名片的其他类型都按类型名显示
+                                $("#advertisementTypeInit").append(
+                                    "<optgroup label=" + obj[i].adTypeName
+                                    + "></optgroup>");
+                                $("#advertisementTypeInit").append(
+                                    "<option value='" + obj[i].adId + "'>"
+                                    + obj[i].adTypeName + "</option>");
+                            }
+                        } else {
+                            $("#advertisementTypeInit").append(
+                                "<optgroup label=" + obj[i].adTypeName
+                                + "></optgroup>");
+                            $("#advertisementTypeInit").append(
+                                "<option value='" + obj[i].adId + "'>"
+                                + obj[i].adTitle + "</option>");
+                        }
+                    }
+                } else {
+                    $.modal.alertError("网络异常，请稍后再试！");
+                }
+            }
+        });
+    }
+
+    /* 查询标签信息 */
+    function labelTypeInit() {
+        $.ajax({
+            type: "post",
+            url: path + 'label/queryLabel',
+            data: {},
+            async: false,
+            success: function (data) {
+                if (data.result) {
+                    var obj = data.object.labelList;
+                    $("#labelTypeInit").append(
+                        "<optgroup id=" + "LABEL" + " label=" + "标签"
+                        + "></optgroup>");
+                    for (var i = 0; i < obj.length; i++) {
+                        $("#LABEL").append(
+                            "<option value='" + obj[i].labelId + "'>"
+                            + obj[i].labelName + "</option>");
+
+                    }
+                } else {
+                    $.modal.alertError("网络异常，请稍后再试！");
+                }
+            }
+        });
+    }
+
+    function importArticle() {
+        let ids = [];
+        let labelIds = [];
+        let length = $("#advertisementTypeInit option:selected").length;
+        if (length > 1) {
+            $.modal.alertError("请选择一条广告!")
+            return false;
+        }
+        $("#advertisementTypeInit option:selected").each(function () {
+            ids.push($(this).val())
+        })
+        $("#labelTypeInit option:selected").each(function () {
+            labelIds.push($(this).val())
+        })
+        let email = $("#email").val();
+        let isWarrant = $("#isAuthorization").prop('checked');
+        let isReservation = $("#isReserve").prop('checked');
+        let isAddActive = $("#isJoinActive").prop('checked');
+        if (isWarrant) { // 1授权 0未授权
+            var isAuthorization = "1";
+        } else {
+            var isAuthorization = "0";
+        }
+
+        let automaticName = "";
+        let introduction = "";
+
+        if (isReservation) { // 1预约 0不预约
+            var isReserve = "1";
+            if (automaticName == '' || introduction == '') {
+                $.modal.alertError('您填写的按钮名称或预约介绍为空，请重新输入');
+                return;
+            }
+        } else {
+
+            var isReserve = "0";
+        }
+        if (isAddActive) {//1添加活动0不添加
+            var isJoinActive = "1";
+        } else {
+            var isJoinActive = "0";
+        }
+
+        let originalUrl = $("#ccomment").val();
+        // if (originalUrl.indexOf("mp.weixin.qq.com") == -1) {
+        //     $.modal.alertError("文章链接格式不正确！应为微信文章链接");
+        //     return;
+        // }
+        $('#myModal4').modal('hide');
+        $.modal.loading("导入中请等待。。。");
+        $.ajax({
+            url: path + "article/getArticleContentByUrl",
+            data: {
+                'author': email,
+                'createUser': email,
+                'ids': ids.join(','),
+                'isAuthorization': isAuthorization,
+                'isReserve': isReserve,
+                'automaticName': automaticName,
+                'introduction': introduction,
+                'labelIds': labelIds.join(','),
+                'isJoinActive': isJoinActive,
+                'originalUrl': originalUrl
+            },
+            type: "post",
+            success: function (data) {
+                $.modal.closeLoading();
+                if (data.result) {
+                    debugger
+                    localStorage.setItem("nryx_articleContent", data.object.articleContent); // 文章内容
+                    localStorage.setItem("nryx_originalUrl", data.object.originalUrl); // 文章链接
+                    // //文章名称
+                    localStorage.setItem("nryx_articleName", data.object.articleName); // 文章名称
+                    localStorage.setItem("nryx_shareImgUrl", data.object.shareImgUrl); // 文章分享图片
+                    // //文章分享标题
+                    localStorage.setItem("nryx_shareTitle", data.object.shareTitle); // 文章分享标题
+                    localStorage.setItem("nryx_shareDes", data.object.shareDes); // 文章分享描述
+                    localStorage.setItem("nryx_listPicUrl", data.object.listPicUrl); // 文章列表展示图片
+                    localStorage.setItem("nryx_adId", data.object.adId); // 广告id
+                    localStorage.setItem("nryx_isAuthorization", data.object.isAuthorization); // 是否授权
+                    localStorage.setItem("nryx_isJoinActive", data.object.isJoinActive); // 是否添加优选活动
+                    localStorage['nryx_editahref'] = data.object.articleEditUrl;
+                    $.table.refresh();
+                    $.modal.open('创建文章', localStorage['nryx_editahref'])
+                } else {
+                    $.modal.alertError(data.info)
+                }
+            },
+            error: function () {
+                $.modal.closeLoading();
+            }
+        });
+    };
+
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/column/column.html b/ruoyi-content/src/main/resources/templates/content/column/column.html
index 71bd113ea..cd36f518c 100644
--- a/ruoyi-content/src/main/resources/templates/content/column/column.html
+++ b/ruoyi-content/src/main/resources/templates/content/column/column.html
@@ -270,7 +270,7 @@
     });
 
     function queryColumnTree() {
-        var url = ctx + "column/columnTree?codeType=FIRST_COLUMN";
+        var url = ctx + "column/columnTree";
         var options = {
             url: url,
             expandLevel: 1,
@@ -654,7 +654,6 @@
 
     // 编辑后保存操作
     function editColum() {
-        debugger
         let id = $('#asdid').val();
         let rowData = $("#" + table.options.id).bootstrapTable('getRowByUniqueId', id);
         let cName = $("#cName").val();
diff --git a/ruoyi-content/src/main/resources/templates/content/gallery/gallery.html b/ruoyi-content/src/main/resources/templates/content/gallery/gallery.html
index 9becb9df5..024e8a310 100644
--- a/ruoyi-content/src/main/resources/templates/content/gallery/gallery.html
+++ b/ruoyi-content/src/main/resources/templates/content/gallery/gallery.html
@@ -70,7 +70,7 @@
             <div class="modal-body">恭喜，创建成功！</div>
             <div class="modal-footer">
                 <a type="button" id="continueAdd" th:href="@{/content/gallery}" class="btn btn-sm btn-primary">继续创建</a>
-                <a type="button" id="goList" th:href="@{/content/gallery}" class="btn btn-sm btn-primary">去查看</a>
+                <a type="button" id="goList" th:href="@{/content/gallery/page}" class="btn btn-sm btn-primary">去查看</a>
             </div>
         </div>
     </div>
diff --git a/ruoyi-content/src/main/resources/templates/content/gallery/list.html b/ruoyi-content/src/main/resources/templates/content/gallery/list.html
index dea24f37b..384017c3f 100644
--- a/ruoyi-content/src/main/resources/templates/content/gallery/list.html
+++ b/ruoyi-content/src/main/resources/templates/content/gallery/list.html
@@ -39,7 +39,7 @@
         </div>
 
         <div class="btn-group-sm" id="toolbar" role="group">
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()">
+            <a class="btn btn-danger multiple" onclick="$.operate.removeAll()">
                 <i class="fa fa-remove"></i> 删除
             </a>
         </div>
diff --git a/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html
index 422067c28..90ad2a20e 100644
--- a/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html
+++ b/ruoyi-content/src/main/resources/templates/content/picAdverts/picAdverts.html
@@ -29,7 +29,7 @@
             <a class="btn btn-success" onclick="$.operate.add()">
                 <i class="fa fa-plus"></i> 添加
             </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()">
+            <a class="btn btn-danger multiple" onclick="$.operate.removeAll()">
                 <i class="fa fa-remove"></i> 删除
             </a>
         </div>

From ea0708c0954e76c84971988ce704bd98168fb866 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Fri, 2 Apr 2021 12:24:18 +0800
Subject: [PATCH 17/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/content/service/impl/ArticleServiceImpl.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
index b8d2e3e01..5b063c533 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
@@ -506,7 +506,13 @@ public class ArticleServiceImpl implements ArticleService {
         for (PublishedArticleInfo publishedArticleInfo : articleList) {
             String articleId = publishedArticleInfo.getArticleId();
             Map<String, String> countJsonMap = rManager.hGetAll("company_articleInfo_Id" + articleId);
-            publishedArticleInfo.setVisitorCount(countJsonMap.get("visitorCount"));
+            String clickTotal = rManager.query("company_clickTotal_articleId" + articleId);
+            if (StringUtils.isBlank(clickTotal)) {
+                rManager.save("company_clickTotal_articleId" + articleId, countJsonMap.get("visitorCount"));
+                publishedArticleInfo.setVisitorCount(countJsonMap.get("visitorCount"));
+            } else {
+                publishedArticleInfo.setVisitorCount(clickTotal);
+            }
             publishedArticleInfo.setShareCount(countJsonMap.get("sharedCount"));
         }
         LOGGER.info("查询文章列表的业务层方法结束！");

From 52f2ceaa4980422831f371d07013b2afa1bd8505 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Mon, 5 Apr 2021 18:14:09 +0800
Subject: [PATCH 18/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/service/impl/ArticleServiceImpl.java   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
index 5b063c533..c3ad86cd7 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
@@ -508,12 +508,20 @@ public class ArticleServiceImpl implements ArticleService {
             Map<String, String> countJsonMap = rManager.hGetAll("company_articleInfo_Id" + articleId);
             String clickTotal = rManager.query("company_clickTotal_articleId" + articleId);
             if (StringUtils.isBlank(clickTotal)) {
-                rManager.save("company_clickTotal_articleId" + articleId, countJsonMap.get("visitorCount"));
-                publishedArticleInfo.setVisitorCount(countJsonMap.get("visitorCount"));
+                if (countJsonMap != null) {
+                    rManager.save("company_clickTotal_articleId" + articleId, countJsonMap.get("visitorCount"));
+                    publishedArticleInfo.setVisitorCount(countJsonMap.get("visitorCount"));
+                } else {
+                    publishedArticleInfo.setVisitorCount("0");
+                }
             } else {
                 publishedArticleInfo.setVisitorCount(clickTotal);
             }
-            publishedArticleInfo.setShareCount(countJsonMap.get("sharedCount"));
+            if (countJsonMap != null) {
+                publishedArticleInfo.setShareCount(countJsonMap.get("sharedCount"));
+            } else {
+                publishedArticleInfo.setShareCount("0");
+            }
         }
         LOGGER.info("查询文章列表的业务层方法结束！");
         return articleList;

From 34922c2bc9d62f5858f8eae3d6bef670f89bc2be Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Mon, 5 Apr 2021 18:27:00 +0800
Subject: [PATCH 19/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/content/service/impl/ArticleServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
index c3ad86cd7..42d49d273 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
@@ -508,7 +508,7 @@ public class ArticleServiceImpl implements ArticleService {
             Map<String, String> countJsonMap = rManager.hGetAll("company_articleInfo_Id" + articleId);
             String clickTotal = rManager.query("company_clickTotal_articleId" + articleId);
             if (StringUtils.isBlank(clickTotal)) {
-                if (countJsonMap != null) {
+                if (countJsonMap != null && countJsonMap.size() > 0) {
                     rManager.save("company_clickTotal_articleId" + articleId, countJsonMap.get("visitorCount"));
                     publishedArticleInfo.setVisitorCount(countJsonMap.get("visitorCount"));
                 } else {
@@ -517,7 +517,7 @@ public class ArticleServiceImpl implements ArticleService {
             } else {
                 publishedArticleInfo.setVisitorCount(clickTotal);
             }
-            if (countJsonMap != null) {
+            if (countJsonMap != null && countJsonMap.size() > 0) {
                 publishedArticleInfo.setShareCount(countJsonMap.get("sharedCount"));
             } else {
                 publishedArticleInfo.setShareCount("0");

From a66a8de9e35c3080c2068b110f34c5ae05ae5bbf Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Tue, 6 Apr 2021 16:56:49 +0800
Subject: [PATCH 20/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/article/articleManage.html        |  6 +-
 .../templates/content/column/column.html      | 70 ++++++++++---------
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
index 8056d2f94..90ccbe510 100644
--- a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
+++ b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
@@ -210,19 +210,19 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="form-group">
+                        <div class="form-group" style="display: none;">
                             <label class="col-sm-4 control-label">必须授权才能观看：</label>
                             <div class="col-sm-8">
                                 <input type="checkbox" id="isAuthorization" style="margin-top: 9px;">
                             </div>
                         </div>
-                        <div class="form-group">
+                        <div class="form-group" style="display: none;">
                             <label class="col-sm-4 control-label">是否添加预约按钮：</label>
                             <div class="col-sm-8">
                                 <input type="checkbox" id="isReserve" style="margin-top: 9px;">
                             </div>
                         </div>
-                        <div class="form-group">
+                        <div class="form-group" style="display: none;">
                             <label class="col-sm-4 control-label">优选活动报名：</label>
                             <div class="col-sm-8">
                                 <input type="checkbox" id="isJoinActive" style="margin-top: 9px;">
diff --git a/ruoyi-content/src/main/resources/templates/content/column/column.html b/ruoyi-content/src/main/resources/templates/content/column/column.html
index cd36f518c..8fd8e91e7 100644
--- a/ruoyi-content/src/main/resources/templates/content/column/column.html
+++ b/ruoyi-content/src/main/resources/templates/content/column/column.html
@@ -187,7 +187,8 @@
                         <div class="form-group" style="display:none" id="secSelect">
                             <label class="col-sm-4 control-label">所属栏目:</label>
                             <div class="col-sm-6">
-                                <select class="selectpicker form-control" th:id="cType" name="cType"></select>
+                                <!--                                <select class="selectpicker form-control" th:id="cType" name="cType"></select>-->
+                                <input th:hidden="true" th:id="cType" name="cType">
                             </div>
                         </div>
 
@@ -590,6 +591,7 @@
         var rowData = $("#" + table.options.id).bootstrapTable('getRowByUniqueId', id);
         $("#cName").val(rowData.codeCname);
         $("#cOrderNo").val(rowData.orderNo);
+        $("#cType").val(rowData.codeType);
         // 处理公司下拉框
         $("#branchIdEdit option").remove();
         $.ajax({
@@ -617,39 +619,39 @@
         })
 
         // 处理一级栏目下拉
-        $("#cType option").remove();
-        var objc = [];
-        if (rowData.codeType.indexOf("文库-") == -1) {
-            $("#secSelect").hide();
-            objc = baseDataList;
-            for (var i = 0; i < objc.length; i++) {
-                var codeType = rowData.codeType;
-                if (objc[i].codeCname == codeType) {
-                    $("#cType").append(
-                        "<option selected=\"true\" value='" + objc[i].codeCode
-                        + "'>" + objc[i].codeCname + "</option>");
-                } else {
-                    $("#cType").append(
-                        "<option value='" + objc[i].codeCode + "'>"
-                        + objc[i].codeCname + "</option>");
-                }
-            }
-        } else {
-            objc = articleSecList;
-            $("#secSelect").show();
-            for (var i = 0; i < objc.length; i++) {
-                var codeType = rowData.codeType.split("-")[1];
-                if (objc[i].codeCname == codeType) {
-                    $("#cType").append(
-                        "<option selected=\"true\" value='" + objc[i].codeCode
-                        + "'>" + objc[i].codeCname + "</option>");
-                } else {
-                    $("#cType").append(
-                        "<option value='" + objc[i].codeCode + "'>"
-                        + objc[i].codeCname + "</option>");
-                }
-            }
-        }
+        // $("#cType option").remove();
+        // var objc = [];
+        // if (rowData.codeType.indexOf("文库-") == -1) {
+        //     $("#secSelect").hide();
+        //     objc = baseDataList;
+        //     for (var i = 0; i < objc.length; i++) {
+        //         var codeType = rowData.codeType;
+        //         if (objc[i].codeCode == codeType) {
+        //             $("#cType").append(
+        //                 "<option selected=\"true\" value='" + objc[i].codeCode
+        //                 + "'>" + objc[i].codeCname + "</option>");
+        //         } else {
+        //             $("#cType").append(
+        //                 "<option value='" + objc[i].codeCode + "'>"
+        //                 + objc[i].codeCname + "</option>");
+        //         }
+        //     }
+        // } else {
+        //     objc = articleSecList;
+        //     $("#secSelect").show();
+        //     for (var i = 0; i < objc.length; i++) {
+        //         var codeType = rowData.codeType.split("-")[1];
+        //         if (objc[i].codeCode == codeType) {
+        //             $("#cType").append(
+        //                 "<option selected=\"true\" value='" + objc[i].codeCode
+        //                 + "'>" + objc[i].codeCname + "</option>");
+        //         } else {
+        //             $("#cType").append(
+        //                 "<option value='" + objc[i].codeCode + "'>"
+        //                 + objc[i].codeCname + "</option>");
+        //         }
+        //     }
+        // }
     };
 
     // 编辑后保存操作

From 52634eda676010dcd2e1a39e328cd5336bd29cab Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Wed, 7 Apr 2021 09:18:39 +0800
Subject: [PATCH 21/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/content/controller/ArticleManageController.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
index c3d3ff2dd..02c3caa41 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
@@ -14,6 +14,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -303,6 +304,7 @@ public class ArticleManageController extends BaseController {
      * 保存(更新)文章静态页面 @Title: updateArticle @Description: TODO() @param @return
      * 参数 @return Message 返回类型 @throws
      */
+    @CrossOrigin(allowCredentials = "true", allowedHeaders = "*", origins = "*", maxAge = 1800)
     @RequestMapping("/updateArticle")
     @ResponseBody
     public Message updateArticle(HttpServletRequest request, HttpServletResponse response) {

From 59c998e8dd31294119694fb3fe01cee625e295e6 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Wed, 7 Apr 2021 17:01:09 +0800
Subject: [PATCH 22/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ArticleManageController.java   |  2 --
 .../content/article/articleManage.html        |  2 +-
 .../ruoyi/framework/config/ShiroConfig.java   |  1 +
 .../interceptor/RepeatSubmitInterceptor.java  | 34 +++++++++++--------
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
index 02c3caa41..c3d3ff2dd 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
@@ -14,7 +14,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -304,7 +303,6 @@ public class ArticleManageController extends BaseController {
      * 保存(更新)文章静态页面 @Title: updateArticle @Description: TODO() @param @return
      * 参数 @return Message 返回类型 @throws
      */
-    @CrossOrigin(allowCredentials = "true", allowedHeaders = "*", origins = "*", maxAge = 1800)
     @RequestMapping("/updateArticle")
     @ResponseBody
     public Message updateArticle(HttpServletRequest request, HttpServletResponse response) {
diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
index 90ccbe510..0ae2d97d5 100644
--- a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
+++ b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
@@ -1017,7 +1017,7 @@
             cache: false,
             success: function (data) {
                 if (data.result) {
-                    $.modal.open('文章预览', data.object.editUrl)
+                    $.modal.open('文章预览', data.object.editUrl + '?l=1')
 
                 } else {
                     $.modal.alertError("预览失败，请稍后重试！");
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
index d6feedb82..061fd4aaa 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
@@ -269,6 +269,7 @@ public class ShiroConfig
         // Shiro连接约束配置，即过滤链的定义
         LinkedHashMap<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
         // 对静态资源设置匿名访问
+        filterChainDefinitionMap.put("/article/updateArticle", "anon");
         filterChainDefinitionMap.put("/favicon.ico**", "anon");
         filterChainDefinitionMap.put("/ruoyi.png**", "anon");
         filterChainDefinitionMap.put("/css/**", "anon");
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
index 35076b595..c7801333c 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
@@ -3,6 +3,8 @@ package com.ruoyi.framework.interceptor;
 import java.lang.reflect.Method;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
@@ -13,40 +15,42 @@ import com.ruoyi.common.utils.ServletUtils;
 
 /**
  * 防止重复提交拦截器
- * 
+ *
  * @author ruoyi
  */
 @Component
-public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
-{
+public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter {
     @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception
-    {
-        if (handler instanceof HandlerMethod)
-        {
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        response.setHeader("Access-control-Allow-Origin", request.getHeader("Origin"));
+        response.setHeader("Access-Control-Allow-Credentials", "true");
+        response.setHeader("Access-Control-Allow-Headers", request.getHeader("Access-Control-Request-Headers"));
+        response.addHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT");
+        if ("OPTIONS".equals(request.getMethod())) {
+            response.setStatus(HttpStatus.OK.value());
+            return false;
+        }
+
+        if (handler instanceof HandlerMethod) {
             HandlerMethod handlerMethod = (HandlerMethod) handler;
             Method method = handlerMethod.getMethod();
             RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
-            if (annotation != null)
-            {
-                if (this.isRepeatSubmit(request))
-                {
+            if (annotation != null) {
+                if (this.isRepeatSubmit(request)) {
                     AjaxResult ajaxResult = AjaxResult.error("不允许重复提交，请稍后再试");
                     ServletUtils.renderString(response, JSON.marshal(ajaxResult));
                     return false;
                 }
             }
             return true;
-        }
-        else
-        {
+        } else {
             return super.preHandle(request, response, handler);
         }
     }
 
     /**
      * 验证是否重复提交由子类实现具体的防重复提交的规则
-     * 
+     *
      * @param request
      * @return
      * @throws Exception

From 83e41a300c22401ef61aa7aee80d6981a0efa628 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Tue, 13 Apr 2021 17:49:55 +0800
Subject: [PATCH 23/30] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ArticleManageController.java   |     2 +-
 .../controller/ContentCommonController.java   |    76 +-
 .../ruoyi/content/service/CommonService.java  |    14 +
 .../service/impl/ArticleServiceImpl.java      |    12 +-
 .../service/impl/CommonServiceImpl.java       |    57 +
 .../main/resources/static/js/wangEditor.js    | 10309 ++++++++++++++++
 .../content/article/articleList.html          |     6 +-
 .../content/article/articleManage.html        |   403 +-
 8 files changed, 10798 insertions(+), 81 deletions(-)
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/CommonService.java
 create mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CommonServiceImpl.java
 create mode 100644 ruoyi-content/src/main/resources/static/js/wangEditor.js

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
index c3d3ff2dd..227b6e7cf 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
@@ -203,7 +203,7 @@ public class ArticleManageController extends BaseController {
         Thread.currentThread().setName(UUID.randomUUID().toString());
         Message msg = new Message();
         logger.info("通过文章链接获取文章内容控制层方法开始");
-        String createUser = request.getParameter("createUser");
+        String createUser = "13152783264";
         if (StringUtils.isBlank(createUser)) {
             logger.info("用户已离线");
             throw new BusinessException("通过文章链接获取文章内容,用户已离线");
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ContentCommonController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ContentCommonController.java
index 88d170b0e..098b6c9a4 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ContentCommonController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ContentCommonController.java
@@ -1,71 +1,29 @@
 package com.ruoyi.content.controller;
 
 import com.ruoyi.content.message.Message;
-import com.ruoyi.content.service.CmsRoleAuthorityService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.ruoyi.content.service.CommonService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Enumeration;
-import java.util.List;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
- * 说明：公共controller
- *
- * @author wang.q
- * @date 2017年8月25日
- */
-@Controller
-@RequestMapping("/common")
+ * @program: ruoyi->CommonController
+ * @description:
+ * @author: LiuShenlu
+ * @create: 2021-04-09 17:26
+ **/
+@RestController
 public class ContentCommonController {
-    private static Logger logger = LoggerFactory.getLogger(ContentCommonController.class);
+
     @Autowired
-    private CmsRoleAuthorityService authorityService;
+    private CommonService commonService;
 
-    /**
-     * 查询访问人的所有菜单权限
-     *
-     * @return
-     */
-    @RequestMapping(value = "/menus")
-    @ResponseBody
-    public Message menus(HttpServletRequest req, HttpServletResponse res) {
-        System.out.println("----------menus------------menus-------------menus------menus----------");
-        Enumeration<String> headerNames = req.getHeaderNames();
-        while (headerNames.hasMoreElements()) {
-            //获取每个请求头名称
-            String headerName = headerNames.nextElement();
-            //跟距请求头获取请求值
-            String value = req.getHeader(headerName);
-            System.out.println(headerName);
-            System.out.println(value);
-
-        }
-        System.out.println("--------menus----------menus---------menus----------menus------menus--------");
-
-
-        Message msg = new Message();
-        try {
-            List<?> list = authorityService.queryUserRole();
-            if (list != null && list.size() > 0) {
-                msg.setObject(list);
-                msg.setResult(true);
-            } else {
-                msg.setResult(false);
-                msg.setInfo("未获取菜单，或您已离线。请重新登录！");
-            }
-        } catch (Exception e) {
-            // TODO: handle exception
-            msg.setResult(false);
-            msg.setInfo(e.getMessage());
-            logger.info("获取菜单失败【{}】", e.getMessage());
-            e.printStackTrace();
-        }
+    @PostMapping("oss")
+    public Message upload(@RequestParam("file") MultipartFile file) {
+        Message msg = commonService.upload(file);
         return msg;
     }
+
 }
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/CommonService.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/CommonService.java
new file mode 100644
index 000000000..2a845c452
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/CommonService.java
@@ -0,0 +1,14 @@
+package com.ruoyi.content.service;
+
+import com.ruoyi.content.message.Message;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ *
+ * @author liushenlu
+ */
+public interface CommonService {
+
+    Message upload(MultipartFile file);
+
+}
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
index 42d49d273..9d1da35cf 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
@@ -1138,9 +1138,11 @@ public class ArticleServiceImpl implements ArticleService {
         LOGGER.info(
                 "根据文章链接获取文章内容,参数createUser[{}],author[{}],ids[{}],isAuthorization[{}],isReserve[{}],automaticName[{}],introduction[{}],isJoinActive[{}]",
                 createUser, author, ids, isAuthorization, isReserve, automaticName, introduction, isJoinActive);
-        CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
-        String companyId = userInfoDTO.getCompanyId();// 渠道id
-        String email = userInfoDTO.getEmail();
+        //CmsSysUser userInfoDTO = (CmsSysUser) SecurityUtils.getSubject().getPrincipal();
+        //String companyId = userInfoDTO.getCompanyId();// 渠道id
+        //String email = userInfoDTO.getEmail();
+        String companyId = "1";// 渠道id
+        String email = "13152783264";
         // 根据登录人查询登录信息（shiro里有缓存数据不是最新）
         CmsSysUser cmsSysUser = cmsSysUserExMapper.queryLoginInfoByEmail(email);
         // 此时后台管理员
@@ -1154,7 +1156,7 @@ public class ArticleServiceImpl implements ArticleService {
                         createTime});
 
         ArticleInfo article = new ArticleInfo();
-        article.setArticleAuthor(userInfoDTO.getName() + "");
+        article.setArticleAuthor(cmsSysUser.getName() + "");
         article.setArticleName(articleName);
         article.setOriginalUrl("0");
         article.setShareImgUrl(shareImgUrl);
@@ -1203,7 +1205,7 @@ public class ArticleServiceImpl implements ArticleService {
         // 存文章和标签的关系
         articleLabelServiceImpl.addlabel(String.valueOf(articleId), labelIds);
         this.checkJobNumber(articleId, articleName, shareImgUrl, ids, publishId, companyId, jobNumber, userId,
-                userInfoDTO.getName() + "", modifiedEditUrl, modifiedViewUrl, versionNumber);
+                cmsSysUser.getName() + "", modifiedEditUrl, modifiedViewUrl, versionNumber);
         msg.setInfo("成功导入文章!");
         msg.setResult(true);
         msg.setObject(resultMap);
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CommonServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CommonServiceImpl.java
new file mode 100644
index 000000000..6a3049e59
--- /dev/null
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/CommonServiceImpl.java
@@ -0,0 +1,57 @@
+package com.ruoyi.content.service.impl;
+
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.content.constants.PropertiesConstants;
+import com.ruoyi.content.message.Message;
+import com.ruoyi.content.service.CommonService;
+import com.ruoyi.content.utils.ImgCompress;
+import com.ruoyi.content.utils.OSSUtil;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.imageio.ImageIO;
+import javax.imageio.stream.ImageOutputStream;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @program: ruoyi->CommonServiceImpl
+ * @description:
+ * @author: LiuShenlu
+ * @create: 2021-04-09 17:29
+ **/
+@Service
+public class CommonServiceImpl implements CommonService {
+
+    @Override
+    public Message upload(MultipartFile file) {
+        Message msg = new Message(true, "上传图片成功");
+        try {
+            // 文件名
+            String fileName = file.getOriginalFilename();
+            // 文件后缀
+            String ext = fileName.substring(fileName.lastIndexOf("."));
+            String fileTime = DateUtils.getMillisecond();
+            // OSS保存路径
+            fileName = PropertiesConstants.GALLERY_IMG_PATH + fileTime + ext;
+            String flag = OSSUtil.uploadFileByInputStream(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID, PropertiesConstants.OSSKEY,
+                    PropertiesConstants.BUCKETNAME, file.getInputStream(), PropertiesConstants.OSSPATH + fileName);
+            if (StringUtils.isBlank(flag) || StringUtils.equals(flag, "false")) {
+                msg.setInfo("上传图片上传异常");
+                msg.setResult(false);
+            } else {
+                msg.setObject(PropertiesConstants.OSS_URL + PropertiesConstants.OSSPATH + fileName);
+            }
+        } catch (IOException e) {
+            msg.setInfo("上传图片上传异常");
+            msg.setResult(false);
+            e.printStackTrace();
+        }
+        return msg;
+    }
+
+}
diff --git a/ruoyi-content/src/main/resources/static/js/wangEditor.js b/ruoyi-content/src/main/resources/static/js/wangEditor.js
new file mode 100644
index 000000000..c1573e299
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/js/wangEditor.js
@@ -0,0 +1,10309 @@
+! function (e, t) {
+    "object" == typeof exports && "object" == typeof module ? module.exports = t() : "function" == typeof define &&
+    define.amd ? define([], t) : "object" == typeof exports ? exports.wangEditor = t() : e.wangEditor = t()
+}(window, function () {
+    return o = {}, i.m = n = [function (e, t) {
+        e.exports = function (e) {
+            return e && e.__esModule ? e : {
+                default: e
+            }
+        }, e.exports.default = e.exports, e.exports.__esModule = !0
+    }, function (e, t, n) {
+        e.exports = n(141)
+    }, function (e, t, n) {
+        "use strict";
+        n.r(t), n.d(t, "__extends", function () {
+            return i
+        }), n.d(t, "__assign", function () {
+            return r
+        }), n.d(t, "__rest", function () {
+            return a
+        }), n.d(t, "__decorate", function () {
+            return l
+        }), n.d(t, "__param", function () {
+            return u
+        }), n.d(t, "__metadata", function () {
+            return s
+        }), n.d(t, "__awaiter", function () {
+            return c
+        }), n.d(t, "__generator", function () {
+            return f
+        }), n.d(t, "__createBinding", function () {
+            return d
+        }), n.d(t, "__exportStar", function () {
+            return p
+        }), n.d(t, "__values", function () {
+            return h
+        }), n.d(t, "__read", function () {
+            return A
+        }), n.d(t, "__spread", function () {
+            return v
+        }), n.d(t, "__spreadArrays", function () {
+            return m
+        }), n.d(t, "__spreadArray", function () {
+            return g
+        }), n.d(t, "__await", function () {
+            return y
+        }), n.d(t, "__asyncGenerator", function () {
+            return w
+        }), n.d(t, "__asyncDelegator", function () {
+            return x
+        }), n.d(t, "__asyncValues", function () {
+            return _
+        }), n.d(t, "__makeTemplateObject", function () {
+            return E
+        }), n.d(t, "__importStar", function () {
+            return C
+        }), n.d(t, "__importDefault", function () {
+            return S
+        }), n.d(t, "__classPrivateFieldGet", function () {
+            return D
+        }), n.d(t, "__classPrivateFieldSet", function () {
+            return M
+        });
+        /*! *****************************************************************************
+        Copyright (c) Microsoft Corporation.
+
+        Permission to use, copy, modify, and/or distribute this software for any
+        purpose with or without fee is hereby granted.
+
+        THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+        REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+        AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+        INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+        LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+        OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+        PERFORMANCE OF THIS SOFTWARE.
+        ***************************************************************************** */
+        var o = function (e, t) {
+            return (o = Object.setPrototypeOf || {
+                    __proto__: []
+                }
+                instanceof Array && function (e, t) {
+                    e.__proto__ = t
+                } || function (e, t) {
+                    for (var n in t) Object.prototype.hasOwnProperty.call(t, n) && (e[n] = t[n])
+                })(e, t)
+        };
+
+        function i(e, t) {
+            if ("function" != typeof t && null !== t) throw new TypeError("Class extends value " + String(t) +
+                " is not a constructor or null");
+
+            function n() {
+                this.constructor = e
+            }
+            o(e, t), e.prototype = null === t ? Object.create(t) : (n.prototype = t.prototype, new n)
+        }
+        var r = function () {
+            return (r = Object.assign || function (e) {
+                for (var t, n = 1, o = arguments.length; n < o; n++)
+                    for (var i in t = arguments[n]) Object.prototype.hasOwnProperty.call(t, i) &&
+                    (e[i] = t[i]);
+                return e
+            }).apply(this, arguments)
+        };
+
+        function a(e, t) {
+            var n = {};
+            for (i in e) Object.prototype.hasOwnProperty.call(e, i) && t.indexOf(i) < 0 && (n[i] = e[i]);
+            if (null != e && "function" == typeof Object.getOwnPropertySymbols)
+                for (var o = 0, i = Object.getOwnPropertySymbols(e); o < i.length; o++) t.indexOf(i[o]) < 0 &&
+                Object.prototype.propertyIsEnumerable.call(e, i[o]) && (n[i[o]] = e[i[o]]);
+            return n
+        }
+
+        function l(e, t, n, o) {
+            var i, r = arguments.length,
+                a = r < 3 ? t : null === o ? o = Object.getOwnPropertyDescriptor(t, n) : o;
+            if ("object" == typeof Reflect && "function" == typeof Reflect.decorate) a = Reflect.decorate(e,
+                t, n, o);
+            else
+                for (var l = e.length - 1; 0 <= l; l--)(i = e[l]) && (a = (r < 3 ? i(a) : 3 < r ? i(t, n, a) :
+                    i(t, n)) || a);
+            return 3 < r && a && Object.defineProperty(t, n, a), a
+        }
+
+        function u(n, o) {
+            return function (e, t) {
+                o(e, t, n)
+            }
+        }
+
+        function s(e, t) {
+            if ("object" == typeof Reflect && "function" == typeof Reflect.metadata) return Reflect.metadata(
+                e, t)
+        }
+
+        function c(e, a, l, u) {
+            return new(l = l || Promise)(function (n, t) {
+                function o(e) {
+                    try {
+                        r(u.next(e))
+                    } catch (e) {
+                        t(e)
+                    }
+                }
+
+                function i(e) {
+                    try {
+                        r(u.throw(e))
+                    } catch (e) {
+                        t(e)
+                    }
+                }
+
+                function r(e) {
+                    var t;
+                    e.done ? n(e.value) : ((t = e.value) instanceof l ? t : new l(function (e) {
+                        e(t)
+                    })).then(o, i)
+                }
+                r((u = u.apply(e, a || [])).next())
+            })
+        }
+
+        function f(n, o) {
+            var i, r, a, l = {
+                    label: 0,
+                    sent: function () {
+                        if (1 & a[0]) throw a[1];
+                        return a[1]
+                    },
+                    trys: [],
+                    ops: []
+                },
+                e = {
+                    next: t(0),
+                    throw: t(1),
+                    return: t(2)
+                };
+            return "function" == typeof Symbol && (e[Symbol.iterator] = function () {
+                return this
+            }), e;
+
+            function t(t) {
+                return function (e) {
+                    return function (t) {
+                        if (i) throw new TypeError("Generator is already executing.");
+                        for (; l;) try {
+                            if (i = 1, r && (a = 2 & t[0] ? r.return : t[0] ? r.throw || ((a =
+                                r.return) && a.call(r), 0) : r.next) && !(a = a.call(r, t[1]))
+                                .done) return a;
+                            switch (r = 0, (t = a ? [2 & t[0], a.value] : t)[0]) {
+                                case 0:
+                                case 1:
+                                    a = t;
+                                    break;
+                                case 4:
+                                    return l.label++, {
+                                        value: t[1],
+                                        done: !1
+                                    };
+                                case 5:
+                                    l.label++, r = t[1], t = [0];
+                                    continue;
+                                case 7:
+                                    t = l.ops.pop(), l.trys.pop();
+                                    continue;
+                                default:
+                                    if (!(a = 0 < (a = l.trys).length && a[a.length - 1]) && (6 ===
+                                        t[0] || 2 === t[0])) {
+                                        l = 0;
+                                        continue
+                                    }
+                                    if (3 === t[0] && (!a || t[1] > a[0] && t[1] < a[3])) {
+                                        l.label = t[1];
+                                        break
+                                    }
+                                    if (6 === t[0] && l.label < a[1]) {
+                                        l.label = a[1], a = t;
+                                        break
+                                    }
+                                    if (a && l.label < a[2]) {
+                                        l.label = a[2], l.ops.push(t);
+                                        break
+                                    }
+                                    a[2] && l.ops.pop(), l.trys.pop();
+                                    continue
+                            }
+                            t = o.call(n, l)
+                        } catch (e) {
+                            t = [6, e], r = 0
+                        } finally {
+                            i = a = 0
+                        }
+                        if (5 & t[0]) throw t[1];
+                        return {
+                            value: t[0] ? t[1] : void 0,
+                            done: !0
+                        }
+                    }([t, e])
+                }
+            }
+        }
+        var d = Object.create ? function (e, t, n, o) {
+            void 0 === o && (o = n), Object.defineProperty(e, o, {
+                enumerable: !0,
+                get: function () {
+                    return t[n]
+                }
+            })
+        } : function (e, t, n, o) {
+            e[o = void 0 === o ? n : o] = t[n]
+        };
+
+        function p(e, t) {
+            for (var n in e) "default" === n || Object.prototype.hasOwnProperty.call(t, n) || d(t, e, n)
+        }
+
+        function h(e) {
+            var t = "function" == typeof Symbol && Symbol.iterator,
+                n = t && e[t],
+                o = 0;
+            if (n) return n.call(e);
+            if (e && "number" == typeof e.length) return {
+                next: function () {
+                    return {
+                        value: (e = e && o >= e.length ? void 0 : e) && e[o++],
+                        done: !e
+                    }
+                }
+            };
+            throw new TypeError(t ? "Object is not iterable." : "Symbol.iterator is not defined.")
+        }
+
+        function A(e, t) {
+            var n = "function" == typeof Symbol && e[Symbol.iterator];
+            if (!n) return e;
+            var o, i, r = n.call(e),
+                a = [];
+            try {
+                for (;
+                    (void 0 === t || 0 < t--) && !(o = r.next()).done;) a.push(o.value)
+            } catch (e) {
+                i = {
+                    error: e
+                }
+            } finally {
+                try {
+                    o && !o.done && (n = r.return) && n.call(r)
+                } finally {
+                    if (i) throw i.error
+                }
+            }
+            return a
+        }
+
+        function v() {
+            for (var e = [], t = 0; t < arguments.length; t++) e = e.concat(A(arguments[t]));
+            return e
+        }
+
+        function m() {
+            for (var e = 0, t = 0, n = arguments.length; t < n; t++) e += arguments[t].length;
+            for (var o = Array(e), i = 0, t = 0; t < n; t++)
+                for (var r = arguments[t], a = 0, l = r.length; a < l; a++, i++) o[i] = r[a];
+            return o
+        }
+
+        function g(e, t) {
+            for (var n = 0, o = t.length, i = e.length; n < o; n++, i++) e[i] = t[n];
+            return e
+        }
+
+        function y(e) {
+            return this instanceof y ? (this.v = e, this) : new y(e)
+        }
+
+        function w(e, t, n) {
+            if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+            var i = n.apply(e, t || []),
+                r = [],
+                a = {};
+            return o("next"), o("throw"), o("return"), a[Symbol.asyncIterator] = function () {
+                return this
+            }, a;
+
+            function o(o) {
+                i[o] && (a[o] = function (n) {
+                    return new Promise(function (e, t) {
+                        1 < r.push([o, n, e, t]) || l(o, n)
+                    })
+                })
+            }
+
+            function l(e, t) {
+                try {
+                    (n = i[e](t)).value instanceof y ? Promise.resolve(n.value.v).then(u, s) : c(r[0][2], n)
+                } catch (e) {
+                    c(r[0][3], e)
+                }
+                var n
+            }
+
+            function u(e) {
+                l("next", e)
+            }
+
+            function s(e) {
+                l("throw", e)
+            }
+
+            function c(e, t) {
+                e(t), r.shift(), r.length && l(r[0][0], r[0][1])
+            }
+        }
+
+        function x(o) {
+            var i, e = {};
+            return t("next"), t("throw", function (e) {
+                throw e
+            }), t("return"), e[Symbol.iterator] = function () {
+                return this
+            }, e;
+
+            function t(t, n) {
+                e[t] = o[t] ? function (e) {
+                    return (i = !i) ? {
+                        value: y(o[t](e)),
+                        done: "return" === t
+                    } : n ? n(e) : e
+                } : n
+            }
+        }
+
+        function _(a) {
+            if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+            var e, t = a[Symbol.asyncIterator];
+            return t ? t.call(a) : (a = h(a), e = {}, n("next"), n("throw"), n("return"), e[Symbol.asyncIterator] =
+                function () {
+                    return this
+                }, e);
+
+            function n(r) {
+                e[r] = a[r] && function (i) {
+                    return new Promise(function (e, t) {
+                        var n, o;
+                        i = a[r](i), n = e, e = t, o = i.done, t = i.value, Promise.resolve(t).then(
+                            function (e) {
+                                n({
+                                    value: e,
+                                    done: o
+                                })
+                            }, e)
+                    })
+                }
+            }
+        }
+
+        function E(e, t) {
+            return Object.defineProperty ? Object.defineProperty(e, "raw", {
+                value: t
+            }) : e.raw = t, e
+        }
+        var b = Object.create ? function (e, t) {
+            Object.defineProperty(e, "default", {
+                enumerable: !0,
+                value: t
+            })
+        } : function (e, t) {
+            e.default = t
+        };
+
+        function C(e) {
+            if (e && e.__esModule) return e;
+            var t = {};
+            if (null != e)
+                for (var n in e) "default" !== n && Object.prototype.hasOwnProperty.call(e, n) && d(t, e, n);
+            return b(t, e), t
+        }
+
+        function S(e) {
+            return e && e.__esModule ? e : {
+                default: e
+            }
+        }
+
+        function D(e, t, n, o) {
+            if ("a" === n && !o) throw new TypeError("Private accessor was defined without a getter");
+            if ("function" == typeof t ? e !== t || !o : !t.has(e)) throw new TypeError(
+                "Cannot read private member from an object whose class did not declare it");
+            return "m" === n ? o : "a" === n ? o.call(e) : o ? o.value : t.get(e)
+        }
+
+        function M(e, t, n, o, i) {
+            if ("m" === o) throw new TypeError("Private method is not writable");
+            if ("a" === o && !i) throw new TypeError("Private accessor was defined without a setter");
+            if ("function" == typeof t ? e !== t || !i : !t.has(e)) throw new TypeError(
+                "Cannot write private member to an object whose class did not declare it");
+            return "a" === o ? i.call(e, n) : i ? i.value = n : t.set(e, n), n
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(91)),
+            u = o(n(4)),
+            a = o(n(25)),
+            l = o(n(19)),
+            s = o(n(120)),
+            c = o(n(26)),
+            f = o(n(93)),
+            d = o(n(74)),
+            p = o(n(55)),
+            h = o(n(56));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.DomElement = void 0;
+        var A = n(2),
+            v = n(6),
+            m = [];
+
+        function g(e) {
+            var t = [],
+                n = [],
+                t = (0, r.default)(e) ? e : e.split(";");
+            return (0, u.default)(t).call(t, function (e) {
+                e = (0, a.default)(e = e.split(":")).call(e, function (e) {
+                    return (0, l.default)(e).call(e)
+                });
+                2 === e.length && n.push(e[0] + ":" + e[1])
+            }), n
+        }
+        var y = ((0, i.default)(w.prototype, "id", {
+            get: function () {
+                return this.elems[0].id
+            },
+            enumerable: !1,
+            configurable: !0
+        }), w.prototype.forEach = function (e) {
+            for (var t = 0; t < this.length; t++) {
+                var n = this.elems[t];
+                if (!1 === e.call(n, n, t)) break
+            }
+            return this
+        }, w.prototype.clone = function (t) {
+            var e;
+            void 0 === t && (t = !1);
+            var n = [];
+            return (0, u.default)(e = this.elems).call(e, function (e) {
+                n.push(e.cloneNode(!!t))
+            }), x(n)
+        }, w.prototype.get = function (e) {
+            var t = this.length;
+            return t <= (e = void 0 === e ? 0 : e) && (e %= t), x(this.elems[e])
+        }, w.prototype.first = function () {
+            return this.get(0)
+        }, w.prototype.last = function () {
+            var e = this.length;
+            return this.get(e - 1)
+        }, w.prototype.on = function (n, o, i) {
+            return n ? ("function" == typeof o && (i = o, o = ""), (0, u.default)(this).call(this,
+                function (e) {
+                    var t;
+                    o ? (e.addEventListener(n, t = function (e) {
+                        var t = e.target;
+                        t.matches(o) && i.call(t, e)
+                    }), m.push({
+                        elem: e,
+                        selector: o,
+                        fn: i,
+                        agentFn: t
+                    })) : e.addEventListener(n, i)
+                })) : this
+        }, w.prototype.off = function (r, a, l) {
+            return r ? ("function" == typeof a && (l = a, a = ""), (0, u.default)(this).call(this,
+                function (e) {
+                    if (a) {
+                        for (var t, n = -1, o = 0; o < m.length; o++) {
+                            var i = m[o];
+                            if (i.selector === a && i.fn === l && i.elem === e) {
+                                n = o;
+                                break
+                            }
+                        } - 1 !== n && (t = (0, f.default)(m).call(m, n, 1)[0].agentFn, e.removeEventListener(
+                            r, t))
+                    } else e.removeEventListener(r, l)
+                })) : this
+        }, w.prototype.attr = function (t, n) {
+            return null == n ? this.elems[0].getAttribute(t) || "" : (0, u.default)(this).call(this,
+                function (e) {
+                    e.setAttribute(t, n)
+                })
+        }, w.prototype.removeAttr = function (t) {
+            (0, u.default)(this).call(this, function (e) {
+                e.removeAttribute(t)
+            })
+        }, w.prototype.addClass = function (n) {
+            return n ? (0, u.default)(this).call(this, function (e) {
+                var t;
+                e.className ? (t = e.className.split(/\s/), t = (0, d.default)(t).call(t,
+                    function (e) {
+                        return !!(0, l.default)(e).call(e)
+                    }), (0, c.default)(t).call(t, n) < 0 && t.push(n), e.className =
+                    t.join(" ")) : e.className = n
+            }) : this
+        }, w.prototype.removeClass = function (n) {
+            return n ? (0, u.default)(this).call(this, function (e) {
+                var t;
+                e.className && (t = e.className.split(/\s/), t = (0, d.default)(t).call(t,
+                    function (e) {
+                        return !(!(e = (0, l.default)(e).call(e)) || e === n)
+                    }), e.className = t.join(" "))
+            }) : this
+        }, w.prototype.hasClass = function (e) {
+            if (!e) return !1;
+            var t = this.elems[0];
+            if (!t.className) return !1;
+            t = t.className.split(/\s/);
+            return (0, p.default)(t).call(t, e)
+        }, w.prototype.css = function (n, e) {
+            var o = "" == e ? "" : n + ":" + e + ";";
+            return (0, u.default)(this).call(this, function (e) {
+                var t = (0, l.default)(t = e.getAttribute("style") || "").call(t);
+                t ? (t = g(t), t = (0, a.default)(t).call(t, function (e) {
+                    return 0 === (0, c.default)(e).call(e, n) ? o : e
+                }), "" != o && (0, c.default)(t).call(t, o) < 0 && t.push(o), "" ==
+                o && (t = g(t)), e.setAttribute("style", t.join("; "))) : e.setAttribute(
+                    "style", o)
+            })
+        }, w.prototype.getBoundingClientRect = function () {
+            return this.elems[0].getBoundingClientRect()
+        }, w.prototype.show = function () {
+            return this.css("display", "block")
+        }, w.prototype.hide = function () {
+            return this.css("display", "none")
+        }, w.prototype.children = function () {
+            var e = this.elems[0];
+            return e ? x(e.children) : null
+        }, w.prototype.childNodes = function () {
+            var e = this.elems[0];
+            return e ? x(e.childNodes) : null
+        }, w.prototype.replaceChildAll = function (e) {
+            for (var t = this.getNode(), n = this.elems[0]; n.hasChildNodes();) t.firstChild && n.removeChild(
+                t.firstChild);
+            this.append(e)
+        }, w.prototype.append = function (e) {
+            return (0, u.default)(this).call(this, function (t) {
+                (0, u.default)(e).call(e, function (e) {
+                    t.appendChild(e)
+                })
+            })
+        }, w.prototype.remove = function () {
+            return (0, u.default)(this).call(this, function (e) {
+                var t;
+                e.remove ? e.remove() : (t = e.parentElement) && t.removeChild(e)
+            })
+        }, w.prototype.isContain = function (e) {
+            var t = this.elems[0],
+                e = e.elems[0];
+            return t.contains(e)
+        }, w.prototype.getNodeName = function () {
+            return this.elems[0].nodeName
+        }, w.prototype.getNode = function (e) {
+            return this.elems[e = void 0 === e ? 0 : e]
+        }, w.prototype.find = function (e) {
+            return x(this.elems[0].querySelectorAll(e))
+        }, w.prototype.text = function (t) {
+            return t ? (0, u.default)(this).call(this, function (e) {
+                e.innerHTML = t
+            }) : this.elems[0].innerHTML.replace(/<[^>]+>/g, function () {
+                return ""
+            })
+        }, w.prototype.html = function (e) {
+            var t = this.elems[0];
+            return e ? (t.innerHTML = e, this) : t.innerHTML
+        }, w.prototype.val = function () {
+            var e = this.elems[0];
+            return (0, l.default)(e = e.value).call(e)
+        }, w.prototype.focus = function () {
+            return (0, u.default)(this).call(this, function (e) {
+                e.focus()
+            })
+        }, w.prototype.prev = function () {
+            return x(this.elems[0].previousElementSibling)
+        }, w.prototype.next = function () {
+            return x(this.elems[0].nextElementSibling)
+        }, w.prototype.getNextSibling = function () {
+            return x(this.elems[0].nextSibling)
+        }, w.prototype.parent = function () {
+            return x(this.elems[0].parentElement)
+        }, w.prototype.parentUntil = function (e, t) {
+            t = t || this.elems[0];
+            if ("BODY" === t.nodeName) return null;
+            t = t.parentElement;
+            return null === t ? null : t.matches(e) ? x(t) : this.parentUntil(e, t)
+        }, w.prototype.parentUntilEditor = function (e, t, n) {
+            n = n || this.elems[0];
+            if (x(n).equal(t.$textContainerElem) || x(n).equal(t.$toolbarElem)) return null;
+            n = n.parentElement;
+            return null === n ? null : n.matches(e) ? x(n) : this.parentUntilEditor(e, t, n)
+        }, w.prototype.equal = function (e) {
+            return e instanceof w ? this.elems[0] === e.elems[0] : e instanceof HTMLElement && this
+                .elems[0] === e
+        }, w.prototype.insertBefore = function (e) {
+            var t = x(e).elems[0];
+            return t ? (0, u.default)(this).call(this, function (e) {
+                t.parentNode.insertBefore(e, t)
+            }) : this
+        }, w.prototype.insertAfter = function (e) {
+            var n = x(e).elems[0],
+                o = n && n.nextSibling;
+            return n ? (0, u.default)(this).call(this, function (e) {
+                var t = n.parentNode;
+                o ? t.insertBefore(e, o) : t.appendChild(e)
+            }) : this
+        }, w.prototype.data = function (e, t) {
+            if (null == t) return this.dataSource.get(e);
+            this.dataSource.set(e, t)
+        }, w.prototype.getNodeTop = function (e) {
+            if (this.length < 1) return this;
+            var t = this.parent();
+            return e.$textElem.equal(this) || e.$textElem.equal(t) ? this : (t.prior = this, t.getNodeTop(
+                e))
+        }, w.prototype.getOffsetData = function () {
+            var e = this.elems[0];
+            return {
+                top: e.offsetTop,
+                left: e.offsetLeft,
+                width: e.offsetWidth,
+                height: e.offsetHeight,
+                parent: e.offsetParent
+            }
+        }, w.prototype.scrollTop = function (e) {
+            this.elems[0].scrollTo({
+                top: e
+            })
+        }, w);
+
+        function w(e) {
+            if (this.elems = [], this.length = this.elems.length, this.dataSource = new s.default, e) {
+                if (e instanceof w) return e;
+                var t, n = [],
+                    o = e instanceof Node ? e.nodeType : -1;
+                this.selector = e, 1 === o || 9 === o ? n = [e] : (t = e) && (t instanceof HTMLCollection ||
+                    t instanceof NodeList) ? n = v.toArray(e) : e instanceof Array ? n = e : "string" ==
+                    typeof e && (t = (0, l.default)(o = e.replace("/\n/mg", "")).call(o), n = 0 === (0, c.default)
+                    (t).call(t, "<") ? (e = t, (o = document.createElement("div")).innerHTML = e, o = o
+                        .children, v.toArray(o)) : (t = t, t = document.querySelectorAll(t), v.toArray(
+                        t)));
+                var i = n.length;
+                if (!i) return this;
+                for (var r = 0; r < i; r++) this.elems.push(n[r]);
+                this.length = i
+            }
+        }
+
+        function x() {
+            for (var e = [], t = 0; t < arguments.length; t++) e[t] = arguments[t];
+            return new((0, h.default)(y).apply(y, A.__spreadArray([void 0], e)))
+        }
+        t.DomElement = y, t.default = x
+    }, function (e, t, n) {
+        e.exports = n(181)
+    }, function (e, t, n) {
+        "use strict";
+
+        function h(o) {
+            function e(e, t, n) {
+                if (this instanceof o) {
+                    switch (arguments.length) {
+                        case 0:
+                            return new o;
+                        case 1:
+                            return new o(e);
+                        case 2:
+                            return new o(e, t)
+                    }
+                    return new o(e, t, n)
+                }
+                return o.apply(this, arguments)
+            }
+            return e.prototype = o.prototype, e
+        }
+        var A = n(8),
+            v = n(75).f,
+            m = n(101),
+            g = n(10),
+            y = n(38),
+            w = n(17),
+            x = n(16);
+        e.exports = function (e, t) {
+            var n, o, i, r, a, l = e.target,
+                u = e.global,
+                s = e.stat,
+                c = e.proto,
+                f = u ? A : s ? A[l] : (A[l] || {}).prototype,
+                d = u ? g : g[l] || (g[l] = {}),
+                p = d.prototype;
+            for (n in t) r = !m(u ? n : l + (s ? "." : "#") + n, e.forced) && f && x(f, n), o = d[n], r &&
+            (i = e.noTargetGet ? (a = v(f, n)) && a.value : f[n]), a = r && i ? i : t[n], r &&
+            typeof o == typeof a || (r = e.bind && r ? y(a, A) : e.wrap && r ? h(a) : c &&
+            "function" == typeof a ? y(Function.call, a) : a, (e.sham || a && a.sham || o && o.sham) &&
+            w(r, "sham", !0), d[n] = r, c && (x(g, r = l + "Prototype") || w(g, r, {}), g[r][n] =
+                a, e.real && p && !p[n] && w(p, n, a)))
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(94)),
+            r = o(n(1)),
+            a = o(n(258)),
+            l = o(n(44)),
+            u = o(n(45)),
+            s = o(n(91)),
+            c = o(n(25));
+        (0, r.default)(t, "__esModule", {
+            value: !0
+        }), t.hexToRgb = t.getRandomCode = t.toArray = t.deepClone = t.isFunction = t.debounce = t.throttle =
+            t.arrForEach = t.forEach = t.replaceSpecialSymbol = t.replaceHtmlSymbol = t.getRandom = t.UA =
+                void 0;
+        var f = n(2),
+            n = (d.prototype.isIE = function () {
+                return "ActiveXObject" in window
+            }, d.prototype.isWebkit = function () {
+                return /webkit/i.test(this._ua)
+            }, d);
+
+        function d() {
+            this._ua = navigator.userAgent;
+            var e = this._ua.match(/(Edge?)\/(\d+)/);
+            this.isOldEdge = !!(e && "Edge" == e[1] && (0, a.default)(e[2]) < 19), this.isFirefox = !(!
+                /Firefox\/\d+/.test(this._ua) || /Seamonkey\/\d+/.test(this._ua))
+        }
+        t.UA = new n, t.getRandom = function (e) {
+            return (e = void 0 === e ? "" : e) + (0, l.default)(e = Math.random().toString()).call(e, 2)
+        }, t.replaceHtmlSymbol = function (e) {
+            return e.replace(/</gm, "&lt;").replace(/>/gm, "&gt;").replace(/"/gm, "&quot;").replace(
+                /(\r\n|\r|\n)/g, "<br/>")
+        }, t.replaceSpecialSymbol = function (e) {
+            return e.replace(/&lt;/gm, "<").replace(/&gt;/gm, ">").replace(/&quot;/gm, '"')
+        }, t.forEach = function (e, t) {
+            for (var n in e)
+                if (Object.prototype.hasOwnProperty.call(e, n))
+                    if (!1 === t(n, e[n])) break
+        }, t.arrForEach = function (e, t) {
+            for (var n, o = e.length || 0, i = 0; i < o && (n = e[i], !1 !== t.call(e, n, i)); i++);
+        }, t.throttle = function (o, i) {
+            void 0 === i && (i = 200);
+            var r = !1;
+            return function () {
+                for (var e = this, t = [], n = 0; n < arguments.length; n++) t[n] = arguments[n];
+                r || (r = !0, (0, u.default)(function () {
+                    r = !1, o.call.apply(o, f.__spreadArray([e], t))
+                }, i))
+            }
+        }, t.debounce = function (o, i) {
+            void 0 === i && (i = 200);
+            var r = 0;
+            return function () {
+                for (var e = this, t = [], n = 0; n < arguments.length; n++) t[n] = arguments[n];
+                r && window.clearTimeout(r), r = (0, u.default)(function () {
+                    r = 0, o.call.apply(o, f.__spreadArray([e], t))
+                }, i)
+            }
+        }, t.isFunction = function (e) {
+            return "function" == typeof e
+        }, t.deepClone = function e(t) {
+            if ("object" !== (0, i.default)(t) || "function" == typeof t || null === t) return t;
+            var n, o;
+            for (o in (0, s.default)(t) && (n = []), (0, s.default)(t) || (n = {}), t) Object.prototype
+                .hasOwnProperty.call(t, o) && (n[o] = e(t[o]));
+            return n
+        }, t.toArray = function (e) {
+            return (0, l.default)(Array.prototype).call(e)
+        }, t.getRandomCode = function () {
+            var e;
+            return (0, l.default)(e = Math.random().toString(36)).call(e, -5)
+        }, t.hexToRgb = function (e) {
+            return null == (e = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(e)) ? null : "rgb(" +
+                (e = (0, c.default)(e).call(e, function (e) {
+                    return (0, a.default)(e, 16)
+                }))[1] + ", " + e[2] + ", " + e[3] + ")"
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.EMPTY_P_REGEX = t.EMPTY_P_LAST_REGEX = t.EMPTY_P = t.urlRegex = t.EMPTY_FN = void 0, t.EMPTY_FN =
+            function () {}, t.urlRegex =
+            /^(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-.,@?^=%&amp;:/~+#]*[\w\-@?^=%&amp;/~+#])?/, t
+            .EMPTY_P = '<p data-we-empty-p=""><br></p>', t.EMPTY_P_LAST_REGEX =
+            /<p data-we-empty-p=""><br\/?><\/p>$/gim, t.EMPTY_P_REGEX = /<p data-we-empty-p="">/gim
+    }, function (n, e, t) {
+        ! function (e) {
+            function t(e) {
+                return e && e.Math == Math && e
+            }
+            n.exports = t("object" == typeof globalThis && globalThis) || t("object" == typeof window &&
+                window) || t("object" == typeof self && self) || t("object" == typeof e && e) ||
+                function () {
+                    return this
+                }() || Function("return this")()
+        }.call(this, t(144))
+    }, function (e, t, n) {
+        var o = n(8),
+            i = n(79),
+            r = n(16),
+            a = n(61),
+            l = n(84),
+            n = n(106),
+            u = i("wks"),
+            s = o.Symbol,
+            c = n ? s : s && s.withoutSetter || a;
+        e.exports = function (e) {
+            return r(u, e) && (l || "string" == typeof u[e]) || (l && r(s, e) ? u[e] = s[e] : u[e] = c(
+                "Symbol." + e)), u[e]
+        }
+    }, function (e, t) {
+        e.exports = {}
+    }, function (e, t, n) {
+        var o = n(10),
+            i = n(16),
+            r = n(95),
+            a = n(18).f;
+        e.exports = function (e) {
+            var t = o.Symbol || (o.Symbol = {});
+            i(t, e) || a(t, e, {
+                value: r.f(e)
+            })
+        }
+    }, function (e, t) {
+        e.exports = function (e) {
+            try {
+                return !!e()
+            } catch (e) {
+                return !0
+            }
+        }
+    }, function (e, t) {
+        e.exports = function (e) {
+            return "object" == typeof e ? null !== e : "function" == typeof e
+        }
+    }, function (e, t, n) {
+        var o = n(10);
+        e.exports = function (e) {
+            return o[e + "Prototype"]
+        }
+    }, function (e, t, n) {
+        n = n(12);
+        e.exports = !n(function () {
+            return 7 != Object.defineProperty({}, 1, {
+                get: function () {
+                    return 7
+                }
+            })[1]
+        })
+    }, function (e, t) {
+        var n = {}.hasOwnProperty;
+        e.exports = function (e, t) {
+            return n.call(e, t)
+        }
+    }, function (e, t, n) {
+        var o = n(15),
+            i = n(18),
+            r = n(37);
+        e.exports = o ? function (e, t, n) {
+            return i.f(e, t, r(1, n))
+        } : function (e, t, n) {
+            return e[t] = n, e
+        }
+    }, function (e, t, n) {
+        var o = n(15),
+            i = n(100),
+            r = n(20),
+            a = n(59),
+            l = Object.defineProperty;
+        t.f = o ? l : function (e, t, n) {
+            if (r(e), t = a(t, !0), r(n), i) try {
+                return l(e, t, n)
+            } catch (e) {}
+            if ("get" in n || "set" in n) throw TypeError("Accessors not supported");
+            return "value" in n && (e[t] = n.value), e
+        }
+    }, function (e, t, n) {
+        e.exports = n(193)
+    }, function (e, t, n) {
+        var o = n(13);
+        e.exports = function (e) {
+            if (!o(e)) throw TypeError(String(e) + " is not an object");
+            return e
+        }
+    }, function (e, t, i) {
+        "use strict";
+        var n, o, l = function () {
+                return n = void 0 === n ? Boolean(window && document && document.all && !window.atob) : n
+            },
+            r = (o = {}, function (e) {
+                if (void 0 === o[e]) {
+                    var t = document.querySelector(e);
+                    if (window.HTMLIFrameElement && t instanceof window.HTMLIFrameElement) try {
+                        t = t.contentDocument.head
+                    } catch (e) {
+                        t = null
+                    }
+                    o[e] = t
+                }
+                return o[e]
+            }),
+            s = [];
+
+        function c(e) {
+            for (var t = -1, n = 0; n < s.length; n++)
+                if (s[n].identifier === e) {
+                    t = n;
+                    break
+                } return t
+        }
+
+        function u(e, t) {
+            for (var n = {}, o = [], i = 0; i < e.length; i++) {
+                var r = e[i],
+                    a = t.base ? r[0] + t.base : r[0],
+                    l = n[a] || 0,
+                    u = "".concat(a, " ").concat(l);
+                n[a] = l + 1;
+                l = c(u), r = {
+                    css: r[1],
+                    media: r[2],
+                    sourceMap: r[3]
+                }; - 1 !== l ? (s[l].references++, s[l].updater(r)) : s.push({
+                    identifier: u,
+                    updater: function (t, e) {
+                        var n, o, i; {
+                            var r;
+                            i = e.singleton ? (r = A++, n = h = h || f(e), o = p.bind(null, n,
+                                r, !1), p.bind(null, n, r, !0)) : (n = f(e), o = function (
+                                e, t, n) {
+                                var o = n.css,
+                                    i = n.media,
+                                    n = n.sourceMap;
+                                i ? e.setAttribute("media", i) : e.removeAttribute(
+                                    "media");
+                                n && "undefined" != typeof btoa && (o +=
+                                    "\n/*# sourceMappingURL=data:application/json;base64,"
+                                        .concat(btoa(unescape(encodeURIComponent(JSON.stringify(
+                                            n)))), " */"));
+                                if (e.styleSheet) e.styleSheet.cssText = o;
+                                else {
+                                    for (; e.firstChild;) e.removeChild(e.firstChild);
+                                    e.appendChild(document.createTextNode(o))
+                                }
+                            }.bind(null, n, e), function () {
+                                ! function (e) {
+                                    if (null === e.parentNode) return;
+                                    e.parentNode.removeChild(e)
+                                }(n)
+                            })
+                        }
+                        return o(t),
+                            function (e) {
+                                e ? e.css === t.css && e.media === t.media && e.sourceMap ===
+                                    t.sourceMap || o(t = e) : i()
+                            }
+                    }(r, t),
+                    references: 1
+                }), o.push(u)
+            }
+            return o
+        }
+
+        function f(e) {
+            var t, n = document.createElement("style"),
+                o = e.attributes || {};
+            if (void 0 !== o.nonce || (t = i.nc) && (o.nonce = t), Object.keys(o).forEach(function (e) {
+                n.setAttribute(e, o[e])
+            }), "function" == typeof e.insert) e.insert(n);
+            else {
+                e = r(e.insert || "head");
+                if (!e) throw new Error(
+                    "Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid."
+                );
+                e.appendChild(n)
+            }
+            return n
+        }
+        var a, d = (a = [], function (e, t) {
+            return a[e] = t, a.filter(Boolean).join("\n")
+        });
+
+        function p(e, t, n, o) {
+            n = n ? "" : o.media ? "@media ".concat(o.media, " {").concat(o.css, "}") : o.css;
+            e.styleSheet ? e.styleSheet.cssText = d(t, n) : (o = document.createTextNode(n), (n = e.childNodes)[
+                t] && e.removeChild(n[t]), n.length ? e.insertBefore(o, n[t]) : e.appendChild(o))
+        }
+        var h = null,
+            A = 0;
+        e.exports = function (e, r) {
+            (r = r || {}).singleton || "boolean" == typeof r.singleton || (r.singleton = l());
+            var a = u(e = e || [], r);
+            return function (e) {
+                if (e = e || [], "[object Array]" === Object.prototype.toString.call(e)) {
+                    for (var t = 0; t < a.length; t++) {
+                        var n = c(a[t]);
+                        s[n].references--
+                    }
+                    for (var e = u(e, r), o = 0; o < a.length; o++) {
+                        var i = c(a[o]);
+                        0 === s[i].references && (s[i].updater(), s.splice(i, 1))
+                    }
+                    a = e
+                }
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+        e.exports = function (n) {
+            var u = [];
+            return u.toString = function () {
+                return this.map(function (e) {
+                    var t = function (e, t) {
+                        var n = e[1] || "",
+                            o = e[3];
+                        if (!o) return n;
+                        if (t && "function" == typeof btoa) {
+                            e = function (e) {
+                                e = btoa(unescape(encodeURIComponent(JSON.stringify(
+                                    e)))), e =
+                                    "sourceMappingURL=data:application/json;charset=utf-8;base64,"
+                                        .concat(e);
+                                return "/*# ".concat(e, " */")
+                            }(o), t = o.sources.map(function (e) {
+                                return "/*# sourceURL=".concat(o.sourceRoot ||
+                                    "").concat(e, " */")
+                            });
+                            return [n].concat(t).concat([e]).join("\n")
+                        }
+                        return [n].join("\n")
+                    }(e, n);
+                    return e[2] ? "@media ".concat(e[2], " {").concat(t, "}") : t
+                }).join("")
+            }, u.i = function (e, t, n) {
+                "string" == typeof e && (e = [[null, e, ""]]);
+                var o = {};
+                if (n)
+                    for (var i = 0; i < this.length; i++) {
+                        var r = this[i][0];
+                        null != r && (o[r] = !0)
+                    }
+                for (var a = 0; a < e.length; a++) {
+                    var l = [].concat(e[a]);
+                    n && o[l[0]] || (t && (l[2] ? l[2] = "".concat(t, " and ").concat(l[2]) : l[2] =
+                        t), u.push(l))
+                }
+            }, u
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            n = i.__importDefault(n(96)),
+            i = (o = n.default, i.__extends(r, o), r);
+
+        function r(e, t) {
+            return o.call(this, e, t) || this
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            l = o(n(4)),
+            u = o(n(45));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var s, o = n(2),
+            c = o.__importDefault(n(3)),
+            i = o.__importDefault(n(96)),
+            f = o.__importDefault(n(132)),
+            o = (s = i.default, o.__extends(r, s), r);
+
+        function r(t, n, e) {
+            var o = s.call(this, t, n) || this;
+            e.title = n.i18next.t("menus.dropListMenu." + e.title);
+            var i, r = "zh-CN" === n.config.lang ? "" : "w-e-drop-list-tl";
+            r && "list" === e.type && (0, l.default)(i = e.list).call(i, function (e) {
+                var t = e.$elem,
+                    e = c.default(t.children());
+                0 < e.length && ((e = null == e ? void 0 : e.getNodeName()) && "I" === e && t.addClass(
+                    r))
+            });
+            var a = new f.default(o, e);
+            return o.dropList = a, t.on("click", function () {
+                var e;
+                null != n.selection.getRange() && (t.css("z-index", n.zIndex.get("menu")), (0, l.default)
+                (e = n.txt.eventHooks.dropListMenuHoverEvents).call(e, function (e) {
+                    return e()
+                }), a.show())
+            }).on("mouseleave", function () {
+                t.css("z-index", "auto"), a.hideTimeoutId = (0, u.default)(function () {
+                    a.hide()
+                })
+            }), o
+        }
+        t.default = o
+    }, function (e, t, n) {
+        e.exports = n(189)
+    }, function (e, t, n) {
+        e.exports = n(202)
+    }, function (e, t, n) {
+        var o = n(76),
+            i = n(48);
+        e.exports = function (e) {
+            return o(i(e))
+        }
+    }, function (e, t, n) {
+        function o(e) {
+            return "function" == typeof e ? e : void 0
+        }
+        var i = n(10),
+            r = n(8);
+        e.exports = function (e, t) {
+            return arguments.length < 2 ? o(i[e]) || o(r[e]) : i[e] && i[e][t] || r[e] && r[e][t]
+        }
+    }, function (e, t, n) {
+        var w = n(38),
+            x = n(76),
+            _ = n(33),
+            E = n(34),
+            b = n(90),
+            C = [].push,
+            n = function (d) {
+                var p = 1 == d,
+                    h = 2 == d,
+                    A = 3 == d,
+                    v = 4 == d,
+                    m = 6 == d,
+                    g = 7 == d,
+                    y = 5 == d || m;
+                return function (e, t, n, o) {
+                    for (var i, r, a = _(e), l = x(a), u = w(t, n, 3), s = E(l.length), c = 0, o = o ||
+                        b, f = p ? o(e, s) : h || g ? o(e, 0) : void 0; c < s; c++)
+                        if ((y || c in l) && (r = u(i = l[c], c, a), d))
+                            if (p) f[c] = r;
+                            else if (r) switch (d) {
+                                case 3:
+                                    return !0;
+                                case 5:
+                                    return i;
+                                case 6:
+                                    return c;
+                                case 2:
+                                    C.call(f, i)
+                            } else switch (d) {
+                                case 4:
+                                    return !1;
+                                case 7:
+                                    C.call(f, i)
+                            }
+                    return m ? -1 : A || v ? v : f
+                }
+            };
+        e.exports = {
+            forEach: n(0),
+            map: n(1),
+            filter: n(2),
+            some: n(3),
+            every: n(4),
+            find: n(5),
+            findIndex: n(6),
+            filterOut: n(7)
+        }
+    }, function (e, t, n) {
+        e.exports = n(287)
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            d = o(n(4)),
+            p = o(n(30)),
+            o = o(n(129));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var h = n(2),
+            A = h.__importDefault(n(3)),
+            v = n(7),
+            o = (m.prototype.create = function () {
+                var e, t, n, r, a, o, i, l, u, s, c = this,
+                    f = this.menu;
+                m.createdMenus.has(f) || (i = this.conf, s = this.$container, e = i.width || 300, t = f
+                    .editor.$toolbarElem.getBoundingClientRect(), o = f.$elem.getBoundingClientRect(),
+                    n = t.height + t.top - o.top, o = (t.width - e) / 2 + t.left - o.left, s.css(
+                    "width", e + "px").css("margin-top", n + "px").css("margin-left", o + "px")
+                    .css("z-index", f.editor.zIndex.get("panel")), o = A.default(
+                    '<i class="w-e-icon-close w-e-panel-close"></i>'), s.append(o), o.on(
+                    "click",
+                    function () {
+                        c.remove()
+                    }), r = A.default('<ul class="w-e-panel-tab-title"></ul>'), a = A.default(
+                    '<div class="w-e-panel-tab-content"></div>'), s.append(r).append(a), (o = i
+                    .height) && a.css("height", o + "px").css("overflow-y", "auto"), i = i.tabs ||
+                    [], l = [], u = [], (0, d.default)(i).call(i, function (e, t) {
+                    var n, o, i;
+                    e && (n = e.title || "", e = e.tpl || "", o = A.default(
+                        '<li class="w-e-item">' + n + "</li>"), r.append(o), i = A.default(
+                        e), a.append(i), l.push(o), u.push(i), 0 === t ? (o.data(
+                        "active", !0), o.addClass("w-e-active")) : i.hide(), o.on(
+                        "click",
+                        function () {
+                            o.data("active") || ((0, d.default)(l).call(l, function (
+                                e) {
+                                e.data("active", !1), e.removeClass(
+                                    "w-e-active")
+                            }), (0, d.default)(u).call(u, function (e) {
+                                e.hide()
+                            }), o.data("active", !0), o.addClass(
+                                "w-e-active"), i.show())
+                        }))
+                }), s.on("click", function (e) {
+                    e.stopPropagation()
+                }), f.$elem.append(s), (0, d.default)(i).call(i, function (e, i) {
+                    e && (e = e.events || [], (0, d.default)(e).call(e, function (e) {
+                        var t = e.selector,
+                            n = e.type,
+                            o = e.fn || v.EMPTY_FN,
+                            e = u[i];
+                        (0, p.default)(e).call(e, t).on(n, function (t) {
+                            return h.__awaiter(c, void 0, void 0,
+                                function () {
+                                    return h.__generator(this,
+                                        function (e) {
+                                            switch (e.label) {
+                                                case 0:
+                                                    return t.stopPropagation(),
+                                                        [4, o(t)];
+                                                case 1:
+                                                    return e.sent() &&
+                                                    this.remove(),
+                                                        [2]
+                                            }
+                                        })
+                                })
+                        })
+                    }))
+                }), (s = (0, p.default)(s).call(s, "input[type=text],textarea")).length && s.get(
+                    0).focus(), m.hideCurAllPanels(), f.setPanel(this), m.createdMenus.add(f))
+            }, m.prototype.remove = function () {
+                var e = this.menu,
+                    t = this.$container;
+                t && t.remove(), m.createdMenus.delete(e)
+            }, m.hideCurAllPanels = function () {
+                var e;
+                0 !== m.createdMenus.size && (0, d.default)(e = m.createdMenus).call(e, function (e) {
+                    e = e.panel;
+                    e && e.remove()
+                })
+            }, m.createdMenus = new o.default, m);
+
+        function m(e, t) {
+            this.menu = e, this.conf = t, this.$container = A.default(
+                '<div class="w-e-panel-container"></div>');
+            e = e.editor;
+            e.txt.eventHooks.clickEvents.push(m.hideCurAllPanels), e.txt.eventHooks.toolbarClickEvents.push(
+                m.hideCurAllPanels), e.txt.eventHooks.dropListMenuHoverEvents.push(m.hideCurAllPanels)
+        }
+        t.default = o
+    }, function (e, t) {
+        e.exports = function (e) {
+            if ("function" != typeof e) throw TypeError(String(e) + " is not a function");
+            return e
+        }
+    }, function (e, t, n) {
+        var o = n(48);
+        e.exports = function (e) {
+            return Object(o(e))
+        }
+    }, function (e, t, n) {
+        var o = n(64),
+            i = Math.min;
+        e.exports = function (e) {
+            return 0 < e ? i(o(e), 9007199254740991) : 0
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            n = i.__importDefault(n(96)),
+            i = (o = n.default, i.__extends(r, o), r.prototype.setPanel = function (e) {
+                this.panel = e
+            }, r);
+
+        function r(e, t) {
+            return o.call(this, e, t) || this
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            u = o(n(4)),
+            r = o(n(56));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var f = n(2).__importDefault(n(3)),
+            i = (a.prototype.getPositionData = function () {
+                var e, t, n = this.$container,
+                    o = 0,
+                    i = 0,
+                    r = document.documentElement.scrollTop,
+                    a = this.$targetElem.getBoundingClientRect(),
+                    l = this.editor.$textElem.getBoundingClientRect(),
+                    u = this.$targetElem.getOffsetData(),
+                    s = f.default(u.parent),
+                    c = this.editor.$textElem.elems[0].scrollTop;
+                return this._isInsertTextContainer = s.equal(this.editor.$textContainerElem), i = this._isInsertTextContainer ?
+                    (e = s.getBoundingClientRect().height, t = u.top, s = u.left, u = u.height, 25 < (c =
+                        t - c) ? (o = c - 20 - 15, n.addClass("w-e-tooltip-up")) : (o = c + u + 20 <
+                    e ? c + u + 10 : 20 + (0 < c ? c : 0) + 10, n.addClass("w-e-tooltip-down")),
+                        s < 0 ? 0 : s) : (a.top < 20 || a.top - l.top < 20 ? (o = a.bottom + r + 5, n.addClass(
+                        "w-e-tooltip-down")) : (o = a.top + r - 20 - 15, n.addClass(
+                        "w-e-tooltip-up")), a.left < 0 ? 0 : a.left), {
+                    top: o,
+                    left: i
+                }
+            }, a.prototype.appendMenus = function () {
+                var i = this,
+                    e = this.conf,
+                    r = this.editor,
+                    a = this.$targetElem,
+                    l = this.$container;
+                (0, u.default)(e).call(e, function (t, e) {
+                    var n = t.$elem,
+                        o = f.default("<div></div>");
+                    o.addClass("w-e-tooltip-item-wrapper "), o.append(n), l.append(o), n.on(
+                        "click",
+                        function (e) {
+                            e.preventDefault(), t.onClick(r, a) && i.remove()
+                        })
+                })
+            }, a.prototype.create = function () {
+                var e = this.editor,
+                    t = this.$container;
+                this.appendMenus();
+                var n = this.getPositionData(),
+                    o = n.top,
+                    n = n.left;
+                t.css("top", o + "px"), t.css("left", n + "px"), t.css("z-index", e.zIndex.get(
+                    "tooltip")), (this._isInsertTextContainer ? this.editor.$textContainerElem : f.default(
+                    "body")).append(t), this._show = !0, e.beforeDestroy((0, r.default)(t = this.remove)
+                    .call(t, this)), e.txt.eventHooks.onBlurEvents.push((0, r.default)(e = this.remove)
+                    .call(e, this))
+            }, a.prototype.remove = function () {
+                this.$container.remove(), this._show = !1
+            }, (0, i.default)(a.prototype, "isShow", {
+                get: function () {
+                    return this._show
+                },
+                enumerable: !1,
+                configurable: !0
+            }), a);
+
+        function a(e, t, n) {
+            this.editor = e, this.$targetElem = t, this.conf = n, this._show = !1, this._isInsertTextContainer = !
+                1;
+            n = f.default("<div></div>");
+            n.addClass("w-e-tooltip"), this.$container = n
+        }
+        t.default = i
+    }, function (e, t) {
+        e.exports = function (e, t) {
+            return {
+                enumerable: !(1 & e),
+                configurable: !(2 & e),
+                writable: !(4 & e),
+                value: t
+            }
+        }
+    }, function (e, t, n) {
+        var r = n(32);
+        e.exports = function (o, i, e) {
+            if (r(o), void 0 === i) return o;
+            switch (e) {
+                case 0:
+                    return function () {
+                        return o.call(i)
+                    };
+                case 1:
+                    return function (e) {
+                        return o.call(i, e)
+                    };
+                case 2:
+                    return function (e, t) {
+                        return o.call(i, e, t)
+                    };
+                case 3:
+                    return function (e, t, n) {
+                        return o.call(i, e, t, n)
+                    }
+            }
+            return function () {
+                return o.apply(i, arguments)
+            }
+        }
+    }, function (e, t) {
+        e.exports = !0
+    }, function (e, t, n) {
+        function v(e, t) {
+            this.stopped = e, this.result = t
+        }
+        var m = n(20),
+            g = n(105),
+            y = n(34),
+            w = n(38),
+            x = n(107),
+            _ = n(108);
+        e.exports = function (e, t, n) {
+            function o(e) {
+                return r && _(r), new v(!0, e)
+            }
+
+            function i(e) {
+                return d ? (m(e), h ? A(e[0], e[1], o) : A(e[0], e[1])) : h ? A(e, o) : A(e)
+            }
+            var r, a, l, u, s, c, f = n && n.that,
+                d = !(!n || !n.AS_ENTRIES),
+                p = !(!n || !n.IS_ITERATOR),
+                h = !(!n || !n.INTERRUPTED),
+                A = w(t, f, 1 + d + h);
+            if (p) r = e;
+            else {
+                if ("function" != typeof (p = x(e))) throw TypeError("Target is not iterable");
+                if (g(p)) {
+                    for (a = 0, l = y(e.length); a < l; a++)
+                        if ((u = i(e[a])) && u instanceof v) return u;
+                    return new v(!1)
+                }
+                r = p.call(e)
+            }
+            for (s = r.next; !(c = s.call(r)).done;) {
+                try {
+                    u = i(c.value)
+                } catch (e) {
+                    throw _(r), e
+                }
+                if ("object" == typeof u && u && u instanceof v) return u
+            }
+            return new v(!1)
+        }
+    }, function (e, t) {
+        e.exports = {}
+    }, function (e, t, n) {
+        var i = n(85),
+            r = n(18).f,
+            a = n(17),
+            l = n(16),
+            u = n(169),
+            s = n(9)("toStringTag");
+        e.exports = function (e, t, n, o) {
+            e && (e = n ? e : e.prototype, l(e, s) || r(e, s, {
+                configurable: !0,
+                value: t
+            }), o && !i && a(e, "toString", u))
+        }
+    }, function (e, t, n) {
+        var o, i, r, a, l, u, s, c, f = n(173),
+            d = n(8),
+            p = n(13),
+            h = n(17),
+            A = n(16),
+            v = n(80),
+            m = n(60),
+            n = n(49),
+            d = d.WeakMap;
+        s = f ? (o = v.state || (v.state = new d), i = o.get, r = o.has, a = o.set, l = function (e, t) {
+            return t.facade = e, a.call(o, e, t), t
+        }, u = function (e) {
+            return i.call(o, e) || {}
+        }, function (e) {
+            return r.call(o, e)
+        }) : (n[c = m("state")] = !0, l = function (e, t) {
+            return t.facade = e, h(e, c, t), t
+        }, u = function (e) {
+            return A(e, c) ? e[c] : {}
+        }, function (e) {
+            return A(e, c)
+        }), e.exports = {
+            set: l,
+            get: u,
+            has: s,
+            enforce: function (e) {
+                return s(e) ? u(e) : l(e, {})
+            },
+            getterFor: function (n) {
+                return function (e) {
+                    var t;
+                    if (!p(e) || (t = u(e)).type !== n) throw TypeError(
+                        "Incompatible receiver, " + n + " required");
+                    return t
+                }
+            }
+        }
+    }, function (e, t, n) {
+        e.exports = n(263)
+    }, function (e, t, n) {
+        e.exports = n(267)
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.createElementFragment = t.createDocumentFragment = t.createElement = t.insertBefore = t.getEndPoint =
+            t.getStartPoint = t.updateRange = t.filterSelectionNodes = void 0;
+        var i = n(2),
+            a = n(136),
+            l = i.__importDefault(n(3));
+
+        function u(e) {
+            return document.createElement(e)
+        }
+        t.filterSelectionNodes = function (e) {
+            var n = [];
+            return (0, r.default)(e).call(e, function (e) {
+                var t = e.getNodeName();
+                t !== a.ListType.OrderedList && t !== a.ListType.UnorderedList ? n.push(e) : e.prior ?
+                    n.push(e.prior) : null != (e = e.children()) && (0, r.default)(e).call(e,
+                    function (e) {
+                        n.push(l.default(e))
+                    })
+            }), n
+        }, t.updateRange = function (e, t, n) {
+            var o = e.selection,
+                e = document.createRange();
+            1 < t.length ? (e.setStart(t.elems[0], 0), e.setEnd(t.elems[t.length - 1], t.elems[t.length -
+            1].childNodes.length)) : e.selectNodeContents(t.elems[0]), n && e.collapse(!1), o.saveRange(
+                e), o.restoreSelection()
+        }, t.getStartPoint = function (e) {
+            return e.prior || l.default(null === (e = e.children()) || void 0 === e ? void 0 : e.elems[
+                0])
+        }, t.getEndPoint = function (e) {
+            return e.prior || l.default(null === (e = e.children()) || void 0 === e ? void 0 : e.last()
+                .elems[0])
+        }, t.insertBefore = function (e, t, n) {
+            void 0 === n && (n = null), e.parent().elems[0].insertBefore(t, n)
+        }, t.createElement = u, t.createDocumentFragment = function () {
+            return document.createDocumentFragment()
+        }, t.createElementFragment = function (e, n, o) {
+            return void 0 === o && (o = "li"), (0, r.default)(e).call(e, function (e) {
+                var t = u(o);
+                t.innerHTML = e.html(), n.append(t), e.remove()
+            }), n
+        }
+    }, function (e, t) {
+        var n = {}.toString;
+        e.exports = function (e) {
+            return n.call(e).slice(8, -1)
+        }
+    }, function (e, t) {
+        e.exports = function (e) {
+            if (null == e) throw TypeError("Can't call method on " + e);
+            return e
+        }
+    }, function (e, t) {
+        e.exports = {}
+    }, function (e, t, n) {
+        var i = n(17);
+        e.exports = function (e, t, n, o) {
+            o && o.enumerable ? e[t] = n : i(e, t, n)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(177).charAt,
+            i = n(43),
+            n = n(88),
+            r = "String Iterator",
+            a = i.set,
+            l = i.getterFor(r);
+        n(String, "String", function (e) {
+            a(this, {
+                type: r,
+                string: String(e),
+                index: 0
+            })
+        }, function () {
+            var e = l(this),
+                t = e.string,
+                n = e.index;
+            return n >= t.length ? {
+                value: void 0,
+                done: !0
+            } : (n = o(t, n), e.index += n.length, {
+                value: n,
+                done: !1
+            })
+        })
+    }, function (e, t, n) {
+        n(179);
+        var o, i = n(180),
+            r = n(8),
+            a = n(68),
+            l = n(17),
+            u = n(41),
+            s = n(9)("toStringTag");
+        for (o in i) {
+            var c = r[o],
+                c = c && c.prototype;
+            c && a(c) !== s && l(c, s, o), u[o] = u.Array
+        }
+    }, function (e, t, n) {
+        var o = n(47);
+        e.exports = Array.isArray || function (e) {
+            return "Array" == o(e)
+        }
+    }, function (e, t, n) {
+        var o = n(12),
+            i = n(9),
+            r = n(66),
+            a = i("species");
+        e.exports = function (t) {
+            return 51 <= r || !o(function () {
+                var e = [];
+                return (e.constructor = {})[a] = function () {
+                    return {
+                        foo: 1
+                    }
+                }, 1 !== e[t](Boolean).foo
+            })
+        }
+    }, function (e, t, n) {
+        e.exports = n(214)
+    }, function (e, t, n) {
+        e.exports = n(223)
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.ListHandle = void 0;
+        var o = n(2).__importDefault(n(372));
+        t.ListHandle = function (e) {
+            this.options = e, this.selectionRangeElem = new o.default
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = {}.propertyIsEnumerable,
+            i = Object.getOwnPropertyDescriptor,
+            r = i && !o.call({
+                1: 2
+            }, 1);
+        t.f = r ? function (e) {
+            e = i(this, e);
+            return !!e && e.enumerable
+        } : o
+    }, function (e, t, n) {
+        var i = n(13);
+        e.exports = function (e, t) {
+            if (!i(e)) return e;
+            var n, o;
+            if (t && "function" == typeof (n = e.toString) && !i(o = n.call(e))) return o;
+            if ("function" == typeof (n = e.valueOf) && !i(o = n.call(e))) return o;
+            if (!t && "function" == typeof (n = e.toString) && !i(o = n.call(e))) return o;
+            throw TypeError("Can't convert object to primitive value")
+        }
+    }, function (e, t, n) {
+        var o = n(79),
+            i = n(61),
+            r = o("keys");
+        e.exports = function (e) {
+            return r[e] || (r[e] = i(e))
+        }
+    }, function (e, t) {
+        var n = 0,
+            o = Math.random();
+        e.exports = function (e) {
+            return "Symbol(" + String(void 0 === e ? "" : e) + ")_" + (++n + o).toString(36)
+        }
+    }, function (e, t, n) {
+        function o() {}
+
+        function i(e) {
+            return "<script>" + e + "</" + p + ">"
+        }
+        var r, a = n(20),
+            l = n(167),
+            u = n(83),
+            s = n(49),
+            c = n(104),
+            f = n(77),
+            n = n(60),
+            d = "prototype",
+            p = "script",
+            h = n("IE_PROTO"),
+            A = function () {
+                try {
+                    r = document.domain && new ActiveXObject("htmlfile")
+                } catch (e) {}
+                var e;
+                A = r ? function (e) {
+                    e.write(i("")), e.close();
+                    var t = e.parentWindow.Object;
+                    return e = null, t
+                }(r) : ((e = f("iframe")).style.display = "none", c.appendChild(e), e.src = String(
+                    "javascript:"), (e = e.contentWindow.document).open(), e.write(i(
+                    "document.F=Object")), e.close(), e.F);
+                for (var t = u.length; t--;) delete A[d][u[t]];
+                return A()
+            };
+        s[h] = !0, e.exports = Object.create || function (e, t) {
+            var n;
+            return null !== e ? (o[d] = a(e), n = new o, o[d] = null, n[h] = e) : n = A(), void 0 ===
+            t ? n : l(n, t)
+        }
+    }, function (e, t, n) {
+        var o = n(103),
+            i = n(83);
+        e.exports = Object.keys || function (e) {
+            return o(e, i)
+        }
+    }, function (e, t) {
+        var n = Math.ceil,
+            o = Math.floor;
+        e.exports = function (e) {
+            return isNaN(e = +e) ? 0 : (0 < e ? o : n)(e)
+        }
+    }, function (e, t, n) {
+        var o = n(47),
+            n = n(8);
+        e.exports = "process" == o(n.process)
+    }, function (e, t, n) {
+        var o, i, r = n(8),
+            n = n(67),
+            r = r.process,
+            r = r && r.versions,
+            r = r && r.v8;
+        r ? i = (o = r.split("."))[0] + o[1] : n && (!(o = n.match(/Edge\/(\d+)/)) || 74 <= o[1]) && (o = n
+            .match(/Chrome\/(\d+)/)) && (i = o[1]), e.exports = i && +i
+    }, function (e, t, n) {
+        n = n(28);
+        e.exports = n("navigator", "userAgent") || ""
+    }, function (e, t, n) {
+        var o = n(85),
+            i = n(47),
+            r = n(9)("toStringTag"),
+            a = "Arguments" == i(function () {
+                return arguments
+            }());
+        e.exports = o ? i : function (e) {
+            var t;
+            return void 0 === e ? "Undefined" : null === e ? "Null" : "string" == typeof (e = function (
+                e, t) {
+                try {
+                    return e[t]
+                } catch (e) {}
+            }(t = Object(e), r)) ? e : a ? i(t) : "Object" == (e = i(t)) && "function" == typeof t.callee ?
+                "Arguments" : e
+        }
+    }, function (e, t) {}, function (e, t, n) {
+        "use strict";
+
+        function o(e) {
+            var n, o;
+            this.promise = new e(function (e, t) {
+                if (void 0 !== n || void 0 !== o) throw TypeError("Bad Promise constructor");
+                n = e, o = t
+            }), this.resolve = i(n), this.reject = i(o)
+        }
+        var i = n(32);
+        e.exports.f = function (e) {
+            return new o(e)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(12);
+        e.exports = function (e, t) {
+            var n = [][e];
+            return !!n && o(function () {
+                n.call(null, t || function () {
+                    throw 1
+                }, 1)
+            })
+        }
+    }, function (e, t) {
+        e.exports = "\t\n\v\f\r                　\u2028\u2029\ufeff"
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(59),
+            i = n(18),
+            r = n(37);
+        e.exports = function (e, t, n) {
+            t = o(t);
+            t in e ? i.f(e, t, r(0, n)) : e[t] = n
+        }
+    }, function (e, t, n) {
+        e.exports = n(210)
+    }, function (e, t, n) {
+        var o = n(15),
+            i = n(58),
+            r = n(37),
+            a = n(27),
+            l = n(59),
+            u = n(16),
+            s = n(100),
+            c = Object.getOwnPropertyDescriptor;
+        t.f = o ? c : function (e, t) {
+            if (e = a(e), t = l(t, !0), s) try {
+                return c(e, t)
+            } catch (e) {}
+            if (u(e, t)) return r(!i.f.call(e, t), e[t])
+        }
+    }, function (e, t, n) {
+        var o = n(12),
+            i = n(47),
+            r = "".split;
+        e.exports = o(function () {
+            return !Object("z").propertyIsEnumerable(0)
+        }) ? function (e) {
+            return "String" == i(e) ? r.call(e, "") : Object(e)
+        } : Object
+    }, function (e, t, n) {
+        var o = n(8),
+            n = n(13),
+            i = o.document,
+            r = n(i) && n(i.createElement);
+        e.exports = function (e) {
+            return r ? i.createElement(e) : {}
+        }
+    }, function (e, t, n) {
+        var o = n(16),
+            i = n(33),
+            r = n(60),
+            n = n(165),
+            a = r("IE_PROTO"),
+            l = Object.prototype;
+        e.exports = n ? Object.getPrototypeOf : function (e) {
+            return e = i(e), o(e, a) ? e[a] : "function" == typeof e.constructor && e instanceof e.constructor ?
+                e.constructor.prototype : e instanceof Object ? l : null
+        }
+    }, function (e, t, n) {
+        var o = n(39),
+            i = n(80);
+        (e.exports = function (e, t) {
+            return i[e] || (i[e] = void 0 !== t ? t : {})
+        })("versions", []).push({
+            version: "3.10.1",
+            mode: o ? "pure" : "global",
+            copyright: "© 2021 Denis Pushkarev (zloirock.ru)"
+        })
+    }, function (e, t, n) {
+        var o = n(8),
+            i = n(164),
+            n = "__core-js_shared__",
+            n = o[n] || i(n, {});
+        e.exports = n
+    }, function (e, t, n) {
+        var u = n(27),
+            s = n(34),
+            c = n(82),
+            n = function (l) {
+                return function (e, t, n) {
+                    var o, i = u(e),
+                        r = s(i.length),
+                        a = c(n, r);
+                    if (l && t != t) {
+                        for (; a < r;)
+                            if ((o = i[a++]) != o) return !0
+                    } else
+                        for (; a < r; a++)
+                            if ((l || a in i) && i[a] === t) return l || a || 0;
+                    return !l && -1
+                }
+            };
+        e.exports = {
+            includes: n(!0),
+            indexOf: n(!1)
+        }
+    }, function (e, t, n) {
+        var o = n(64),
+            i = Math.max,
+            r = Math.min;
+        e.exports = function (e, t) {
+            e = o(e);
+            return e < 0 ? i(e + t, 0) : r(e, t)
+        }
+    }, function (e, t) {
+        e.exports = ["constructor", "hasOwnProperty", "isPrototypeOf", "propertyIsEnumerable",
+            "toLocaleString", "toString", "valueOf"]
+    }, function (e, t, n) {
+        var o = n(65),
+            i = n(66),
+            n = n(12);
+        e.exports = !!Object.getOwnPropertySymbols && !n(function () {
+            return !Symbol.sham && (o ? 38 === i : 37 < i && i < 41)
+        })
+    }, function (e, t, n) {
+        var o = {};
+        o[n(9)("toStringTag")] = "z", e.exports = "[object z]" === String(o)
+    }, function (e, t) {
+        e.exports = function (e, t, n) {
+            if (!(e instanceof t)) throw TypeError("Incorrect " + (n ? n + " " : "") + "invocation");
+            return e
+        }
+    }, function (e, t) {
+        e.exports = function (e) {
+            try {
+                return {
+                    error: !1,
+                    value: e()
+                }
+            } catch (e) {
+                return {
+                    error: !0,
+                    value: e
+                }
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+
+        function A() {
+            return this
+        }
+        var v = n(5),
+            m = n(178),
+            g = n(78),
+            y = n(102),
+            w = n(42),
+            x = n(17),
+            _ = n(50),
+            o = n(9),
+            E = n(39),
+            b = n(41),
+            n = n(118),
+            C = n.IteratorPrototype,
+            S = n.BUGGY_SAFARI_ITERATORS,
+            D = o("iterator"),
+            M = "values",
+            N = "entries";
+        e.exports = function (e, t, n, o, i, r, a) {
+            m(n, t, o);
+
+            function l(e) {
+                if (e === i && h) return h;
+                if (!S && e in d) return d[e];
+                switch (e) {
+                    case "keys":
+                    case M:
+                    case N:
+                        return function () {
+                            return new n(this, e)
+                        }
+                }
+                return function () {
+                    return new n(this)
+                }
+            }
+            var u, s, c = t + " Iterator",
+                f = !1,
+                d = e.prototype,
+                p = d[D] || d["@@iterator"] || i && d[i],
+                h = !S && p || l(i),
+                o = "Array" == t && d.entries || p;
+            if (o && (e = g(o.call(new e)), C !== Object.prototype && e.next && (E || g(e) === C || (y ?
+                y(e, C) : "function" != typeof e[D] && x(e, D, A)), w(e, c, !0, !0), E && (
+                b[c] = A))), i == M && p && p.name !== M && (f = !0, h = function () {
+                return p.call(this)
+            }), E && !a || d[D] === h || x(d, D, h), b[t] = h, i)
+                if (u = {
+                    values: l(M),
+                    keys: r ? h : l("keys"),
+                    entries: l(N)
+                }, a)
+                    for (s in u) !S && !f && s in d || _(d, s, u[s]);
+                else v({
+                    target: t,
+                    proto: !0,
+                    forced: S || f
+                }, u);
+            return u
+        }
+    }, function (e, t) {
+        e.exports = function () {}
+    }, function (e, t, n) {
+        var o = n(13),
+            i = n(53),
+            r = n(9)("species");
+        e.exports = function (e, t) {
+            var n;
+            return new(void 0 === (n = i(e) && ("function" == typeof (n = e.constructor) && (n ===
+                Array || i(n.prototype)) || o(n) && null === (n = n[r])) ? void 0 : n) ? Array :
+                n)(0 === t ? 0 : t)
+        }
+    }, function (e, t, n) {
+        e.exports = n(186)
+    }, function (e, t, n) {
+        var o = n(48),
+            n = "[" + n(72) + "]",
+            i = RegExp("^" + n + n + "*"),
+            r = RegExp(n + n + "*$"),
+            n = function (t) {
+                return function (e) {
+                    e = String(o(e));
+                    return 1 & t && (e = e.replace(i, "")), e = 2 & t ? e.replace(r, "") : e
+                }
+            };
+        e.exports = {
+            start: n(1),
+            end: n(2),
+            trim: n(3)
+        }
+    }, function (e, t, n) {
+        e.exports = n(206)
+    }, function (t, e, n) {
+        var o = n(228),
+            i = n(255);
+
+        function r(e) {
+            return t.exports = r = "function" == typeof o && "symbol" == typeof i ? function (e) {
+                return typeof e
+            } : function (e) {
+                return e && "function" == typeof o && e.constructor === o && e !== o.prototype ?
+                    "symbol" : typeof e
+            }, t.exports.default = t.exports, t.exports.__esModule = !0, r(e)
+        }
+        t.exports = r, t.exports.default = t.exports, t.exports.__esModule = !0
+    }, function (e, t, n) {
+        n = n(9);
+        t.f = n
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a = n(2).__importDefault(n(31)),
+            i = (l.prototype.clickHandler = function (e) {}, l.prototype.active = function () {
+                this._active = !0, this.$elem.addClass("w-e-active")
+            }, l.prototype.unActive = function () {
+                this._active = !1, this.$elem.removeClass("w-e-active")
+            }, (0, i.default)(l.prototype, "isActive", {
+                get: function () {
+                    return this._active
+                },
+                enumerable: !1,
+                configurable: !0
+            }), l);
+
+        function l(e, n) {
+            var o = this;
+            this.$elem = e, this.editor = n, this._active = !1, e.on("click", function (e) {
+                var t;
+                a.default.hideCurAllPanels(), (0, r.default)(t = n.txt.eventHooks.menuClickEvents).call(
+                    t,
+                    function (e) {
+                        return e()
+                    }), e.stopPropagation(), null != n.selection.getRange() && o.clickHandler(e)
+            })
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            _ = o(n(56)),
+            E = o(n(4)),
+            b = o(n(26));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            C = n(6),
+            S = i.__importDefault(n(134)),
+            D = i.__importDefault(n(135)),
+            n = (r.prototype.insertImg = function (e, t, n) {
+                function o(e, t) {
+                    return i.i18next.t((t = void 0 === t ? "validate." : t) + e)
+                }
+                var i = this.editor,
+                    r = i.config,
+                    a = t ? 'alt="' + t + '" ' : "",
+                    l = n ? 'data-href="' + encodeURIComponent(n) + '" ' : "";
+                i.cmd.do("insertHTML", '<img src="' + e + '" ' + a + l + 'style="max-width:100%;"/>'),
+                    r.linkImgCallback(e, t, n);
+                var u = document.createElement("img");
+                u.onload = function () {
+                    u = null
+                }, u.onerror = function () {
+                    r.customAlert(o("插入图片错误"), "error", "wangEditor: " + o("插入图片错误") + "，" + o(
+                        "图片链接") + ' "' + e + '"，' + o("下载链接失败")), u = null
+                }, u.onabort = function () {
+                    return u = null
+                }, u.src = e
+            }, r.prototype.uploadImg = function (e) {
+                var i, o, r, t, a, l, n, u, s, c, f, d, p, h, A, v, m, g, y, w, x = this;
+                e.length && (i = this.editor, o = i.config, r = function (e) {
+                    return i.i18next.t("validate." + e)
+                }, g = o.uploadImgServer, t = o.uploadImgShowBase64, a = o.uploadImgMaxSize, l =
+                    a / 1024 / 1024, n = o.uploadImgMaxLength, u = o.uploadFileName, s = o.uploadImgParams,
+                    c = o.uploadImgParamsWithUrl, f = o.uploadImgHeaders, d = o.uploadImgHooks, p =
+                    o.uploadImgTimeout, w = o.withCredentials, ((h = o.customUploadImg) || g || t) &&
+                (A = [], v = [], C.arrForEach(e, function (e) {
+                    var t, n = e.name,
+                        o = e.size;
+                    n && o && (t = i.config.uploadImgAccept.join("|"), !1 !== new RegExp(
+                        ".(" + t + ")$", "i").test(n) ? a < o ? v.push("【" + n +
+                        "】" + r("大于") + " " + l + "M") : A.push(e) : v.push("【" +
+                        n + "】" + r("不是图片")))
+                }), v.length ? o.customAlert(r("图片验证未通过") + ": \n" + v.join("\n"),
+                    "warning") : 0 !== A.length ? A.length > n ? o.customAlert(r("一次最多上传") +
+                    n + r("张图片"), "warning") : h && "function" == typeof h ? h(A, (0, _.default)
+                (y = this.insertImg).call(y, this)) : (m = new FormData, (0, E.default)
+                (A).call(A, function (e, t) {
+                    var n = u || e.name;
+                    1 < A.length && (n += t + 1), m.append(n, e)
+                }), g ? (g = (y = g.split("#"))[0], y = y[1] || "", (0, E.default)(C).call(
+                    C, s,
+                    function (e, t) {
+                        c && (0 < (0, b.default)(g).call(g, "?") ? g += "&" : g +=
+                            "?", g = g + e + "=" + t), m.append(e, t)
+                    }), y && (g += "#" + y), "string" == typeof (w = S.default(g, {
+                    timeout: p,
+                    formData: m,
+                    headers: f,
+                    withCredentials: !!w,
+                    beforeSend: function (e) {
+                        if (d.before) return d.before(e, i, A)
+                    },
+                    onTimeout: function (e) {
+                        o.customAlert(r("上传图片超时"), "error"), d.timeout &&
+                        d.timeout(e, i)
+                    },
+                    onProgress: function (e, t) {
+                        var n = new D.default(i);
+                        t.lengthComputable && (e = t.loaded / t.total,
+                            n.show(e))
+                    },
+                    onError: function (e) {
+                        o.customAlert(r("上传图片错误"), "error", r("上传图片错误") +
+                            "，" + r("服务器返回状态") + ": " + e.status),
+                        d.error && d.error(e, i)
+                    },
+                    onFail: function (e, t) {
+                        o.customAlert(r("上传图片失败"), "error", r(
+                            "上传图片返回结果错误") + ("，" + r("返回结果")) +
+                            ": " + t), d.fail && d.fail(e, i, t)
+                    },
+                    onSuccess: function (e, t) {
+                        if (d.customInsert) d.customInsert((0, _.default)
+                        (n = x.insertImg).call(n, x), t, i);
+                        else {
+                            if ("0" != t.errno) return o.customAlert(r(
+                                "上传图片失败"), "error", r(
+                                "上传图片返回结果错误") + "，" + r(
+                                "返回结果") + " errno=" + t.errno),
+                                void(d.fail && d.fail(e, i, t));
+                            var n = t.data;
+                            (0, E.default)(n).call(n, function (e) {
+                                "string" == typeof e ? x.insertImg(
+                                    e) : x.insertImg(e.url,
+                                    e.alt, e.href)
+                            }), d.success && d.success(e, i, t)
+                        }
+                    }
+                })) && o.customAlert(w, "error")) : t && C.arrForEach(e, function (e) {
+                    var t = x,
+                        n = new FileReader;
+                    n.readAsDataURL(e), n.onload = function () {
+                        var e;
+                        this.result && (e = this.result.toString(), t.insertImg(
+                            e, e))
+                    }
+                })) : o.customAlert(r("传入的文件不合法"), "warning")))
+            }, r);
+
+        function r(e) {
+            this.editor = e
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(410)),
+            u = o(n(4)),
+            a = o(n(44));
+
+        function l(e) {
+            return !!e.length && "w-e-todo" === e.attr("class")
+        }
+
+        function s(e, t) {
+            return 3 === e.nodeType ? e.nodeValue === t.nodeValue : e.contains(t)
+        }
+
+        function c(e, t, n) {
+            void 0 === n && (n = !0);
+            var o = e.nodeValue,
+                i = null == o ? void 0 : (0, a.default)(o).call(o, 0, t);
+            return o = null == o ? void 0 : (0, a.default)(o).call(o, t), n || (n = o, o = i, i = n), e.nodeValue =
+                i, o
+        }(0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.dealTextNode = t.isAllTodo = t.isTodo = t.getCursorNextNode = void 0, t.isTodo = l, t.isAllTodo =
+            function (e) {
+                if (0 !== (e = e.selection.getSelectionRangeTopNodes()).length) return (0, r.default)(e).call(
+                    e, l)
+            }, t.getCursorNextNode = function n(e, o, i) {
+            if (e.hasChildNodes()) {
+                var r = e.cloneNode(),
+                    a = !1;
+                "" === o.nodeValue && (a = !0);
+                var l = [];
+                return (0, u.default)(e = e.childNodes).call(e, function (e) {
+                    var t;
+                    !s(e, o) && a && (r.appendChild(e.cloneNode(!0)), "BR" !== e.nodeName && l.push(
+                        e)), s(e, o) && (1 !== e.nodeType || (t = n(e, o, i)) && "" !== t.textContent &&
+                    null != r && r.appendChild(t), 3 === e.nodeType && o.isEqualNode(e) &&
+                    (e = c(e, i), r.textContent = e), a = !0)
+                }), (0, u.default)(l).call(l, function (e) {
+                    e.remove()
+                }), r
+            }
+        }, t.dealTextNode = c
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0)(n(1));
+        (0, o.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(430),
+            o = ((0, o.default)(r.prototype, "size", {
+                get: function () {
+                    return [this.data.size, this.revokeData.size]
+                },
+                enumerable: !1,
+                configurable: !0
+            }), r.prototype.resetMaxSize = function (e) {
+                this.data.resetMax(e), this.revokeData.resetMax(e)
+            }, r.prototype.save = function (e) {
+                return this.isRe && (this.revokeData.clear(), this.isRe = !1), this.data.instack(e),
+                    this
+            }, r.prototype.revoke = function (e) {
+                this.isRe || (this.isRe = !0);
+                var t = this.data.outstack();
+                return !!t && (this.revokeData.instack(t), e(t), !0)
+            }, r.prototype.restore = function (e) {
+                this.isRe || (this.isRe = !0);
+                var t = this.revokeData.outstack();
+                return !!t && (this.data.instack(t), e(t), !0)
+            }, r);
+
+        function r(e) {
+            this.maxSize = e, this.isRe = !1, this.data = new i.CeilStack(e), this.revokeData = new i.CeilStack(
+                e)
+        }
+        t.default = o
+    }, function (e, t, n) {
+        var o = n(15),
+            i = n(12),
+            r = n(77);
+        e.exports = !o && !i(function () {
+            return 7 != Object.defineProperty(r("div"), "a", {
+                get: function () {
+                    return 7
+                }
+            }).a
+        })
+    }, function (e, t, n) {
+        var o = n(12),
+            i = /#|\.prototype\./,
+            n = function (e, t) {
+                e = a[r(e)];
+                return e == u || e != l && ("function" == typeof t ? o(t) : !!t)
+            },
+            r = n.normalize = function (e) {
+                return String(e).replace(i, ".").toLowerCase()
+            },
+            a = n.data = {},
+            l = n.NATIVE = "N",
+            u = n.POLYFILL = "P";
+        e.exports = n
+    }, function (e, t, n) {
+        var i = n(20),
+            r = n(166);
+        e.exports = Object.setPrototypeOf || ("__proto__" in {} ? function () {
+            var n, o = !1,
+                e = {};
+            try {
+                (n = Object.getOwnPropertyDescriptor(Object.prototype, "__proto__").set).call(e, []),
+                    o = e instanceof Array
+            } catch (e) {}
+            return function (e, t) {
+                return i(e), r(t), o ? n.call(e, t) : e.__proto__ = t, e
+            }
+        }() : void 0)
+    }, function (e, t, n) {
+        var a = n(16),
+            l = n(27),
+            u = n(81).indexOf,
+            s = n(49);
+        e.exports = function (e, t) {
+            var n, o = l(e),
+                i = 0,
+                r = [];
+            for (n in o) !a(s, n) && a(o, n) && r.push(n);
+            for (; t.length > i;) a(o, n = t[i++]) && (~u(r, n) || r.push(n));
+            return r
+        }
+    }, function (e, t, n) {
+        n = n(28);
+        e.exports = n("document", "documentElement")
+    }, function (e, t, n) {
+        var o = n(9),
+            i = n(41),
+            r = o("iterator"),
+            a = Array.prototype;
+        e.exports = function (e) {
+            return void 0 !== e && (i.Array === e || a[r] === e)
+        }
+    }, function (e, t, n) {
+        n = n(84);
+        e.exports = n && !Symbol.sham && "symbol" == typeof Symbol.iterator
+    }, function (e, t, n) {
+        var o = n(68),
+            i = n(41),
+            r = n(9)("iterator");
+        e.exports = function (e) {
+            if (null != e) return e[r] || e["@@iterator"] || i[o(e)]
+        }
+    }, function (e, t, n) {
+        var o = n(20);
+        e.exports = function (e) {
+            var t = e.return;
+            if (void 0 !== t) return o(t.call(e)).value
+        }
+    }, function (e, t, n) {
+        n = n(8);
+        e.exports = n.Promise
+    }, function (e, t, n) {
+        var i = n(50);
+        e.exports = function (e, t, n) {
+            for (var o in t) n && n.unsafe && e[o] ? e[o] = t[o] : i(e, o, t[o], n);
+            return e
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(28),
+            i = n(18),
+            r = n(9),
+            a = n(15),
+            l = r("species");
+        e.exports = function (e) {
+            var t = o(e),
+                e = i.f;
+            a && t && !t[l] && e(t, l, {
+                configurable: !0,
+                get: function () {
+                    return this
+                }
+            })
+        }
+    }, function (e, t, n) {
+        var n = n(80),
+            o = Function.toString;
+        "function" != typeof n.inspectSource && (n.inspectSource = function (e) {
+            return o.call(e)
+        }), e.exports = n.inspectSource
+    }, function (e, t, n) {
+        var i = n(9)("iterator"),
+            r = !1;
+        try {
+            var o = 0,
+                a = {
+                    next: function () {
+                        return {
+                            done: !!o++
+                        }
+                    },
+                    return: function () {
+                        r = !0
+                    }
+                };
+            a[i] = function () {
+                return this
+            }, Array.from(a, function () {
+                throw 2
+            })
+        } catch (e) {}
+        e.exports = function (e, t) {
+            if (!t && !r) return !1;
+            var n = !1;
+            try {
+                var o = {};
+                o[i] = function () {
+                    return {
+                        next: function () {
+                            return {
+                                done: n = !0
+                            }
+                        }
+                    }
+                }, e(o)
+            } catch (e) {}
+            return n
+        }
+    }, function (e, t, n) {
+        var o = n(20),
+            i = n(32),
+            r = n(9)("species");
+        e.exports = function (e, t) {
+            var n, e = o(e).constructor;
+            return void 0 === e || null == (n = o(e)[r]) ? t : i(n)
+        }
+    }, function (e, t, n) {
+        function o(e) {
+            var t;
+            x.hasOwnProperty(e) && (t = x[e], delete x[e], t())
+        }
+
+        function i(e) {
+            return function () {
+                o(e)
+            }
+        }
+
+        function r(e) {
+            o(e.data)
+        }
+        var a, l = n(8),
+            u = n(12),
+            s = n(38),
+            c = n(104),
+            f = n(77),
+            d = n(116),
+            p = n(65),
+            h = l.location,
+            A = l.setImmediate,
+            v = l.clearImmediate,
+            m = l.process,
+            g = l.MessageChannel,
+            y = l.Dispatch,
+            w = 0,
+            x = {},
+            _ = "onreadystatechange",
+            n = function (e) {
+                l.postMessage(e + "", h.protocol + "//" + h.host)
+            };
+        A && v || (A = function (e) {
+            for (var t = [], n = 1; n < arguments.length;) t.push(arguments[n++]);
+            return x[++w] = function () {
+                ("function" == typeof e ? e : Function(e)).apply(void 0, t)
+            }, a(w), w
+        }, v = function (e) {
+            delete x[e]
+        }, p ? a = function (e) {
+            m.nextTick(i(e))
+        } : y && y.now ? a = function (e) {
+            y.now(i(e))
+        } : g && !d ? (g = (d = new g).port2, d.port1.onmessage = r, a = s(g.postMessage, g, 1)) :
+            l.addEventListener && "function" == typeof postMessage && !l.importScripts && h && "file:" !==
+            h.protocol && !u(n) ? (a = n, l.addEventListener("message", r, !1)) : a = _ in f("script") ?
+                function (e) {
+                    c.appendChild(f("script"))[_] = function () {
+                        c.removeChild(this), o(e)
+                    }
+                } : function (e) {
+                    setTimeout(i(e), 0)
+                }), e.exports = {
+            set: A,
+            clear: v
+        }
+    }, function (e, t, n) {
+        n = n(67);
+        e.exports = /(?:iphone|ipod|ipad).*applewebkit/i.test(n)
+    }, function (e, t, n) {
+        var o = n(20),
+            i = n(13),
+            r = n(70);
+        e.exports = function (e, t) {
+            if (o(e), i(t) && t.constructor === e) return t;
+            e = r.f(e);
+            return (0, e.resolve)(t), e.promise
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o, i = n(12),
+            r = n(78),
+            a = n(17),
+            l = n(16),
+            u = n(9),
+            s = n(39),
+            c = u("iterator"),
+            n = !1;
+        [].keys && ("next" in (u = [].keys()) ? (u = r(r(u))) !== Object.prototype && (o = u) : n = !0);
+        i = null == o || i(function () {
+            var e = {};
+            return o[c].call(e) !== e
+        });
+        i && (o = {}), s && !i || l(o, c) || a(o, c, function () {
+            return this
+        }), e.exports = {
+            IteratorPrototype: o,
+            BUGGY_SAFARI_ITERATORS: n
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a = n(2),
+            l = a.__importDefault(n(3)),
+            u = n(6),
+            s = a.__importDefault(n(269)),
+            c = a.__importDefault(n(284)),
+            f = a.__importDefault(n(285)),
+            d = a.__importDefault(n(286)),
+            p = a.__importDefault(n(305)),
+            h = a.__importDefault(n(416)),
+            A = a.__importDefault(n(417)),
+            v = a.__importDefault(n(418)),
+            m = a.__importDefault(n(419)),
+            g = a.__importStar(n(420)),
+            y = a.__importDefault(n(423)),
+            w = a.__importDefault(n(424)),
+            x = a.__importDefault(n(425)),
+            _ = a.__importDefault(n(427)),
+            E = a.__importDefault(n(437)),
+            b = a.__importDefault(n(23)),
+            C = a.__importDefault(n(132)),
+            S = a.__importDefault(n(24)),
+            o = a.__importDefault(n(31)),
+            i = a.__importDefault(n(35)),
+            n = a.__importDefault(n(36)),
+            D = 1,
+            n = (M.prototype.initSelection = function (e) {
+                A.default(this, e)
+            }, M.prototype.create = function () {
+                this.zIndex.init(this), this.isCompatibleMode = this.config.compatibleMode(), this.isCompatibleMode ||
+                (this.config.onchangeTimeout = 30), m.default(this), h.default(this), this.txt.init(),
+                    this.menus.init(), g.default(this), this.initSelection(!0), v.default(this), this.change
+                    .observe(), this.history.observe()
+            }, M.prototype.beforeDestroy = function (e) {
+                return this.beforeDestroyHooks.push(e), this
+            }, M.prototype.destroy = function () {
+                var e, t = this;
+                (0, r.default)(e = this.beforeDestroyHooks).call(e, function (e) {
+                    return e.call(t)
+                }), this.$toolbarElem.remove(), this.$textContainerElem.remove()
+            }, M.prototype.fullScreen = function () {
+                g.setFullScreen(this)
+            }, M.prototype.unFullScreen = function () {
+                g.setUnFullScreen(this)
+            }, M.prototype.scrollToHead = function (e) {
+                y.default(this, e)
+            }, M.registerMenu = function (e, t) {
+                t && "function" == typeof t && (M.globalCustomMenuConstructorList[e] = t)
+            }, M.$ = l.default, M.BtnMenu = b.default, M.DropList = C.default, M.DropListMenu = S.default,
+                M.Panel = o.default, M.PanelMenu = i.default, M.Tooltip = n.default, M.globalCustomMenuConstructorList = {},
+                M);
+
+        function M(e, t) {
+            if (this.beforeDestroyHooks = [], this.id = "wangEditor-" + D++, this.toolbarSelector = e, this
+                .textSelector = t, null == e) throw new Error("错误：初始化编辑器时候未传入任何参数，请查阅文档");
+            this.config = u.deepClone(s.default), this.$toolbarElem = l.default("<div></div>"), this.$textContainerElem =
+                l.default("<div></div>"), this.$textElem = l.default("<div></div>"), this.toolbarElemId =
+                "", this.textElemId = "", this.isFocus = !1, this.isComposing = !1, this.isCompatibleMode = !
+                1, this.selection = new c.default(this), this.cmd = new f.default(this), this.txt = new d.default(
+                this), this.menus = new p.default(this), this.zIndex = new w.default, this.change = new x
+                .default(this), this.history = new _.default(this);
+            t = E.default(this), e = t.disable, t = t.enable;
+            this.disable = e, this.enable = t
+        }
+        t.default = n
+    }, function (e, t, n) {
+        e.exports = n(198)
+    }, function (e, t, n) {
+        "use strict";
+        var f = n(5),
+            d = n(8),
+            p = n(122),
+            h = n(12),
+            A = n(17),
+            v = n(40),
+            m = n(86),
+            g = n(13),
+            y = n(42),
+            w = n(18).f,
+            x = n(29).forEach,
+            _ = n(15),
+            n = n(43),
+            E = n.set,
+            b = n.getterFor;
+        e.exports = function (n, e, t) {
+            var r, a, o = -1 !== n.indexOf("Map"),
+                l = -1 !== n.indexOf("Weak"),
+                i = o ? "set" : "add",
+                u = d[n],
+                s = u && u.prototype,
+                c = {};
+            return _ && "function" == typeof u && (l || s.forEach && !h(function () {
+                (new u).entries().next()
+            })) ? (r = e(function (e, t) {
+                E(m(e, r, n), {
+                    type: n,
+                    collection: new u
+                }), null != t && v(t, e[i], {
+                    that: e,
+                    AS_ENTRIES: o
+                })
+            }), a = b(n), x(["add", "clear", "delete", "forEach", "get", "has", "set", "keys",
+                "values", "entries"], function (o) {
+                var i = "add" == o || "set" == o;
+                o in s && (!l || "clear" != o) && A(r.prototype, o, function (e, t) {
+                    var n = a(this).collection;
+                    if (!i && l && !g(e)) return "get" == o && void 0;
+                    t = n[o](0 === e ? 0 : e, t);
+                    return i ? this : t
+                })
+            }), l || w(r.prototype, "size", {
+                configurable: !0,
+                get: function () {
+                    return a(this).collection.size
+                }
+            })) : (r = t.getConstructor(e, n, o, i), p.REQUIRED = !0), y(r, n, !1, !0), c[n] = r, f({
+                global: !0,
+                forced: !0
+            }, c), l || t.setStrong(r, n, o), r
+        }
+    }, function (e, t, n) {
+        function o(e) {
+            l(e, c, {
+                value: {
+                    objectID: "O" + ++f,
+                    weakData: {}
+                }
+            })
+        }
+        var i = n(49),
+            r = n(13),
+            a = n(16),
+            l = n(18).f,
+            u = n(61),
+            s = n(201),
+            c = u("meta"),
+            f = 0,
+            d = Object.isExtensible || function () {
+                return !0
+            },
+            p = e.exports = {
+                REQUIRED: !1,
+                fastKey: function (e, t) {
+                    if (!r(e)) return "symbol" == typeof e ? e : ("string" == typeof e ? "S" : "P") + e;
+                    if (!a(e, c)) {
+                        if (!d(e)) return "F";
+                        if (!t) return "E";
+                        o(e)
+                    }
+                    return e[c].objectID
+                },
+                getWeakData: function (e, t) {
+                    if (!a(e, c)) {
+                        if (!d(e)) return !0;
+                        if (!t) return !1;
+                        o(e)
+                    }
+                    return e[c].weakData
+                },
+                onFreeze: function (e) {
+                    return s && p.REQUIRED && d(e) && !a(e, c) && o(e), e
+                }
+            };
+        i[c] = !0
+    }, function (e, t, n) {
+        "use strict";
+        var s = n(18).f,
+            c = n(62),
+            f = n(110),
+            d = n(38),
+            p = n(86),
+            h = n(40),
+            a = n(88),
+            l = n(111),
+            A = n(15),
+            v = n(122).fastKey,
+            n = n(43),
+            m = n.set,
+            g = n.getterFor;
+        e.exports = {
+            getConstructor: function (e, n, o, i) {
+                function r(e, t, n) {
+                    var o, i = l(e),
+                        r = u(e, t);
+                    return r ? r.value = n : (i.last = r = {
+                        index: o = v(t, !0),
+                        key: t,
+                        value: n,
+                        previous: n = i.last,
+                        next: void 0,
+                        removed: !1
+                    }, i.first || (i.first = r), n && (n.next = r), A ? i.size++ : e.size++,
+                    "F" !== o && (i.index[o] = r)), e
+                }
+                var a = e(function (e, t) {
+                        p(e, a, n), m(e, {
+                            type: n,
+                            index: c(null),
+                            first: void 0,
+                            last: void 0,
+                            size: 0
+                        }), A || (e.size = 0), null != t && h(t, e[i], {
+                            that: e,
+                            AS_ENTRIES: o
+                        })
+                    }),
+                    l = g(n),
+                    u = function (e, t) {
+                        var n, o = l(e),
+                            e = v(t);
+                        if ("F" !== e) return o.index[e];
+                        for (n = o.first; n; n = n.next)
+                            if (n.key == t) return n
+                    };
+                return f(a.prototype, {
+                    clear: function () {
+                        for (var e = l(this), t = e.index, n = e.first; n;) n.removed = !
+                            0, n.previous && (n.previous = n.previous.next = void 0),
+                            delete t[n.index], n = n.next;
+                        e.first = e.last = void 0, A ? e.size = 0 : this.size = 0
+                    },
+                    delete: function (e) {
+                        var t, n = l(this),
+                            o = u(this, e);
+                        return o && (t = o.next, e = o.previous, delete n.index[o.index],
+                            o.removed = !0, e && (e.next = t), t && (t.previous = e),
+                        n.first == o && (n.first = t), n.last == o && (n.last =
+                            e), A ? n.size-- : this.size--), !!o
+                    },
+                    forEach: function (e) {
+                        for (var t, n = l(this), o = d(e, 1 < arguments.length ?
+                            arguments[1] : void 0, 3); t = t ? t.next : n.first;)
+                            for (o(t.value, t.key, this); t && t.removed;) t = t.previous
+                    },
+                    has: function (e) {
+                        return !!u(this, e)
+                    }
+                }), f(a.prototype, o ? {
+                    get: function (e) {
+                        e = u(this, e);
+                        return e && e.value
+                    },
+                    set: function (e, t) {
+                        return r(this, 0 === e ? 0 : e, t)
+                    }
+                } : {
+                    add: function (e) {
+                        return r(this, e = 0 === e ? 0 : e, e)
+                    }
+                }), A && s(a.prototype, "size", {
+                    get: function () {
+                        return l(this).size
+                    }
+                }), a
+            },
+            setStrong: function (e, t, n) {
+                var o = t + " Iterator",
+                    i = g(t),
+                    r = g(o);
+                a(e, t, function (e, t) {
+                    m(this, {
+                        type: o,
+                        target: e,
+                        state: i(e),
+                        kind: t,
+                        last: void 0
+                    })
+                }, function () {
+                    for (var e = r(this), t = e.kind, n = e.last; n && n.removed;) n = n.previous;
+                    return e.target && (e.last = n = n ? n.next : e.state.first) ? "keys" ==
+                    t ? {
+                        value: n.key,
+                        done: !1
+                    } : "values" == t ? {
+                        value: n.value,
+                        done: !1
+                    } : {
+                        value: [n.key, n.value],
+                        done: !1
+                    } : {
+                        value: e.target = void 0,
+                        done: !0
+                    }
+                }, n ? "entries" : "values", !n, !0), l(t)
+            }
+        }
+    }, function (e, t, n) {
+        var o = n(103),
+            i = n(83).concat("length", "prototype");
+        t.f = Object.getOwnPropertyNames || function (e) {
+            return o(e, i)
+        }
+    }, function (e, t) {
+        t.f = Object.getOwnPropertySymbols
+    }, function (e, t, n) {
+        n(11)("iterator")
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = {
+            zIndex: 1e4
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.getPasteImgs = t.getPasteHtml = t.getPasteText = void 0;
+        var i = n(2),
+            a = n(6),
+            l = i.__importDefault(n(296));
+
+        function u(e) {
+            var t = e.clipboardData,
+                e = "",
+                e = null == t ? window.clipboardData && window.clipboardData.getData("text") : t.getData(
+                    "text/plain");
+            return a.replaceHtmlSymbol(e)
+        }
+        t.getPasteText = u, t.getPasteHtml = function (e, t, n) {
+            void 0 === t && (t = !0), void 0 === n && (n = !1);
+            var o = e.clipboardData,
+                i = "";
+            if (!(i = o ? o.getData("text/html") : i)) {
+                e = u(e);
+                if (!e) return "";
+                i = "<p>" + e + "</p>"
+            }
+            return i = l.default(i, t, n)
+        }, t.getPasteImgs = function (e) {
+            var o = [];
+            return u(e) || (e = null === (e = e.clipboardData) || void 0 === e ? void 0 : e.items) && (
+                0, r.default)(a).call(a, e, function (e, t) {
+                var n = t.type;
+                /image/i.test(n) && o.push(t.getAsFile())
+            }), o
+        }
+    }, function (e, t, n) {
+        e.exports = n(298)
+    }, function (e, t, n) {
+        e.exports = n(306)
+    }, function (e, t, n) {
+        e.exports = n(310)
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            l = o(n(4)),
+            u = o(n(45));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var s = n(2).__importDefault(n(3)),
+            c = n(7),
+            i = (r.prototype.show = function () {
+                this.hideTimeoutId && clearTimeout(this.hideTimeoutId);
+                var e, t, n = this.menu.$elem,
+                    o = this.$container;
+                this._show || (this.rendered ? o.show() : (e = n.getBoundingClientRect().height || 0, t =
+                    this.conf.width || 100, o.css("margin-top", e + "px").css("width", t + "px"),
+                    n.append(o), this.rendered = !0), this._show = !0)
+            }, r.prototype.hide = function () {
+                var e = this.$container;
+                this._show && (e.hide(), this._show = !1)
+            }, (0, i.default)(r.prototype, "isShow", {
+                get: function () {
+                    return this._show
+                },
+                enumerable: !1,
+                configurable: !0
+            }), r);
+
+        function r(e, t) {
+            var o = this;
+            this.hideTimeoutId = 0, this.menu = e, this.conf = t;
+            var n = s.default('<div class="w-e-droplist"></div>'),
+                i = s.default("<p>" + t.title + "</p>");
+            i.addClass("w-e-dp-title"), n.append(i);
+            var e = t.list || [],
+                i = t.type || "list",
+                r = t.clickHandler || c.EMPTY_FN,
+                a = s.default('<ul class="' + ("list" === i ? "w-e-list" : "w-e-block") + '"></ul>');
+            (0, l.default)(e).call(e, function (e) {
+                var t = e.$elem,
+                    n = e.value,
+                    e = s.default('<li class="w-e-item"></li>');
+                t && (e.append(t), a.append(e), e.on("click", function (e) {
+                    r(n), e.stopPropagation(), o.hideTimeoutId = (0, u.default)(
+                        function () {
+                            o.hide()
+                        })
+                }))
+            }), n.append(a), n.on("mouseleave", function () {
+                o.hideTimeoutId = (0, u.default)(function () {
+                    o.hide()
+                })
+            }), this.$container = n, this.rendered = !1, this._show = !1
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = function (e) {
+            return !(null == (e = e.selection.getSelectionContainerElem()) || !e.length) && "A" === e.getNodeName()
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(94)),
+            r = o(n(1)),
+            a = o(n(4));
+        (0, r.default)(t, "__esModule", {
+            value: !0
+        });
+        var l = n(6);
+        t.default = function (e, n) {
+            var o = new XMLHttpRequest;
+            if (o.open("POST", e), o.timeout = n.timeout || 1e4, o.ontimeout = function () {
+                console.error("wangEditor - 请求超时"), n.onTimeout && n.onTimeout(o)
+            }, o.upload && (o.upload.onprogress = function (e) {
+                var t = e.loaded / e.total;
+                n.onProgress && n.onProgress(t, e)
+            }), n.headers && (0, a.default)(l).call(l, n.headers, function (e, t) {
+                o.setRequestHeader(e, t)
+            }), o.withCredentials = !!n.withCredentials, n.beforeSend) {
+                e = n.beforeSend(o);
+                if (e && "object" === (0, i.default)(e) && e.prevent) return e.msg
+            }
+            return o.onreadystatechange = function () {
+                if (4 === o.readyState) {
+                    var t = o.status;
+                    if (!(t < 200 || 300 <= t && t < 400)) {
+                        if (400 <= t) return console.error("wangEditor - XHR 报错，状态码 " + t), void(n.onError &&
+                            n.onError(o));
+                        var e, t = o.responseText;
+                        if ("object" !== (0, i.default)(t)) try {
+                            e = JSON.parse(t)
+                        } catch (e) {
+                            return console.error("wangEditor - 返回结果不是 JSON 格式", t), void(n.onFail &&
+                                n.onFail(o, t))
+                        } else e = t;
+                        n.onSuccess(o, e)
+                    }
+                }
+            }, o.send(n.formData || null), o
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(342)),
+            a = o(n(45));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var l = n(2).__importDefault(n(3)),
+            n = (u.prototype.show = function (e) {
+                var t, n = this;
+                this.isShow || (this.isShow = !0, t = this.$bar, this.$textContainer.append(t), 100 < (
+                    0, r.default)() - this.time && e <= 1 && (t.css("width", 100 * e + "%"),
+                    this.time = (0, r.default)()), (e = this.timeoutId) && clearTimeout(e),
+                    this.timeoutId = (0, a.default)(function () {
+                        n.hide()
+                    }, 500))
+            }, u.prototype.hide = function () {
+                this.$bar.remove(), this.isShow = !1, this.time = 0, this.timeoutId = 0
+            }, u);
+
+        function u(e) {
+            this.editor = e, this.$textContainer = e.$textContainerElem, this.$bar = l.default(
+                '<div class="w-e-progress"></div>'), this.isShow = !1, this.time = 0, this.timeoutId =
+                0
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.ListType = void 0;
+        var i, o = n(2),
+            r = o.__importDefault(n(3)),
+            a = o.__importDefault(n(24)),
+            u = n(46),
+            s = o.__importStar(n(370));
+        (n = i = t.ListType || (t.ListType = {})).OrderedList = "OL", n.UnorderedList = "UL";
+        var l, o = (l = a.default, o.__extends(c, l), c.prototype.command = function (e) {
+            void 0 !== this.editor.selection.getSelectionContainerElem() && (this.handleSelectionRangeNodes(
+                e), this.tryChangeActive())
+        }, c.prototype.validator = function (e, t, n) {
+            return !(!e.length || !t.length || n.equal(e) || n.equal(t))
+        }, c.prototype.handleSelectionRangeNodes = function (e) {
+            var t, n = this.editor,
+                o = n.selection,
+                i = e.toLowerCase(),
+                r = o.getSelectionContainerElem(),
+                a = o.getSelectionStartElem().getNodeTop(n),
+                l = o.getSelectionEndElem().getNodeTop(n);
+            this.validator(a, l, n.$textElem) && (o = null == (t = o.getRange()) ? void 0 : t.collapsed,
+            n.$textElem.equal(r) || (r = r.getNodeTop(n)), i = {
+                editor: n,
+                listType: e,
+                listTarget: i,
+                $selectionElem: r,
+                $startElem: a,
+                $endElem: l
+            }, l = this.isOrderElem(r) ? s.ClassType.Wrap : this.isOrderElem(a) && this.isOrderElem(
+                l) ? s.ClassType.Join : this.isOrderElem(a) ? s.ClassType.StartJoin : this.isOrderElem(
+                l) ? s.ClassType.EndJoin : s.ClassType.Other, t = new s.default(s.createListHandle(
+                l, i, t)), u.updateRange(n, t.getSelectionRangeElem(), !!o))
+        }, c.prototype.isOrderElem = function (e) {
+            e = e.getNodeName();
+            return e === i.OrderedList || e === i.UnorderedList
+        }, c.prototype.tryChangeActive = function () {}, c);
+
+        function c(e) {
+            var t = this,
+                n = r.default(
+                    '<div class="w-e-menu" data-title="序列">\n                <i class="w-e-icon-list2"></i>\n            </div>'
+                ),
+                o = {
+                    width: 130,
+                    title: "序列",
+                    type: "list",
+                    list: [{
+                        $elem: r.default(
+                            '\n                        <p>\n                            <i class="w-e-icon-list2 w-e-drop-list-item"></i>\n                            ' +
+                            e.i18next.t("menus.dropListMenu.list.无序列表") +
+                            "\n                        <p>"),
+                        value: i.UnorderedList
+                    }, {
+                        $elem: r.default(
+                            '<p>\n                            <i class="w-e-icon-list-numbered w-e-drop-list-item"></i>\n                            ' +
+                            e.i18next.t("menus.dropListMenu.list.有序列表") +
+                            "\n                        <p>"),
+                        value: i.OrderedList
+                    }],
+                    clickHandler: function (e) {
+                        t.command(e)
+                    }
+                };
+            return t = l.call(this, n, e, o) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        e.exports = n(394)
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = function (e) {
+            return !(null == (e = e.selection.getSelectionContainerElem()) || !e.length) && !("CODE" !=
+                e.getNodeName() && "PRE" != e.getNodeName() && "CODE" != e.parent().getNodeName() &&
+                "PRE" != e.parent().getNodeName() && !/hljs/.test(e.parent().attr("class")))
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(30));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.todo = void 0;
+        var a = n(2).__importDefault(n(3)),
+            l = (u.prototype.init = function () {
+                var e = this,
+                    t = this.getInput(),
+                    n = this.$child,
+                    o = this.getInputContainer();
+                n && n.insertAfter(o), t.on("click", function () {
+                    e.checked ? null != t && t.removeAttr("checked") : null != t && t.attr(
+                        "checked", ""), e.checked = !e.checked
+                })
+            }, u.prototype.getInput = function () {
+                var e = this.$todo;
+                return (0, r.default)(e).call(e, "input")
+            }, u.prototype.getInputContainer = function () {
+                return this.getInput().parent()
+            }, u.prototype.getTodo = function () {
+                return this.$todo
+            }, u);
+
+        function u(e) {
+            this.template =
+                '<ul class="w-e-todo"><li><span contenteditable="false"><input type="checkbox"></span></li></ul>',
+                this.checked = !1, this.$todo = a.default(this.template), this.$child = null === (e = null ==
+            e ? void 0 : e.childNodes()) || void 0 === e ? void 0 : e.clone(!0)
+        }
+        t.todo = l, t.default = function (e) {
+            return (e = new l(e)).init(), e
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2);
+        n(145), n(147), n(151), n(153), n(155), n(157), n(159);
+        var i = o.__importDefault(n(119));
+        o.__exportStar(n(440), t);
+        try {
+            document
+        } catch (e) {
+            throw new Error("请在浏览器环境下运行")
+        }
+        t.default = i.default
+    }, function (e, t, n) {
+        n = n(142);
+        e.exports = n
+    }, function (e, t, n) {
+        n(143);
+        var o = n(10).Object,
+            e = e.exports = function (e, t, n) {
+                return o.defineProperty(e, t, n)
+            };
+        o.defineProperty.sham && (e.sham = !0)
+    }, function (e, t, n) {
+        var o = n(5),
+            i = n(15);
+        o({
+            target: "Object",
+            stat: !0,
+            forced: !i,
+            sham: !i
+        }, {
+            defineProperty: n(18).f
+        })
+    }, function (e, t) {
+        var n = function () {
+            return this
+        }();
+        try {
+            n = n || new Function("return this")()
+        } catch (e) {
+            "object" == typeof window && (n = window)
+        }
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(21),
+            i = n(146),
+            n = {
+                insert: "head",
+                singleton: !1
+            };
+        o(i = "string" == typeof (i = i.__esModule ? i.default : i) ? [[e.i, i, ""]] : i, n);
+        e.exports = i.locals || {}
+    }, function (e, t, n) {
+        (t = n(22)(!1)).push([e.i,
+            '.w-e-toolbar,\n.w-e-text-container,\n.w-e-menu-panel {\n  padding: 0;\n  margin: 0;\n  box-sizing: border-box;\n  background-color: #fff;\n  /*表情菜单样式*/\n  /*分割线样式*/\n}\n.w-e-toolbar h1,\n.w-e-text-container h1,\n.w-e-menu-panel h1 {\n  font-size: 2em !important;\n}\n.w-e-toolbar h2,\n.w-e-text-container h2,\n.w-e-menu-panel h2 {\n  font-size: 1.5em !important;\n}\n.w-e-toolbar h3,\n.w-e-text-container h3,\n.w-e-menu-panel h3 {\n  font-size: 1.17em !important;\n}\n.w-e-toolbar h4,\n.w-e-text-container h4,\n.w-e-menu-panel h4 {\n  font-size: 1em !important;\n}\n.w-e-toolbar h5,\n.w-e-text-container h5,\n.w-e-menu-panel h5 {\n  font-size: 0.83em !important;\n}\n.w-e-toolbar p,\n.w-e-text-container p,\n.w-e-menu-panel p {\n  font-size: 1em !important;\n}\n.w-e-toolbar .eleImg,\n.w-e-text-container .eleImg,\n.w-e-menu-panel .eleImg {\n  cursor: pointer;\n  display: inline-block;\n  font-size: 18px;\n  padding: 0 3px;\n}\n.w-e-toolbar *,\n.w-e-text-container *,\n.w-e-menu-panel * {\n  padding: 0;\n  margin: 0;\n  box-sizing: border-box;\n}\n.w-e-toolbar hr,\n.w-e-text-container hr,\n.w-e-menu-panel hr {\n  cursor: pointer;\n  display: block;\n  height: 0px;\n  border: 0;\n  border-top: 3px solid #ccc;\n  margin: 20px 0;\n}\n.w-e-clear-fix:after {\n  content: "";\n  display: table;\n  clear: both;\n}\n.w-e-drop-list-item {\n  position: relative;\n  top: 1px;\n  padding-right: 7px;\n  color: #333 !important;\n}\n.w-e-drop-list-tl {\n  padding-left: 10px;\n  text-align: left;\n}\n',
+            ""]), e.exports = t
+    }, function (e, t, n) {
+        var o = n(21),
+            i = n(148),
+            n = {
+                insert: "head",
+                singleton: !1
+            };
+        o(i = "string" == typeof (i = i.__esModule ? i.default : i) ? [[e.i, i, ""]] : i, n);
+        e.exports = i.locals || {}
+    }, function (e, t, n) {
+        var o = n(22),
+            i = n(149),
+            n = n(150);
+        t = o(!1);
+        n = i(n);
+        t.push([e.i, "@font-face {\n  font-family: 'w-e-icon';\n  src: url(" + n +
+        ') format(\'truetype\');\n  font-weight: normal;\n  font-style: normal;\n}\n[class^="w-e-icon-"],\n[class*=" w-e-icon-"] {\n  /* use !important to prevent issues with browser extensions that change fonts */\n  font-family: \'w-e-icon\' !important;\n  speak: none;\n  font-style: normal;\n  font-weight: normal;\n  font-variant: normal;\n  text-transform: none;\n  line-height: 1;\n  /* Better Font Rendering =========== */\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n.w-e-icon-close:before {\n  content: "\\f00d";\n}\n.w-e-icon-upload2:before {\n  content: "\\e9c6";\n}\n.w-e-icon-trash-o:before {\n  content: "\\f014";\n}\n.w-e-icon-header:before {\n  content: "\\f1dc";\n}\n.w-e-icon-pencil2:before {\n  content: "\\e906";\n}\n.w-e-icon-paint-brush:before {\n  content: "\\f1fc";\n}\n.w-e-icon-image:before {\n  content: "\\e90d";\n}\n.w-e-icon-play:before {\n  content: "\\e912";\n}\n.w-e-icon-location:before {\n  content: "\\e947";\n}\n.w-e-icon-undo:before {\n  content: "\\e965";\n}\n.w-e-icon-redo:before {\n  content: "\\e966";\n}\n.w-e-icon-quotes-left:before {\n  content: "\\e977";\n}\n.w-e-icon-list-numbered:before {\n  content: "\\e9b9";\n}\n.w-e-icon-list2:before {\n  content: "\\e9bb";\n}\n.w-e-icon-link:before {\n  content: "\\e9cb";\n}\n.w-e-icon-happy:before {\n  content: "\\e9df";\n}\n.w-e-icon-bold:before {\n  content: "\\ea62";\n}\n.w-e-icon-underline:before {\n  content: "\\ea63";\n}\n.w-e-icon-italic:before {\n  content: "\\ea64";\n}\n.w-e-icon-strikethrough:before {\n  content: "\\ea65";\n}\n.w-e-icon-table2:before {\n  content: "\\ea71";\n}\n.w-e-icon-paragraph-left:before {\n  content: "\\ea77";\n}\n.w-e-icon-paragraph-center:before {\n  content: "\\ea78";\n}\n.w-e-icon-paragraph-right:before {\n  content: "\\ea79";\n}\n.w-e-icon-paragraph-justify:before {\n  content: "\\ea7a";\n}\n.w-e-icon-terminal:before {\n  content: "\\f120";\n}\n.w-e-icon-page-break:before {\n  content: "\\ea68";\n}\n.w-e-icon-cancel-circle:before {\n  content: "\\ea0d";\n}\n.w-e-icon-font:before {\n  content: "\\ea5c";\n}\n.w-e-icon-text-heigh:before {\n  content: "\\ea5f";\n}\n.w-e-icon-paint-format:before {\n  content: "\\e90c";\n}\n.w-e-icon-indent-increase:before {\n  content: "\\ea7b";\n}\n.w-e-icon-indent-decrease:before {\n  content: "\\ea7c";\n}\n.w-e-icon-row-height:before {\n  content: "\\e9be";\n}\n.w-e-icon-fullscreen_exit:before {\n  content: "\\e900";\n}\n.w-e-icon-fullscreen:before {\n  content: "\\e901";\n}\n.w-e-icon-split-line:before {\n  content: "\\ea0b";\n}\n.w-e-icon-checkbox-checked:before {\n  content: "\\ea52";\n}\n',
+            ""]), e.exports = t
+    }, function (e, t, n) {
+        "use strict";
+        e.exports = function (e, t) {
+            return t = t || {}, "string" != typeof (e = e && e.__esModule ? e.default : e) ? e : (
+                /^['"].*['"]$/.test(e) && (e = e.slice(1, -1)), t.hash && (e += t.hash),
+                    /["'() \t\n]/.test(e) || t.needQuotes ? '"'.concat(e.replace(/"/g, '\\"').replace(
+                        /\n/g, "\\n"), '"') : e)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        n.r(t), t.default =
+            "data:font/woff;base64,d09GRgABAAAAABskAAsAAAAAGtgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABPUy8yAAABCAAAAGAAAABgDxIPFWNtYXAAAAFoAAABHAAAARz2mfAgZ2FzcAAAAoQAAAAIAAAACAAAABBnbHlmAAACjAAAFXwAABV8IH7+mGhlYWQAABgIAAAANgAAADYb6gumaGhlYQAAGEAAAAAkAAAAJAkjBWlobXR4AAAYZAAAAKQAAACkmYcEbmxvY2EAABkIAAAAVAAAAFReAmKYbWF4cAAAGVwAAAAgAAAAIAA0ALZuYW1lAAAZfAAAAYYAAAGGmUoJ+3Bvc3QAABsEAAAAIAAAACAAAwAAAAMD7wGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAA8fwDwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEAQAAAAA8ACAABAAcAAEAIOkB6QbpDekS6UfpZul36bnpu+m+6cbpy+nf6gvqDepS6lzqX+pl6nHqfPAN8BTxIPHc8fz//f//AAAAAAAg6QDpBukM6RLpR+ll6Xfpuem76b7pxunL6d/qC+oN6lLqXOpf6mLqcep38A3wFPEg8dzx/P/9//8AAf/jFwQXABb7FvcWwxamFpYWVRZUFlIWSxZHFjQWCRYIFcQVuxW5FbcVrBWnEBcQEQ8GDksOLAADAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAB//8ADwABAAAAAAAAAAAAAgAANzkBAAAAAAEAAAAAAAAAAAACAAA3OQEAAAAAAQAAAAAAAAAAAAIAADc5AQAAAAAEAEEAAQO/A38ABQALABEAFwAAATMVIREzAxEhFSMVATUzESE1ETUhESM1Av/A/sJ+fgE+wP4Cfv7CAT5+Ar9+AT78ggE+fsACvsD+wn7+An7+wsAAAAAABABBAAEDvwN/AAUACwARABcAAAEhESM1IxM1MxEhNQERIRUjFREVMxUhEQKBAT5+wMB+/sL9wAE+wMD+wgN//sLA/X7A/sJ+AcIBPn7A/v7AfgE+AAAAAAIAAP/ABAADwAAEABMAAAE3AScBAy4BJxM3ASMBAyUBNQEHAYCAAcBA/kCfFzsyY4ABgMD+gMACgAGA/oBOAUBAAcBA/kD+nTI7FwERTgGA/oD9gMABgMD+gIAAAgAA/8AEAAOAACkALQAAAREjNTQmIyEiBh0BFBYzITI2PQEzESEVIyIGFREUFjsBMjY1ETQmKwE1ASE1IQQAwCYa/UAaJiYaAsAaJoD9wCANExMNgA0TEw0gAUD9QALAAYABgEAaJiYawBomJhpA/wCAEw3+wA0TEw0BQA0TQAGAQAAABAAAAAAEAAOAABAAIQAtADQAAAE4ATEROAExITgBMRE4ATEhNSEiBhURFBYzITI2NRE0JiMHFAYjIiY1NDYzMhYTITUTATM3A8D8gAOA/IAaJiYaA4AaJiYagDgoKDg4KCg4QP0A4AEAQOADQP0AAwBAJhr9ABomJhoDABom4Cg4OCgoODj9uIABgP7AwAAAAgAAAEAEAANAADgAPAAAASYnLgEnJiMiBw4BBwYHBgcOAQcGFRQXHgEXFhcWFx4BFxYzMjc+ATc2NzY3PgE3NjU0Jy4BJyYnARENAQPVNjg5djw9Pz89PHY5ODYLBwgLAwMDAwsIBws2ODl2PD0/Pz08djk4NgsHCAsDAwMDCwgHC/2rAUD+wAMgCAYGCAICAgIIBgYIKSoqWS0uLy8uLVkqKikIBgYIAgICAggGBggpKipZLS4vLy4tWSoqKf3gAYDAwAAAAAACAMD/wANAA8AAGwAnAAABIgcOAQcGFRQXHgEXFjEwNz4BNzY1NCcuAScmAyImNTQ2MzIWFRQGAgBCOzpXGRkyMngyMjIyeDIyGRlXOjtCUHBwUFBwcAPAGRlXOjtCeH19zEFBQUHMfX14Qjs6VxkZ/gBwUFBwcFBQcAAAAQAAAAAEAAOAACsAAAEiBw4BBwYHJxEhJz4BMzIXHgEXFhUUBw4BBwYHFzY3PgE3NjU0Jy4BJyYjAgA1MjJcKSkjlgGAkDWLUFBFRmkeHgkJIhgYHlUoICAtDAwoKIteXWoDgAoLJxscI5b+gJA0PB4eaUZFUCsoKUkgIRpgIysrYjY2OWpdXosoKAABAAAAAAQAA4AAKgAAExQXHgEXFhc3JicuAScmNTQ3PgE3NjMyFhcHIREHJicuAScmIyIHDgEHBgAMDC0gIChVHhgYIgkJHh5pRkVQUIs1kAGAliMpKVwyMjVqXV6LKCgBgDk2NmIrKyNgGiEgSSkoK1BFRmkeHjw0kAGAliMcGycLCigoi15dAAAAAAIAAABABAEDAAAmAE0AABMyFx4BFxYVFAcOAQcGIyInLgEnJjUnNDc+ATc2MxUiBgcOAQc+ASEyFx4BFxYVFAcOAQcGIyInLgEnJjUnNDc+ATc2MxUiBgcOAQc+AeEuKSk9ERISET0pKS4uKSk9ERIBIyN6UlFdQHUtCRAHCBICSS4pKT0REhIRPSkpLi4pKT0REgEjI3pSUV1AdS0JEAcIEgIAEhE9KSkuLikpPRESEhE9KSkuIF1RUnojI4AwLggTCgIBEhE9KSkuLikpPRESEhE9KSkuIF1RUnojI4AwLggTCgIBAAAGAED/wAQAA8AAAwAHAAsAEQAdACkAACUhFSERIRUhESEVIScRIzUjNRMVMxUjNTc1IzUzFRURIzUzNSM1MzUjNQGAAoD9gAKA/YACgP2AwEBAQIDAgIDAwICAgICAgAIAgAIAgMD/AMBA/fIyQJI8MkCS7v7AQEBAQEAABgAA/8AEAAPAAAMABwALABcAIwAvAAABIRUhESEVIREhFSEBNDYzMhYVFAYjIiYRNDYzMhYVFAYjIiYRNDYzMhYVFAYjIiYBgAKA/YACgP2AAoD9gP6ASzU1S0s1NUtLNTVLSzU1S0s1NUtLNTVLA4CA/wCA/wCAA0A1S0s1NUtL/rU1S0s1NUtL/rU1S0s1NUtLAAUAAABABWADAAADAAcACwAOABEAABMhFSEVIRUhFSEVIQEXNzUnBwADgPyAA4D8gAOA/IAD4MDAwMADAMBAwEDAAUDAwEDAwAAAAAADAAAAAAQAA6AAAwANABQAADchFSElFSE1EyEVITUhJQkBIxEjEQAEAPwABAD8AIABAAEAAQD9YAEgASDggEBAwEBAAQCAgMABIP7g/wABAAAAAAACAB7/zAPiA7QAMwBkAAABIiYnJicmNDc2PwE+ATMyFhcWFxYUBwYPAQYiJyY0PwE2NCcuASMiBg8BBhQXFhQHDgEjAyImJyYnJjQ3Nj8BNjIXFhQPAQYUFx4BMzI2PwE2NCcmNDc2MhcWFxYUBwYPAQ4BIwG4ChMIIxISEhIjwCNZMTFZIyMSEhISI1gPLA8PD1gpKRQzHBwzFMApKQ8PCBMKuDFZIyMSEhISI1gPLA8PD1gpKRQzHBwzFMApKQ8PDysQIxISEhIjwCNZMQFECAckLS1eLS0kwCIlJSIkLS1eLS0kVxAQDysPWCl0KRQVFRTAKXQpDysQBwj+iCUiJC0tXi0tJFcQEA8rD1gpdCkUFRUUwCl0KQ8rEA8PJC0tXi0tJMAiJQAAAAAFAAD/wAQAA8AAGwA3AFMAXwBrAAAFMjc+ATc2NTQnLgEnJiMiBw4BBwYVFBceARcWEzIXHgEXFhUUBw4BBwYjIicuAScmNTQ3PgE3NhMyNz4BNzY3BgcOAQcGIyInLgEnJicWFx4BFxYnNDYzMhYVFAYjIiYlNDYzMhYVFAYjIiYCAGpdXosoKCgoi15dampdXosoKCgoi15dalZMTHEgISEgcUxMVlZMTHEgISEgcUxMVisrKlEmJiMFHBtWODc/Pzc4VhscBSMmJlEqK9UlGxslJRsbJQGAJRsbJSUbGyVAKCiLXl1qal1eiygoKCiLXl1qal1eiygoA6AhIHFMTFZWTExxICEhIHFMTFZWTExxICH+CQYGFRAQFEM6OlYYGRkYVjo6QxQQEBUGBvcoODgoKDg4KCg4OCgoODgAAAEAAAFABAACQAAPAAATFRQWMyEyNj0BNCYjISIGABMNA8ANExMN/EANEwIgwA0TEw3ADRMTAAAAAwAA/8AEAAPAABsANwBDAAABIgcOAQcGFRQXHgEXFjMyNz4BNzY1NCcuAScmAyInLgEnJjU0Nz4BNzYzMhceARcWFRQHDgEHBhMHJwcXBxc3FzcnNwIAal1eiygoKCiLXl1qal1eiygoKCiLXl1qVkxMcSAhISBxTExWVkxMcSAhISBxTExKoKBgoKBgoKBgoKADwCgoi15dampdXosoKCgoi15dampdXosoKPxgISBxTExWVkxMcSAhISBxTExWVkxMcSAhAqCgoGCgoGCgoGCgoAACAAD/wAQAA8AADwAVAAABISIGFREUFjMhMjY1ETQmASc3FwEXA4D9ADVLSzUDADVLS/4L7VqTATNaA8BLNf0ANUtLNQMANUv85e5akgEyWgAAAAABAGX/wAObA8AAKQAAASImIyIHDgEHBhUUFjMuATU0NjcwBwYCBwYHFSETMzcjNx4BMzI2Nw4BAyBEaEZxU1RtGhtJSAYNZUoQEEs8PFkBPWzGLNc0LVUmLlAYHT0DsBAeHWE+P0FNOwsmN5lvA31+/sWPkCMZAgCA9gkPN2sJBwAAAAACAAAAAAQAA4AACQAXAAAlMwcnMxEjNxcjJREnIxEzFSE1MxEjBxEDgICgoICAoKCA/wBAwID+gIDAQMDAwAIAwMDA/wCA/UBAQALAgAEAAAMAwAAAA0ADgAAWAB8AKAAAAT4BNTQnLgEnJiMhESEyNz4BNzY1NCYBMzIWFRQGKwETIxEzMhYVFAYCxBwgFBRGLi81/sABgDUvLkYUFET+hGUqPDwpZp+fnyw+PgHbIlQvNS8uRhQU/IAUFEYuLzVGdAFGSzU1S/6AAQBLNTVLAAAAAAIAwAAAA0ADgAAfACMAAAEzERQHDgEHBiMiJy4BJyY1ETMRFBYXHgEzMjY3PgE1ASEVIQLAgBkZVzo7QkI7OlcZGYAbGBxJKChJHBgb/gACgP2AA4D+YDw0NU4WFxcWTjU0PAGg/mAeOBcYGxsYFzge/qCAAAAAAAEAgAAAA4ADgAALAAABFSMBMxUhNTMBIzUDgID+wID+QIABQIADgED9AEBAAwBAAAEAAAAABAADgAA9AAABFSMeARUUBgcOASMiJicuATUzFBYzMjY1NCYjITUhLgEnLgE1NDY3PgEzMhYXHgEVIzQmIyIGFRQWMzIWFwQA6xUWNTAscT4+cSwwNYByTk5yck7+AAEsAgQBMDU1MCxxPj5xLDA1gHJOTnJyTjtuKwHAQB1BIjViJCEkJCEkYjU0TEw0NExAAQMBJGI1NWIkISQkISRiNTRMTDQ0TCEfAAAACgAAAAAEAAOAAAMABwALAA8AEwAXABsAHwAjACcAABMRIREBNSEVHQEhNQEVITUjFSE1ESEVISUhFSERNSEVASEVISE1IRUABAD9gAEA/wABAP8AQP8AAQD/AAKAAQD/AAEA/IABAP8AAoABAAOA/IADgP3AwMBAwMACAMDAwMD/AMDAwAEAwMD+wMDAwAAABQAAAAAEAAOAAAMABwALAA8AEwAAEyEVIRUhFSERIRUhESEVIREhFSEABAD8AAKA/YACgP2ABAD8AAQA/AADgIBAgP8AgAFAgP8AgAAAAAAFAAAAAAQAA4AAAwAHAAsADwATAAATIRUhFyEVIREhFSEDIRUhESEVIQAEAPwAwAKA/YACgP2AwAQA/AAEAPwAA4CAQID/AIABQID/AIAAAAUAAAAABAADgAADAAcACwAPABMAABMhFSEFIRUhESEVIQEhFSERIRUhAAQA/AABgAKA/YACgP2A/oAEAPwABAD8AAOAgECA/wCAAUCA/wCAAAAAAAUAAAAABAADgAADAAcACwAPABMAABMhFSEVIRUhFSEVIRUhFSEVIRUhAAQA/AAEAPwABAD8AAQA/AAEAPwAA4CAQIBAgECAQIAAAAAGAAAAAAQAA4AAAwAHAAsADwATABYAABMhFSEFIRUhFSEVIRUhFSEFIRUhGQEFAAQA/AABgAKA/YACgP2AAoD9gP6ABAD8AAEAA4CAQIBAgECAQIABAAGAwAAAAAYAAAAABAADgAADAAcACwAPABMAFgAAEyEVIQUhFSEVIRUhFSEVIQUhFSEBESUABAD8AAGAAoD9gAKA/YACgP2A/oAEAPwAAQD/AAOAgECAQIBAgECAAoD+gMAAAQA/AD8C5gLmACwAACUUDwEGIyIvAQcGIyIvASY1ND8BJyY1ND8BNjMyHwE3NjMyHwEWFRQPARcWFQLmEE4QFxcQqKgQFxYQThAQqKgQEE4QFhcQqKgQFxcQThAQqKgQwxYQThAQqKgQEE4QFhcQqKgQFxcQThAQqKgQEE4QFxcQqKgQFwAAAAYAAAAAAyUDbgAUACgAPABNAFUAggAAAREUBwYrASInJjURNDc2OwEyFxYVMxEUBwYrASInJjURNDc2OwEyFxYXERQHBisBIicmNRE0NzY7ATIXFhMRIREUFxYXFjMhMjc2NzY1ASEnJicjBgcFFRQHBisBERQHBiMhIicmNREjIicmPQE0NzY7ATc2NzY7ATIXFh8BMzIXFhUBJQYFCCQIBQYGBQgkCAUGkgUFCCUIBQUFBQglCAUFkgUFCCUIBQUFBQglCAUFSf4ABAQFBAIB2wIEBAQE/oABABsEBrUGBAH3BgUINxobJv4lJhsbNwgFBQUFCLEoCBcWF7cXFhYJKLAIBQYCEv63CAUFBQUIAUkIBQYGBQj+twgFBQUFCAFJCAUGBgUI/rcIBQUFBQgBSQgFBgYF/lsCHf3jDQsKBQUFBQoLDQJmQwUCAgVVJAgGBf3jMCIjISIvAiAFBggkCAUFYBUPDw8PFWAFBQgAAgAHAEkDtwKvABoALgAACQEGIyIvASY1ND8BJyY1ND8BNjMyFwEWFRQHARUUBwYjISInJj0BNDc2MyEyFxYBTv72BgcIBR0GBuHhBgYdBQgHBgEKBgYCaQUFCP3bCAUFBQUIAiUIBQUBhf72BgYcBggHBuDhBgcHBh0FBf71BQgHBv77JQgFBQUFCCUIBQUFBQAAAAEAIwAAA90DbgCzAAAlIicmIyIHBiMiJyY1NDc2NzY3Njc2PQE0JyYjISIHBh0BFBcWFxYzFhcWFRQHBiMiJyYjIgcGIyInJjU0NzY3Njc2NzY9ARE0NTQ1NCc0JyYnJicmJyYnJiMiJyY1NDc2MzIXFjMyNzYzMhcWFRQHBiMGBwYHBh0BFBcWMyEyNzY9ATQnJicmJyY1NDc2MzIXFjMyNzYzMhcWFRQHBgciBwYHBhURFBcWFxYXMhcWFRQHBiMDwRkzMhoZMjMZDQgHCQoNDBEQChIBBxX+fhYHARUJEhMODgwLBwcOGzU1GhgxMRgNBwcJCQsMEA8JEgECAQIDBAQFCBIRDQ0KCwcHDho1NRoYMDEYDgcHCQoMDRAQCBQBBw8BkA4HARQKFxcPDgcHDhkzMhkZMTEZDgcHCgoNDRARCBQUCRERDg0KCwcHDgACAgICDAsPEQkJAQEDAwUMROAMBQMDBQzUUQ0GAQIBCAgSDwwNAgICAgwMDhEICQECAwMFDUUhAdACDQ0ICA4OCgoLCwcHAwYBAQgIEg8MDQICAgINDA8RCAgBAgEGDFC2DAcBAQcMtlAMBgEBBgcWDwwNAgICAg0MDxEICAEBAgYNT/3mRAwGAgIBCQgRDwwNAAACAAD/twP/A7cAEwA5AAABMhcWFRQHAgcGIyInJjU0NwE2MwEWFxYfARYHBiMiJyYnJicmNRYXFhcWFxYzMjc2NzY3Njc2NzY3A5soHh4avkw3RUg0NDUBbSEp/fgXJicvAQJMTHtHNjYhIRARBBMUEBASEQkXCA8SExUVHR0eHikDtxsaKCQz/plGNDU0SUkwAUsf/bErHx8NKHpNTBobLi86OkQDDw4LCwoKFiUbGhERCgsEBAIAAQAAAAAAAIWwaoFfDzz1AAsEAAAAAADbteOZAAAAANu145kAAP+3BWADwAAAAAgAAgAAAAAAAAABAAADwP/AAAAFgAAA//8FYAABAAAAAAAAAAAAAAAAAAAAKQQAAAAAAAAAAAAAAAIAAAAEAABBBAAAQQQAAAAEAAAABAAAAAQAAAAEAADABAAAAAQAAAAEAAAABAAAQAQAAAAFgAAABAAAAAQAAB4EAAAABAAAAAQAAAAEAAAABAAAZQQAAAAEAADABAAAwAQAAIAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAMlAD8DJQAAA74ABwQAACMD/wAAAAAAAAAKABQAHgBKAHYApADmAS4BkgHQAhYCXALQAw4DWAN+A6gEPgTeBPoFZAWOBdAF+AY6BnYGjgbmBy4HVgd+B6gHzgf8CCoIbgkmCXAKYgq+AAEAAAApALQACgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAOAK4AAQAAAAAAAQAHAAAAAQAAAAAAAgAHAGAAAQAAAAAAAwAHADYAAQAAAAAABAAHAHUAAQAAAAAABQALABUAAQAAAAAABgAHAEsAAQAAAAAACgAaAIoAAwABBAkAAQAOAAcAAwABBAkAAgAOAGcAAwABBAkAAwAOAD0AAwABBAkABAAOAHwAAwABBAkABQAWACAAAwABBAkABgAOAFIAAwABBAkACgA0AKRpY29tb29uAGkAYwBvAG0AbwBvAG5WZXJzaW9uIDEuMABWAGUAcgBzAGkAbwBuACAAMQAuADBpY29tb29uAGkAYwBvAG0AbwBvAG5pY29tb29uAGkAYwBvAG0AbwBvAG5SZWd1bGFyAFIAZQBnAHUAbABhAHJpY29tb29uAGkAYwBvAG0AbwBvAG5Gb250IGdlbmVyYXRlZCBieSBJY29Nb29uLgBGAG8AbgB0ACAAZwBlAG4AZQByAGEAdABlAGQAIABiAHkAIABJAGMAbwBNAG8AbwBuAC4AAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
+    }, function (e, t, n) {
+        var o = n(21),
+            i = n(152),
+            n = {
+                insert: "head",
+                singleton: !1
+            };
+        o(i = "string" == typeof (i = i.__esModule ? i.default : i) ? [[e.i, i, ""]] : i, n);
+        e.exports = i.locals || {}
+    }, function (e, t, n) {
+        (t = n(22)(!1)).push([e.i,
+            '.w-e-toolbar {\n  display: flex;\n  padding: 0 6px;\n  flex-wrap: wrap;\n  position: relative;\n  /* 单个菜单 */\n}\n.w-e-toolbar .w-e-menu {\n  position: relative;\n  display: flex;\n  width: 40px;\n  height: 40px;\n  align-items: center;\n  justify-content: center;\n  text-align: center;\n  cursor: pointer;\n}\n.w-e-toolbar .w-e-menu i {\n  color: #999;\n}\n.w-e-toolbar .w-e-menu:hover {\n  background-color: #F6F6F6;\n}\n.w-e-toolbar .w-e-menu:hover i {\n  color: #333;\n}\n.w-e-toolbar .w-e-active i {\n  color: #1e88e5;\n}\n.w-e-toolbar .w-e-active:hover i {\n  color: #1e88e5;\n}\n.w-e-menu-tooltip {\n  position: absolute;\n  display: flex;\n  color: #f1f1f1;\n  background-color: rgba(0, 0, 0, 0.75);\n  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.15);\n  border-radius: 4px;\n  padding: 4px 5px 6px;\n  justify-content: center;\n  align-items: center;\n}\n.w-e-menu-tooltip-up::after {\n  content: "";\n  position: absolute;\n  top: 100%;\n  left: 50%;\n  margin-left: -5px;\n  border: 5px solid rgba(0, 0, 0, 0);\n  border-top-color: rgba(0, 0, 0, 0.73);\n}\n.w-e-menu-tooltip-down::after {\n  content: "";\n  position: absolute;\n  bottom: 100%;\n  left: 50%;\n  margin-left: -5px;\n  border: 5px solid rgba(0, 0, 0, 0);\n  border-bottom-color: rgba(0, 0, 0, 0.73);\n}\n.w-e-menu-tooltip-item-wrapper {\n  font-size: 14px;\n  margin: 0 5px;\n}\n',
+            ""]), e.exports = t
+    }, function (e, t, n) {
+        var o = n(21),
+            i = n(154),
+            n = {
+                insert: "head",
+                singleton: !1
+            };
+        o(i = "string" == typeof (i = i.__esModule ? i.default : i) ? [[e.i, i, ""]] : i, n);
+        e.exports = i.locals || {}
+    }, function (e, t, n) {
+        (t = n(22)(!1)).push([e.i,
+            '.w-e-text-container {\n  position: relative;\n  height: 100%;\n}\n.w-e-text-container .w-e-progress {\n  position: absolute;\n  background-color: #1e88e5;\n  top: 0;\n  left: 0;\n  height: 1px;\n}\n.w-e-text-container .placeholder {\n  color: #D4D4D4;\n  position: absolute;\n  font-size: 11pt;\n  line-height: 22px;\n  left: 10px;\n  top: 10px;\n  -webkit-user-select: none;\n     -moz-user-select: none;\n      -ms-user-select: none;\n          user-select: none;\n  z-index: -1;\n}\n.w-e-text {\n  padding: 0 10px;\n  overflow-y: auto;\n}\n.w-e-text p,\n.w-e-text h1,\n.w-e-text h2,\n.w-e-text h3,\n.w-e-text h4,\n.w-e-text h5,\n.w-e-text table,\n.w-e-text pre {\n  margin: 10px 0;\n  line-height: 1.5;\n}\n.w-e-text ul,\n.w-e-text ol {\n  margin: 10px 0 10px 20px;\n}\n.w-e-text blockquote {\n  display: block;\n  border-left: 8px solid #d0e5f2;\n  padding: 5px 10px;\n  margin: 10px 0;\n  line-height: 1.4;\n  font-size: 100%;\n  background-color: #f1f1f1;\n}\n.w-e-text code {\n  display: inline-block;\n  background-color: #f1f1f1;\n  border-radius: 3px;\n  padding: 3px 5px;\n  margin: 0 3px;\n}\n.w-e-text pre code {\n  display: block;\n}\n.w-e-text table {\n  border-top: 1px solid #ccc;\n  border-left: 1px solid #ccc;\n}\n.w-e-text table td,\n.w-e-text table th {\n  border-bottom: 1px solid #ccc;\n  border-right: 1px solid #ccc;\n  padding: 3px 5px;\n  min-height: 30px;\n}\n.w-e-text table th {\n  border-bottom: 2px solid #ccc;\n  text-align: center;\n  background-color: #f1f1f1;\n}\n.w-e-text:focus {\n  outline: none;\n}\n.w-e-text img {\n  cursor: pointer;\n}\n.w-e-text img:hover {\n  box-shadow: 0 0 5px #333;\n}\n.w-e-text .w-e-todo {\n  margin: 0 0 0 20px;\n}\n.w-e-text .w-e-todo li {\n  list-style: none;\n  font-size: 1em;\n}\n.w-e-text .w-e-todo li span:nth-child(1) {\n  position: relative;\n  left: -18px;\n}\n.w-e-text .w-e-todo li span:nth-child(1) input {\n  position: absolute;\n  margin-right: 3px;\n}\n.w-e-text .w-e-todo li span:nth-child(1) input[type=checkbox] {\n  top: 50%;\n  margin-top: -6px;\n}\n.w-e-tooltip {\n  position: absolute;\n  display: flex;\n  color: #f1f1f1;\n  background-color: rgba(0, 0, 0, 0.75);\n  box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.15);\n  border-radius: 4px;\n  padding: 4px 5px 6px;\n  justify-content: center;\n  align-items: center;\n}\n.w-e-tooltip-up::after {\n  content: "";\n  position: absolute;\n  top: 100%;\n  left: 50%;\n  margin-left: -5px;\n  border: 5px solid rgba(0, 0, 0, 0);\n  border-top-color: rgba(0, 0, 0, 0.73);\n}\n.w-e-tooltip-down::after {\n  content: "";\n  position: absolute;\n  bottom: 100%;\n  left: 50%;\n  margin-left: -5px;\n  border: 5px solid rgba(0, 0, 0, 0);\n  border-bottom-color: rgba(0, 0, 0, 0.73);\n}\n.w-e-tooltip-item-wrapper {\n  cursor: pointer;\n  font-size: 14px;\n  margin: 0 5px;\n}\n.w-e-tooltip-item-wrapper:hover {\n  color: #ccc;\n  text-decoration: underline;\n}\n',
+            ""]), e.exports = t
+    }, function (e, t, n) {
+        var o = n(21),
+            i = n(156),
+            n = {
+                insert: "head",
+                singleton: !1
+            };
+        o(i = "string" == typeof (i = i.__esModule ? i.default : i) ? [[e.i, i, ""]] : i, n);
+        e.exports = i.locals || {}
+    }, function (e, t, n) {
+        (t = n(22)(!1)).push([e.i,
+            '.w-e-menu .w-e-panel-container {\n  position: absolute;\n  top: 0;\n  left: 50%;\n  border: 1px solid #ccc;\n  border-top: 0;\n  box-shadow: 1px 1px 2px #ccc;\n  color: #333;\n  background-color: #fff;\n  text-align: left;\n  /* 为 emotion panel 定制的样式 */\n  /* 上传图片、上传视频的 panel 定制样式 */\n}\n.w-e-menu .w-e-panel-container .w-e-panel-close {\n  position: absolute;\n  right: 0;\n  top: 0;\n  padding: 5px;\n  margin: 2px 5px 0 0;\n  cursor: pointer;\n  color: #999;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-close:hover {\n  color: #333;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-title {\n  list-style: none;\n  display: flex;\n  font-size: 14px;\n  margin: 2px 10px 0 10px;\n  border-bottom: 1px solid #f1f1f1;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-title .w-e-item {\n  padding: 3px 5px;\n  color: #999;\n  cursor: pointer;\n  margin: 0 3px;\n  position: relative;\n  top: 1px;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-title .w-e-active {\n  color: #333;\n  border-bottom: 1px solid #333;\n  cursor: default;\n  font-weight: 700;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content {\n  padding: 10px 15px 10px 15px;\n  font-size: 16px;\n  /* 输入框的样式 */\n  /* 按钮的样式 */\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content input:focus,\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content textarea:focus,\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content button:focus {\n  outline: none;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content textarea {\n  width: 100%;\n  border: 1px solid #ccc;\n  padding: 5px;\n  margin-top: 10px;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content textarea:focus {\n  border-color: #1e88e5;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content input[type=text] {\n  border: none;\n  border-bottom: 1px solid #ccc;\n  font-size: 14px;\n  height: 20px;\n  color: #333;\n  text-align: left;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content input[type=text].small {\n  width: 30px;\n  text-align: center;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content input[type=text].block {\n  display: block;\n  width: 100%;\n  margin: 10px 0;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content input[type=text]:focus {\n  border-bottom: 2px solid #1e88e5;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button {\n  font-size: 14px;\n  color: #1e88e5;\n  border: none;\n  padding: 5px 10px;\n  background-color: #fff;\n  cursor: pointer;\n  border-radius: 3px;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button.left {\n  float: left;\n  margin-right: 10px;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button.right {\n  float: right;\n  margin-left: 10px;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button.gray {\n  color: #999;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button.red {\n  color: #c24f4a;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container button:hover {\n  background-color: #f1f1f1;\n}\n.w-e-menu .w-e-panel-container .w-e-panel-tab-content .w-e-button-container:after {\n  content: "";\n  display: table;\n  clear: both;\n}\n.w-e-menu .w-e-panel-container .w-e-emoticon-container .w-e-item {\n  cursor: pointer;\n  font-size: 18px;\n  padding: 0 3px;\n  display: inline-block;\n}\n.w-e-menu .w-e-panel-container .w-e-up-img-container,\n.w-e-menu .w-e-panel-container .w-e-up-video-container {\n  text-align: center;\n}\n.w-e-menu .w-e-panel-container .w-e-up-img-container .w-e-up-btn,\n.w-e-menu .w-e-panel-container .w-e-up-video-container .w-e-up-btn {\n  display: inline-block;\n  color: #999;\n  cursor: pointer;\n  font-size: 60px;\n  line-height: 1;\n}\n.w-e-menu .w-e-panel-container .w-e-up-img-container .w-e-up-btn:hover,\n.w-e-menu .w-e-panel-container .w-e-up-video-container .w-e-up-btn:hover {\n  color: #333;\n}\n',
+            ""]), e.exports = t
+    }, function (e, t, n) {
+        var o = n(21),
+            i = n(158),
+            n = {
+                insert: "head",
+                singleton: !1
+            };
+        o(i = "string" == typeof (i = i.__esModule ? i.default : i) ? [[e.i, i, ""]] : i, n);
+        e.exports = i.locals || {}
+    }, function (e, t, n) {
+        (t = n(22)(!1)).push([e.i,
+            ".w-e-toolbar .w-e-droplist {\n  position: absolute;\n  left: 0;\n  top: 0;\n  background-color: #fff;\n  border: 1px solid #f1f1f1;\n  border-right-color: #ccc;\n  border-bottom-color: #ccc;\n}\n.w-e-toolbar .w-e-droplist .w-e-dp-title {\n  text-align: center;\n  color: #999;\n  line-height: 2;\n  border-bottom: 1px solid #f1f1f1;\n  font-size: 13px;\n}\n.w-e-toolbar .w-e-droplist ul.w-e-list {\n  list-style: none;\n  line-height: 1;\n}\n.w-e-toolbar .w-e-droplist ul.w-e-list li.w-e-item {\n  color: #333;\n  padding: 5px 0;\n}\n.w-e-toolbar .w-e-droplist ul.w-e-list li.w-e-item:hover {\n  background-color: #f1f1f1;\n}\n.w-e-toolbar .w-e-droplist ul.w-e-block {\n  list-style: none;\n  text-align: left;\n  padding: 5px;\n}\n.w-e-toolbar .w-e-droplist ul.w-e-block li.w-e-item {\n  display: inline-block;\n  padding: 3px 5px;\n}\n.w-e-toolbar .w-e-droplist ul.w-e-block li.w-e-item:hover {\n  background-color: #f1f1f1;\n}\n",
+            ""]), e.exports = t
+    }, function (e, t, n) {
+        "use strict";
+        n = n(0)(n(160));
+        Element.prototype.matches || (Element.prototype.matches = function (e) {
+            for (var t = this.ownerDocument.querySelectorAll(e), n = t.length; 0 <= n && t.item(n) !==
+            this; n--);
+            return -1 < n
+        }), n.default || (window.Promise = n.default)
+    }, function (e, t, n) {
+        e.exports = n(161)
+    }, function (e, t, n) {
+        n = n(162);
+        e.exports = n
+    }, function (e, t, n) {
+        n(163), n(69), n(168), n(174), n(175), n(176), n(51), n(52);
+        n = n(10);
+        e.exports = n.Promise
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(78),
+            r = n(102),
+            a = n(62),
+            l = n(17),
+            u = n(37),
+            s = n(40),
+            c = function (e, t) {
+                var n = this;
+                if (!(n instanceof c)) return new c(e, t);
+                r && (n = r(new Error(void 0), i(n))), void 0 !== t && l(n, "message", String(t));
+                t = [];
+                return s(e, t.push, {
+                    that: t
+                }), l(n, "errors", t), n
+            };
+        c.prototype = a(Error.prototype, {
+            constructor: u(5, c),
+            message: u(5, ""),
+            name: u(5, "AggregateError")
+        }), o({
+            global: !0
+        }, {
+            AggregateError: c
+        })
+    }, function (e, t, n) {
+        var o = n(8),
+            i = n(17);
+        e.exports = function (t, n) {
+            try {
+                i(o, t, n)
+            } catch (e) {
+                o[t] = n
+            }
+            return n
+        }
+    }, function (e, t, n) {
+        n = n(12);
+        e.exports = !n(function () {
+            function e() {}
+            return e.prototype.constructor = null, Object.getPrototypeOf(new e) !== e.prototype
+        })
+    }, function (e, t, n) {
+        var o = n(13);
+        e.exports = function (e) {
+            if (!o(e) && null !== e) throw TypeError("Can't set " + String(e) + " as a prototype");
+            return e
+        }
+    }, function (e, t, n) {
+        var o = n(15),
+            a = n(18),
+            l = n(20),
+            u = n(63);
+        e.exports = o ? Object.defineProperties : function (e, t) {
+            l(e);
+            for (var n, o = u(t), i = o.length, r = 0; r < i;) a.f(e, n = o[r++], t[n]);
+            return e
+        }
+    }, function (e, t, n) {
+        "use strict";
+
+        function h(e) {
+            var t;
+            return !(!x(e) || "function" != typeof (t = e.then)) && t
+        }
+
+        function i(f, d) {
+            var p;
+            f.notified || (f.notified = !0, p = f.reactions, N(function () {
+                for (var e = f.value, t = 1 == f.state, n = 0; p.length > n;) {
+                    var o, i, r, a = p[n++],
+                        l = t ? a.ok : a.fail,
+                        u = a.resolve,
+                        s = a.reject,
+                        c = a.domain;
+                    try {
+                        l ? (t || (2 === f.rejection && ne(f), f.rejection = 1), !0 === l ? o =
+                            e : (c && c.enter(), o = l(e), c && (c.exit(), r = !0)), o ===
+                        a.promise ? s($("Promise-chain cycle")) : (i = h(o)) ? i.call(o,
+                            u, s) : u(o)) : s(e)
+                    } catch (e) {
+                        c && !r && c.exit(), s(e)
+                    }
+                }
+                f.reactions = [], f.notified = !1, d && !f.rejection && ee(f)
+            }))
+        }
+
+        function r(e, t, n) {
+            var o, i;
+            q ? ((o = V.createEvent("Event")).promise = t, o.reason = n, o.initEvent(e, !1, !0), p.dispatchEvent(
+                o)) : o = {
+                promise: t,
+                reason: n
+            }, !X && (i = p["on" + e]) ? i(o) : e === Z && T("Unhandled promise rejection", n)
+        }
+
+        function a(t, n, o) {
+            return function (e) {
+                t(n, e, o)
+            }
+        }
+
+        function l(e, t, n) {
+            e.done || (e.done = !0, (e = n ? n : e).value = t, e.state = 2, i(e, !0))
+        }
+        var o, u, s, c, f = n(5),
+            d = n(39),
+            p = n(8),
+            A = n(28),
+            v = n(109),
+            m = n(50),
+            g = n(110),
+            y = n(42),
+            w = n(111),
+            x = n(13),
+            _ = n(32),
+            E = n(86),
+            b = n(112),
+            C = n(40),
+            S = n(113),
+            D = n(114),
+            M = n(115).set,
+            N = n(170),
+            k = n(117),
+            T = n(172),
+            B = n(70),
+            I = n(87),
+            R = n(43),
+            P = n(101),
+            H = n(9),
+            F = n(65),
+            L = n(66),
+            Q = H("species"),
+            O = "Promise",
+            U = R.get,
+            j = R.set,
+            Y = R.getterFor(O),
+            z = v,
+            $ = p.TypeError,
+            V = p.document,
+            G = p.process,
+            J = A("fetch"),
+            K = B.f,
+            W = K,
+            q = !!(V && V.createEvent && p.dispatchEvent),
+            X = "function" == typeof PromiseRejectionEvent,
+            Z = "unhandledrejection",
+            P = P(O, function () {
+                if (!(b(z) !== String(z))) {
+                    if (66 === L) return !0;
+                    if (!F && !X) return !0
+                }
+                if (d && !z.prototype.finally) return !0;
+                if (51 <= L && /native code/.test(z)) return !1;
+
+                function e(e) {
+                    e(function () {}, function () {})
+                }
+                var t = z.resolve(1);
+                return (t.constructor = {})[Q] = e, !(t.then(function () {}) instanceof e)
+            }),
+            S = P || !S(function (e) {
+                z.all(e).catch(function () {})
+            }),
+            ee = function (i) {
+                M.call(p, function () {
+                    var e, t = i.facade,
+                        n = i.value,
+                        o = te(i);
+                    if (o && (e = I(function () {
+                        F ? G.emit("unhandledRejection", n, t) : r(Z, t, n)
+                    }), i.rejection = F || te(i) ? 2 : 1, e.error)) throw e.value
+                })
+            },
+            te = function (e) {
+                return 1 !== e.rejection && !e.parent
+            },
+            ne = function (t) {
+                M.call(p, function () {
+                    var e = t.facade;
+                    F ? G.emit("rejectionHandled", e) : r("rejectionhandled", e, t.value)
+                })
+            },
+            oe = function (n, e, t) {
+                if (!n.done) {
+                    n.done = !0, t && (n = t);
+                    try {
+                        if (n.facade === e) throw $("Promise can't be resolved itself");
+                        var o = h(e);
+                        o ? N(function () {
+                            var t = {
+                                done: !1
+                            };
+                            try {
+                                o.call(e, a(oe, t, n), a(l, t, n))
+                            } catch (e) {
+                                l(t, e, n)
+                            }
+                        }) : (n.value = e, n.state = 1, i(n, !1))
+                    } catch (e) {
+                        l({
+                            done: !1
+                        }, e, n)
+                    }
+                }
+            };
+        P && (z = function (e) {
+            E(this, z, O), _(e), o.call(this);
+            var t = U(this);
+            try {
+                e(a(oe, t), a(l, t))
+            } catch (e) {
+                l(t, e)
+            }
+        }, (o = function (e) {
+            j(this, {
+                type: O,
+                done: !1,
+                notified: !1,
+                parent: !1,
+                reactions: [],
+                rejection: !1,
+                state: 0,
+                value: void 0
+            })
+        }).prototype = g(z.prototype, {
+            then: function (e, t) {
+                var n = Y(this),
+                    o = K(D(this, z));
+                return o.ok = "function" != typeof e || e, o.fail = "function" == typeof t &&
+                    t, o.domain = F ? G.domain : void 0, n.parent = !0, n.reactions.push(o),
+                0 != n.state && i(n, !1), o.promise
+            },
+            catch: function (e) {
+                return this.then(void 0, e)
+            }
+        }), u = function () {
+            var e = new o,
+                t = U(e);
+            this.promise = e, this.resolve = a(oe, t), this.reject = a(l, t)
+        }, B.f = K = function (e) {
+            return e === z || e === s ? new u : W(e)
+        }, d || "function" != typeof v || (c = v.prototype.then, m(v.prototype, "then", function (e,
+                                                                                                  t) {
+            var n = this;
+            return new z(function (e, t) {
+                c.call(n, e, t)
+            }).then(e, t)
+        }, {
+            unsafe: !0
+        }), "function" == typeof J && f({
+            global: !0,
+            enumerable: !0,
+            forced: !0
+        }, {
+            fetch: function (e) {
+                return k(z, J.apply(p, arguments))
+            }
+        }))), f({
+            global: !0,
+            wrap: !0,
+            forced: P
+        }, {
+            Promise: z
+        }), y(z, O, !1, !0), w(O), s = A(O), f({
+            target: O,
+            stat: !0,
+            forced: P
+        }, {
+            reject: function (e) {
+                var t = K(this);
+                return t.reject.call(void 0, e), t.promise
+            }
+        }), f({
+            target: O,
+            stat: !0,
+            forced: d || P
+        }, {
+            resolve: function (e) {
+                return k(d && this === s ? z : this, e)
+            }
+        }), f({
+            target: O,
+            stat: !0,
+            forced: S
+        }, {
+            all: function (e) {
+                var l = this,
+                    t = K(l),
+                    u = t.resolve,
+                    s = t.reject,
+                    n = I(function () {
+                        var o = _(l.resolve),
+                            i = [],
+                            r = 0,
+                            a = 1;
+                        C(e, function (e) {
+                            var t = r++,
+                                n = !1;
+                            i.push(void 0), a++, o.call(l, e).then(function (e) {
+                                n || (n = !0, i[t] = e, --a || u(i))
+                            }, s)
+                        }), --a || u(i)
+                    });
+                return n.error && s(n.value), t.promise
+            },
+            race: function (e) {
+                var n = this,
+                    o = K(n),
+                    i = o.reject,
+                    t = I(function () {
+                        var t = _(n.resolve);
+                        C(e, function (e) {
+                            t.call(n, e).then(o.resolve, i)
+                        })
+                    });
+                return t.error && i(t.value), o.promise
+            }
+        })
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(85),
+            i = n(68);
+        e.exports = o ? {}.toString : function () {
+            return "[object " + i(this) + "]"
+        }
+    }, function (e, t, n) {
+        var o, i, r, a, l, u, s, c, f = n(8),
+            d = n(75).f,
+            p = n(115).set,
+            h = n(116),
+            A = n(171),
+            v = n(65),
+            m = f.MutationObserver || f.WebKitMutationObserver,
+            g = f.document,
+            y = f.process,
+            n = f.Promise,
+            d = d(f, "queueMicrotask"),
+            d = d && d.value;
+        d || (o = function () {
+            var e, t;
+            for (v && (e = y.domain) && e.exit(); i;) {
+                t = i.fn, i = i.next;
+                try {
+                    t()
+                } catch (e) {
+                    throw i ? a() : r = void 0, e
+                }
+            }
+            r = void 0, e && e.enter()
+        }, a = h || v || A || !m || !g ? n && n.resolve ? (s = n.resolve(void 0), c = s.then,
+            function () {
+                c.call(s, o)
+            }) : v ? function () {
+            y.nextTick(o)
+        } : function () {
+            p.call(f, o)
+        } : (l = !0, u = g.createTextNode(""), new m(o).observe(u, {
+            characterData: !0
+        }), function () {
+            u.data = l = !l
+        })), e.exports = d || function (e) {
+            e = {
+                fn: e,
+                next: void 0
+            };
+            r && (r.next = e), i || (i = e, a()), r = e
+        }
+    }, function (e, t, n) {
+        n = n(67);
+        e.exports = /web0s(?!.*chrome)/i.test(n)
+    }, function (e, t, n) {
+        var o = n(8);
+        e.exports = function (e, t) {
+            var n = o.console;
+            n && n.error && (1 === arguments.length ? n.error(e) : n.error(e, t))
+        }
+    }, function (e, t, n) {
+        var o = n(8),
+            n = n(112),
+            o = o.WeakMap;
+        e.exports = "function" == typeof o && /native code/.test(n(o))
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            s = n(32),
+            i = n(70),
+            r = n(87),
+            c = n(40);
+        o({
+            target: "Promise",
+            stat: !0
+        }, {
+            allSettled: function (e) {
+                var l = this,
+                    t = i.f(l),
+                    u = t.resolve,
+                    n = t.reject,
+                    o = r(function () {
+                        var o = s(l.resolve),
+                            i = [],
+                            r = 0,
+                            a = 1;
+                        c(e, function (e) {
+                            var t = r++,
+                                n = !1;
+                            i.push(void 0), a++, o.call(l, e).then(function (e) {
+                                n || (n = !0, i[t] = {
+                                    status: "fulfilled",
+                                    value: e
+                                }, --a || u(i))
+                            }, function (e) {
+                                n || (n = !0, i[t] = {
+                                    status: "rejected",
+                                    reason: e
+                                }, --a || u(i))
+                            })
+                        }), --a || u(i)
+                    });
+                return o.error && n(o.value), t.promise
+            }
+        })
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            f = n(32),
+            d = n(28),
+            i = n(70),
+            r = n(87),
+            p = n(40),
+            h = "No one promise resolved";
+        o({
+            target: "Promise",
+            stat: !0
+        }, {
+            any: function (e) {
+                var u = this,
+                    t = i.f(u),
+                    s = t.resolve,
+                    c = t.reject,
+                    n = r(function () {
+                        var o = f(u.resolve),
+                            i = [],
+                            r = 0,
+                            a = 1,
+                            l = !1;
+                        p(e, function (e) {
+                            var t = r++,
+                                n = !1;
+                            i.push(void 0), a++, o.call(u, e).then(function (e) {
+                                n || l || (l = !0, s(e))
+                            }, function (e) {
+                                n || l || (n = !0, i[t] = e, --a || c(new(d(
+                                    "AggregateError"))(i, h)))
+                            })
+                        }), --a || c(new(d("AggregateError"))(i, h))
+                    });
+                return n.error && c(n.value), t.promise
+            }
+        })
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(39),
+            r = n(109),
+            a = n(12),
+            l = n(28),
+            u = n(114),
+            s = n(117),
+            n = n(50);
+        o({
+            target: "Promise",
+            proto: !0,
+            real: !0,
+            forced: !!r && a(function () {
+                r.prototype.finally.call({
+                    then: function () {}
+                }, function () {})
+            })
+        }, {
+            finally: function (t) {
+                var n = u(this, l("Promise")),
+                    e = "function" == typeof t;
+                return this.then(e ? function (e) {
+                    return s(n, t()).then(function () {
+                        return e
+                    })
+                } : t, e ? function (e) {
+                    return s(n, t()).then(function () {
+                        throw e
+                    })
+                } : t)
+            }
+        }), i || "function" != typeof r || r.prototype.finally || n(r.prototype, "finally", l("Promise")
+            .prototype.finally)
+    }, function (e, t, n) {
+        var a = n(64),
+            l = n(48),
+            n = function (r) {
+                return function (e, t) {
+                    var n, o = String(l(e)),
+                        i = a(t),
+                        e = o.length;
+                    return i < 0 || e <= i ? r ? "" : void 0 : (t = o.charCodeAt(i)) < 55296 || 56319 <
+                    t || i + 1 === e || (n = o.charCodeAt(i + 1)) < 56320 || 57343 < n ? r ? o.charAt(
+                        i) : t : r ? o.slice(i, i + 2) : n - 56320 + (t - 55296 << 10) + 65536
+                }
+            };
+        e.exports = {
+            codeAt: n(!1),
+            charAt: n(!0)
+        }
+    }, function (e, t, n) {
+        "use strict";
+
+        function o() {
+            return this
+        }
+        var i = n(118).IteratorPrototype,
+            r = n(62),
+            a = n(37),
+            l = n(42),
+            u = n(41);
+        e.exports = function (e, t, n) {
+            t += " Iterator";
+            return e.prototype = r(i, {
+                next: a(1, n)
+            }), l(e, t, !1, !0), u[t] = o, e
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(27),
+            i = n(89),
+            r = n(41),
+            a = n(43),
+            n = n(88),
+            l = "Array Iterator",
+            u = a.set,
+            s = a.getterFor(l);
+        e.exports = n(Array, "Array", function (e, t) {
+            u(this, {
+                type: l,
+                target: o(e),
+                index: 0,
+                kind: t
+            })
+        }, function () {
+            var e = s(this),
+                t = e.target,
+                n = e.kind,
+                o = e.index++;
+            return !t || o >= t.length ? {
+                value: e.target = void 0,
+                done: !0
+            } : "keys" == n ? {
+                value: o,
+                done: !1
+            } : "values" == n ? {
+                value: t[o],
+                done: !1
+            } : {
+                value: [o, t[o]],
+                done: !1
+            }
+        }, "values"), r.Arguments = r.Array, i("keys"), i("values"), i("entries")
+    }, function (e, t) {
+        e.exports = {
+            CSSRuleList: 0,
+            CSSStyleDeclaration: 0,
+            CSSValueList: 0,
+            ClientRectList: 0,
+            DOMRectList: 0,
+            DOMStringList: 0,
+            DOMTokenList: 1,
+            DataTransferItemList: 0,
+            FileList: 0,
+            HTMLAllCollection: 0,
+            HTMLCollection: 0,
+            HTMLFormElement: 0,
+            HTMLSelectElement: 0,
+            MediaList: 0,
+            MimeTypeArray: 0,
+            NamedNodeMap: 0,
+            NodeList: 1,
+            PaintRequestList: 0,
+            Plugin: 0,
+            PluginArray: 0,
+            SVGLengthList: 0,
+            SVGNumberList: 0,
+            SVGPathSegList: 0,
+            SVGPointList: 0,
+            SVGStringList: 0,
+            SVGTransformList: 0,
+            SourceBufferList: 0,
+            StyleSheetList: 0,
+            TextTrackCueList: 0,
+            TextTrackList: 0,
+            TouchList: 0
+        }
+    }, function (e, t, n) {
+        n(52);
+        var o = n(182),
+            i = n(68),
+            r = Array.prototype,
+            a = {
+                DOMTokenList: !0,
+                NodeList: !0
+            };
+        e.exports = function (e) {
+            var t = e.forEach;
+            return e === r || e instanceof Array && t === r.forEach || a.hasOwnProperty(i(e)) ? o : t
+        }
+    }, function (e, t, n) {
+        n = n(183);
+        e.exports = n
+    }, function (e, t, n) {
+        n(184);
+        n = n(14);
+        e.exports = n("Array").forEach
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            n = n(185);
+        o({
+            target: "Array",
+            proto: !0,
+            forced: [].forEach != n
+        }, {
+            forEach: n
+        })
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(29).forEach,
+            n = n(71)("forEach");
+        e.exports = n ? [].forEach : function (e) {
+            return o(this, e, 1 < arguments.length ? arguments[1] : void 0)
+        }
+    }, function (e, t, n) {
+        n = n(187);
+        e.exports = n
+    }, function (e, t, n) {
+        n(188);
+        n = n(10);
+        e.exports = n.Array.isArray
+    }, function (e, t, n) {
+        n(5)({
+            target: "Array",
+            stat: !0
+        }, {
+            isArray: n(53)
+        })
+    }, function (e, t, n) {
+        n = n(190);
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(191),
+            i = Array.prototype;
+        e.exports = function (e) {
+            var t = e.map;
+            return e === i || e instanceof Array && t === i.map ? o : t
+        }
+    }, function (e, t, n) {
+        n(192);
+        n = n(14);
+        e.exports = n("Array").map
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(29).map;
+        o({
+            target: "Array",
+            proto: !0,
+            forced: !n(54)("map")
+        }, {
+            map: function (e) {
+                return i(this, e, 1 < arguments.length ? arguments[1] : void 0)
+            }
+        })
+    }, function (e, t, n) {
+        n = n(194);
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(195),
+            i = String.prototype;
+        e.exports = function (e) {
+            var t = e.trim;
+            return "string" == typeof e || e === i || e instanceof String && t === i.trim ? o : t
+        }
+    }, function (e, t, n) {
+        n(196);
+        n = n(14);
+        e.exports = n("String").trim
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(92).trim;
+        o({
+            target: "String",
+            proto: !0,
+            forced: n(197)("trim")
+        }, {
+            trim: function () {
+                return i(this)
+            }
+        })
+    }, function (e, t, n) {
+        var o = n(12),
+            i = n(72);
+        e.exports = function (e) {
+            return o(function () {
+                return !!i[e]() || "​…᠎" != "​…᠎" [e]() || i[e].name !== e
+            })
+        }
+    }, function (e, t, n) {
+        n = n(199);
+        e.exports = n
+    }, function (e, t, n) {
+        n(200), n(69), n(51), n(52);
+        n = n(10);
+        e.exports = n.Map
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(121),
+            n = n(123);
+        e.exports = o("Map", function (e) {
+            return function () {
+                return e(this, arguments.length ? arguments[0] : void 0)
+            }
+        }, n)
+    }, function (e, t, n) {
+        n = n(12);
+        e.exports = !n(function () {
+            return Object.isExtensible(Object.preventExtensions({}))
+        })
+    }, function (e, t, n) {
+        n = n(203);
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(204),
+            i = Array.prototype;
+        e.exports = function (e) {
+            var t = e.indexOf;
+            return e === i || e instanceof Array && t === i.indexOf ? o : t
+        }
+    }, function (e, t, n) {
+        n(205);
+        n = n(14);
+        e.exports = n("Array").indexOf
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(81).indexOf,
+            n = n(71),
+            r = [].indexOf,
+            a = !!r && 1 / [1].indexOf(1, -0) < 0,
+            n = n("indexOf");
+        o({
+            target: "Array",
+            proto: !0,
+            forced: a || !n
+        }, {
+            indexOf: function (e) {
+                return a ? r.apply(this, arguments) || 0 : i(this, e, 1 < arguments.length ?
+                    arguments[1] : void 0)
+            }
+        })
+    }, function (e, t, n) {
+        n = n(207);
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(208),
+            i = Array.prototype;
+        e.exports = function (e) {
+            var t = e.splice;
+            return e === i || e instanceof Array && t === i.splice ? o : t
+        }
+    }, function (e, t, n) {
+        n(209);
+        n = n(14);
+        e.exports = n("Array").splice
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            f = n(82),
+            d = n(64),
+            p = n(34),
+            h = n(33),
+            A = n(90),
+            v = n(73),
+            n = n(54)("splice"),
+            m = Math.max,
+            g = Math.min;
+        o({
+            target: "Array",
+            proto: !0,
+            forced: !n
+        }, {
+            splice: function (e, t) {
+                var n, o, i, r, a, l, u = h(this),
+                    s = p(u.length),
+                    c = f(e, s),
+                    e = arguments.length;
+                if (0 === e ? n = o = 0 : o = 1 === e ? (n = 0, s - c) : (n = e - 2, g(m(d(t),
+                    0), s - c)), 9007199254740991 < s + n - o) throw TypeError(
+                    "Maximum allowed length exceeded");
+                for (i = A(u, o), r = 0; r < o; r++)(a = c + r) in u && v(i, r, u[a]);
+                if (n < (i.length = o)) {
+                    for (r = c; r < s - o; r++) l = r + n, (a = r + o) in u ? u[l] = u[a] :
+                        delete u[l];
+                    for (r = s; s - o + n < r; r--) delete u[r - 1]
+                } else if (o < n)
+                    for (r = s - o; c < r; r--) l = r + n - 1, (a = r + o - 1) in u ? u[l] = u[
+                        a] : delete u[l];
+                for (r = 0; r < n; r++) u[r + c] = arguments[r + 2];
+                return u.length = s - o + n, i
+            }
+        })
+    }, function (e, t, n) {
+        n = n(211);
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(212),
+            i = Array.prototype;
+        e.exports = function (e) {
+            var t = e.filter;
+            return e === i || e instanceof Array && t === i.filter ? o : t
+        }
+    }, function (e, t, n) {
+        n(213);
+        n = n(14);
+        e.exports = n("Array").filter
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(29).filter;
+        o({
+            target: "Array",
+            proto: !0,
+            forced: !n(54)("filter")
+        }, {
+            filter: function (e) {
+                return i(this, e, 1 < arguments.length ? arguments[1] : void 0)
+            }
+        })
+    }, function (e, t, n) {
+        n = n(215);
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(216),
+            i = n(218),
+            r = Array.prototype,
+            a = String.prototype;
+        e.exports = function (e) {
+            var t = e.includes;
+            return e === r || e instanceof Array && t === r.includes ? o : "string" == typeof e || e ===
+            a || e instanceof String && t === a.includes ? i : t
+        }
+    }, function (e, t, n) {
+        n(217);
+        n = n(14);
+        e.exports = n("Array").includes
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(81).includes,
+            n = n(89);
+        o({
+            target: "Array",
+            proto: !0
+        }, {
+            includes: function (e) {
+                return i(this, e, 1 < arguments.length ? arguments[1] : void 0)
+            }
+        }), n("includes")
+    }, function (e, t, n) {
+        n(219);
+        n = n(14);
+        e.exports = n("String").includes
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(220),
+            r = n(48);
+        o({
+            target: "String",
+            proto: !0,
+            forced: !n(222)("includes")
+        }, {
+            includes: function (e) {
+                return !!~String(r(this)).indexOf(i(e), 1 < arguments.length ? arguments[1] :
+                    void 0)
+            }
+        })
+    }, function (e, t, n) {
+        var o = n(221);
+        e.exports = function (e) {
+            if (o(e)) throw TypeError("The method doesn't accept regular expressions");
+            return e
+        }
+    }, function (e, t, n) {
+        var o = n(13),
+            i = n(47),
+            r = n(9)("match");
+        e.exports = function (e) {
+            var t;
+            return o(e) && (void 0 !== (t = e[r]) ? !!t : "RegExp" == i(e))
+        }
+    }, function (e, t, n) {
+        var o = n(9)("match");
+        e.exports = function (t) {
+            var n = /./;
+            try {
+                "/./" [t](n)
+            } catch (e) {
+                try {
+                    return n[o] = !1, "/./" [t](n)
+                } catch (e) {}
+            }
+            return !1
+        }
+    }, function (e, t, n) {
+        n = n(224);
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(225),
+            i = Function.prototype;
+        e.exports = function (e) {
+            var t = e.bind;
+            return e === i || e instanceof Function && t === i.bind ? o : t
+        }
+    }, function (e, t, n) {
+        n(226);
+        n = n(14);
+        e.exports = n("Function").bind
+    }, function (e, t, n) {
+        n(5)({
+            target: "Function",
+            proto: !0
+        }, {
+            bind: n(227)
+        })
+    }, function (e, t, n) {
+        "use strict";
+        var r = n(32),
+            a = n(13),
+            l = [].slice,
+            u = {};
+        e.exports = Function.bind || function (t) {
+            var n = r(this),
+                o = l.call(arguments, 1),
+                i = function () {
+                    var e = o.concat(l.call(arguments));
+                    return this instanceof i ? function (e, t, n) {
+                        if (!(t in u)) {
+                            for (var o = [], i = 0; i < t; i++) o[i] = "a[" + i + "]";
+                            u[t] = Function("C,a", "return new C(" + o.join(",") + ")")
+                        }
+                        return u[t](e, n)
+                    }(n, e.length, e) : n.apply(t, e)
+                };
+            return a(n.prototype) && (i.prototype = n.prototype), i
+        }
+    }, function (e, t, n) {
+        e.exports = n(229)
+    }, function (e, t, n) {
+        var o = n(230);
+        n(250), n(251), n(252), n(253), n(254), e.exports = o
+    }, function (e, t, n) {
+        n(231), n(69), n(232), n(234), n(235), n(236), n(237), n(126), n(238), n(239), n(240), n(241), n(
+            242), n(243), n(244), n(245), n(246), n(247), n(248), n(249);
+        n = n(10);
+        e.exports = n.Symbol
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(12),
+            s = n(53),
+            c = n(13),
+            f = n(33),
+            d = n(34),
+            p = n(73),
+            h = n(90),
+            r = n(54),
+            a = n(9),
+            n = n(66),
+            A = a("isConcatSpreadable"),
+            v = 9007199254740991,
+            m = "Maximum allowed index exceeded",
+            i = 51 <= n || !i(function () {
+                var e = [];
+                return e[A] = !1, e.concat()[0] !== e
+            }),
+            r = r("concat");
+        o({
+            target: "Array",
+            proto: !0,
+            forced: !i || !r
+        }, {
+            concat: function (e) {
+                for (var t, n, o, i = f(this), r = h(i, 0), a = 0, l = -1, u = arguments.length; l <
+                u; l++)
+                    if (function (e) {
+                        if (!c(e)) return !1;
+                        var t = e[A];
+                        return void 0 !== t ? !!t : s(e)
+                    }(o = -1 === l ? i : arguments[l])) {
+                        if (n = d(o.length), v < a + n) throw TypeError(m);
+                        for (t = 0; t < n; t++, a++) t in o && p(r, a, o[t])
+                    } else {
+                        if (v <= a) throw TypeError(m);
+                        p(r, a++, o)
+                    } return r.length = a, r
+            }
+        })
+    }, function (e, t, n) {
+        "use strict";
+
+        function o(e, t) {
+            var n = Z[e] = x(G[Y]);
+            return z(n, {
+                type: j,
+                tag: e,
+                description: t
+            }), s || (n.description = t), n
+        }
+
+        function i(t, e) {
+            v(t);
+            var n = g(e),
+                e = _(n).concat(ue(n));
+            return O(e, function (e) {
+                s && !le.call(n, e) || ae(t, e, n[e])
+            }), t
+        }
+        var r = n(5),
+            a = n(8),
+            l = n(28),
+            u = n(39),
+            s = n(15),
+            c = n(84),
+            f = n(106),
+            d = n(12),
+            p = n(16),
+            h = n(53),
+            A = n(13),
+            v = n(20),
+            m = n(33),
+            g = n(27),
+            y = n(59),
+            w = n(37),
+            x = n(62),
+            _ = n(63),
+            E = n(124),
+            b = n(233),
+            C = n(125),
+            S = n(75),
+            D = n(18),
+            M = n(58),
+            N = n(17),
+            k = n(50),
+            T = n(79),
+            B = n(60),
+            I = n(49),
+            R = n(61),
+            P = n(9),
+            H = n(95),
+            F = n(11),
+            L = n(42),
+            Q = n(43),
+            O = n(29).forEach,
+            U = B("hidden"),
+            j = "Symbol",
+            Y = "prototype",
+            B = P("toPrimitive"),
+            z = Q.set,
+            $ = Q.getterFor(j),
+            V = Object[Y],
+            G = a.Symbol,
+            J = l("JSON", "stringify"),
+            K = S.f,
+            W = D.f,
+            q = b.f,
+            X = M.f,
+            Z = T("symbols"),
+            ee = T("op-symbols"),
+            te = T("string-to-symbol-registry"),
+            ne = T("symbol-to-string-registry"),
+            T = T("wks"),
+            a = a.QObject,
+            oe = !a || !a[Y] || !a[Y].findChild,
+            ie = s && d(function () {
+                return 7 != x(W({}, "a", {
+                    get: function () {
+                        return W(this, "a", {
+                            value: 7
+                        }).a
+                    }
+                })).a
+            }) ? function (e, t, n) {
+                var o = K(V, t);
+                o && delete V[t], W(e, t, n), o && e !== V && W(V, t, o)
+            } : W,
+            re = f ? function (e) {
+                return "symbol" == typeof e
+            } : function (e) {
+                return Object(e) instanceof G
+            },
+            ae = function (e, t, n) {
+                e === V && ae(ee, t, n), v(e);
+                t = y(t, !0);
+                return v(n), p(Z, t) ? (n.enumerable ? (p(e, U) && e[U][t] && (e[U][t] = !1), n = x(n, {
+                    enumerable: w(0, !1)
+                })) : (p(e, U) || W(e, U, w(1, {})), e[U][t] = !0), ie(e, t, n)) : W(e, t, n)
+            },
+            le = function (e) {
+                var t = y(e, !0),
+                    e = X.call(this, t);
+                return !(this === V && p(Z, t) && !p(ee, t)) && (!(e || !p(this, t) || !p(Z, t) || p(this,
+                    U) && this[U][t]) || e)
+            },
+            a = function (e, t) {
+                var n = g(e),
+                    e = y(t, !0);
+                if (n !== V || !p(Z, e) || p(ee, e)) {
+                    t = K(n, e);
+                    return !t || !p(Z, e) || p(n, U) && n[U][e] || (t.enumerable = !0), t
+                }
+            },
+            f = function (e) {
+                var e = q(g(e)),
+                    t = [];
+                return O(e, function (e) {
+                    p(Z, e) || p(I, e) || t.push(e)
+                }), t
+            },
+            ue = function (e) {
+                var t = e === V,
+                    e = q(t ? ee : g(e)),
+                    n = [];
+                return O(e, function (e) {
+                    !p(Z, e) || t && !p(V, e) || n.push(Z[e])
+                }), n
+            };
+        c || (k((G = function () {
+            if (this instanceof G) throw TypeError("Symbol is not a constructor");
+            var e = arguments.length && void 0 !== arguments[0] ? String(arguments[0]) :
+                void 0,
+                t = R(e),
+                n = function (e) {
+                    this === V && n.call(ee, e), p(this, U) && p(this[U], t) && (this[U][t] = !
+                        1), ie(this, t, w(1, e))
+                };
+            return s && oe && ie(V, t, {
+                configurable: !0,
+                set: n
+            }), o(t, e)
+        })[Y], "toString", function () {
+            return $(this).tag
+        }), k(G, "withoutSetter", function (e) {
+            return o(R(e), e)
+        }), M.f = le, D.f = ae, S.f = a, E.f = b.f = f, C.f = ue, H.f = function (e) {
+            return o(P(e), e)
+        }, s && (W(G[Y], "description", {
+            configurable: !0,
+            get: function () {
+                return $(this).description
+            }
+        }), u || k(V, "propertyIsEnumerable", le, {
+            unsafe: !0
+        }))), r({
+            global: !0,
+            wrap: !0,
+            forced: !c,
+            sham: !c
+        }, {
+            Symbol: G
+        }), O(_(T), function (e) {
+            F(e)
+        }), r({
+            target: j,
+            stat: !0,
+            forced: !c
+        }, {
+            for: function (e) {
+                var t = String(e);
+                if (p(te, t)) return te[t];
+                e = G(t);
+                return te[t] = e, ne[e] = t, e
+            },
+            keyFor: function (e) {
+                if (!re(e)) throw TypeError(e + " is not a symbol");
+                if (p(ne, e)) return ne[e]
+            },
+            useSetter: function () {
+                oe = !0
+            },
+            useSimple: function () {
+                oe = !1
+            }
+        }), r({
+            target: "Object",
+            stat: !0,
+            forced: !c,
+            sham: !s
+        }, {
+            create: function (e, t) {
+                return void 0 === t ? x(e) : i(x(e), t)
+            },
+            defineProperty: ae,
+            defineProperties: i,
+            getOwnPropertyDescriptor: a
+        }), r({
+            target: "Object",
+            stat: !0,
+            forced: !c
+        }, {
+            getOwnPropertyNames: f,
+            getOwnPropertySymbols: ue
+        }), r({
+            target: "Object",
+            stat: !0,
+            forced: d(function () {
+                C.f(1)
+            })
+        }, {
+            getOwnPropertySymbols: function (e) {
+                return C.f(m(e))
+            }
+        }), J && r({
+            target: "JSON",
+            stat: !0,
+            forced: !c || d(function () {
+                var e = G();
+                return "[null]" != J([e]) || "{}" != J({
+                    a: e
+                }) || "{}" != J(Object(e))
+            })
+        }, {
+            stringify: function (e, t, n) {
+                for (var o, i = [e], r = 1; r < arguments.length;) i.push(arguments[r++]);
+                if ((A(o = t) || void 0 !== e) && !re(e)) return h(t) || (t = function (e, t) {
+                    if ("function" == typeof o && (t = o.call(this, e, t)), !re(t))
+                        return t
+                }), i[1] = t, J.apply(null, i)
+            }
+        }), G[Y][B] || N(G[Y], B, G[Y].valueOf), L(G, j), I[U] = !0
+    }, function (e, t, n) {
+        var o = n(27),
+            i = n(124).f,
+            r = {}.toString,
+            a = "object" == typeof window && window && Object.getOwnPropertyNames ? Object.getOwnPropertyNames(
+                window) : [];
+        e.exports.f = function (e) {
+            return a && "[object Window]" == r.call(e) ? function (e) {
+                try {
+                    return i(e)
+                } catch (e) {
+                    return a.slice()
+                }
+            }(e) : i(o(e))
+        }
+    }, function (e, t, n) {
+        n(11)("asyncIterator")
+    }, function (e, t) {}, function (e, t, n) {
+        n(11)("hasInstance")
+    }, function (e, t, n) {
+        n(11)("isConcatSpreadable")
+    }, function (e, t, n) {
+        n(11)("match")
+    }, function (e, t, n) {
+        n(11)("matchAll")
+    }, function (e, t, n) {
+        n(11)("replace")
+    }, function (e, t, n) {
+        n(11)("search")
+    }, function (e, t, n) {
+        n(11)("species")
+    }, function (e, t, n) {
+        n(11)("split")
+    }, function (e, t, n) {
+        n(11)("toPrimitive")
+    }, function (e, t, n) {
+        n(11)("toStringTag")
+    }, function (e, t, n) {
+        n(11)("unscopables")
+    }, function (e, t, n) {
+        var o = n(8);
+        n(42)(o.JSON, "JSON", !0)
+    }, function (e, t) {}, function (e, t) {}, function (e, t, n) {
+        n(11)("asyncDispose")
+    }, function (e, t, n) {
+        n(11)("dispose")
+    }, function (e, t, n) {
+        n(11)("observable")
+    }, function (e, t, n) {
+        n(11)("patternMatch")
+    }, function (e, t, n) {
+        n(11)("replaceAll")
+    }, function (e, t, n) {
+        e.exports = n(256)
+    }, function (e, t, n) {
+        n = n(257);
+        e.exports = n
+    }, function (e, t, n) {
+        n(126), n(51), n(52);
+        n = n(95);
+        e.exports = n.f("iterator")
+    }, function (e, t, n) {
+        e.exports = n(259)
+    }, function (e, t, n) {
+        n = n(260);
+        e.exports = n
+    }, function (e, t, n) {
+        n(261);
+        n = n(10);
+        e.exports = n.parseInt
+    }, function (e, t, n) {
+        var o = n(5),
+            n = n(262);
+        o({
+            global: !0,
+            forced: parseInt != n
+        }, {
+            parseInt: n
+        })
+    }, function (e, t, n) {
+        var o = n(8),
+            i = n(92).trim,
+            n = n(72),
+            r = o.parseInt,
+            a = /^[+-]?0[Xx]/,
+            n = 8 !== r(n + "08") || 22 !== r(n + "0x16");
+        e.exports = n ? function (e, t) {
+            e = i(String(e));
+            return r(e, t >>> 0 || (a.test(e) ? 16 : 10))
+        } : r
+    }, function (e, t, n) {
+        n = n(264);
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(265),
+            i = Array.prototype;
+        e.exports = function (e) {
+            var t = e.slice;
+            return e === i || e instanceof Array && t === i.slice ? o : t
+        }
+    }, function (e, t, n) {
+        n(266);
+        n = n(14);
+        e.exports = n("Array").slice
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            s = n(13),
+            c = n(53),
+            f = n(82),
+            d = n(34),
+            p = n(27),
+            h = n(73),
+            i = n(9),
+            n = n(54)("slice"),
+            A = i("species"),
+            v = [].slice,
+            m = Math.max;
+        o({
+            target: "Array",
+            proto: !0,
+            forced: !n
+        }, {
+            slice: function (e, t) {
+                var n, o, i, r = p(this),
+                    a = d(r.length),
+                    l = f(e, a),
+                    u = f(void 0 === t ? a : t, a);
+                if (c(r) && ((n = "function" == typeof (n = r.constructor) && (n === Array || c(
+                    n.prototype)) || s(n) && null === (n = n[A]) ? void 0 : n) ===
+                    Array || void 0 === n)) return v.call(r, l, u);
+                for (o = new(void 0 === n ? Array : n)(m(u - l, 0)), i = 0; l < u; l++, i++) l in
+                r && h(o, i, r[l]);
+                return o.length = i, o
+            }
+        })
+    }, function (e, t, n) {
+        n(268);
+        n = n(10);
+        e.exports = n.setTimeout
+    }, function (e, t, n) {
+        var o = n(5),
+            i = n(8),
+            r = n(67),
+            a = [].slice,
+            n = function (i) {
+                return function (e, t) {
+                    var n = 2 < arguments.length,
+                        o = n ? a.call(arguments, 2) : void 0;
+                    return i(n ? function () {
+                        ("function" == typeof e ? e : Function(e)).apply(this, o)
+                    } : e, t)
+                }
+            };
+        o({
+            global: !0,
+            bind: !0,
+            forced: /MSIE .\./.test(r)
+        }, {
+            setTimeout: n(i.setTimeout),
+            setInterval: n(i.setInterval)
+        })
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(270));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a = n(2),
+            l = a.__importDefault(n(275)),
+            u = a.__importDefault(n(276)),
+            s = a.__importDefault(n(127)),
+            c = a.__importDefault(n(277)),
+            f = a.__importDefault(n(278)),
+            d = a.__importDefault(n(279)),
+            p = a.__importDefault(n(280)),
+            o = a.__importDefault(n(281)),
+            i = a.__importDefault(n(282)),
+            n = a.__importDefault(n(283)),
+            n = (0, r.default)({}, l.default, u.default, s.default, f.default, c.default, d.default, p.default,
+                o.default, i.default, n.default, {
+                    linkCheck: function (e, t) {
+                        return !0
+                    }
+                });
+        t.default = n
+    }, function (e, t, n) {
+        e.exports = n(271)
+    }, function (e, t, n) {
+        n = n(272);
+        e.exports = n
+    }, function (e, t, n) {
+        n(273);
+        n = n(10);
+        e.exports = n.Object.assign
+    }, function (e, t, n) {
+        var o = n(5),
+            n = n(274);
+        o({
+            target: "Object",
+            stat: !0,
+            forced: Object.assign !== n
+        }, {
+            assign: n
+        })
+    }, function (e, t, n) {
+        "use strict";
+        var d = n(15),
+            o = n(12),
+            p = n(63),
+            h = n(125),
+            A = n(58),
+            v = n(33),
+            m = n(76),
+            i = Object.assign,
+            r = Object.defineProperty;
+        e.exports = !i || o(function () {
+            if (d && 1 !== i({
+                b: 1
+            }, i(r({}, "a", {
+                enumerable: !0,
+                get: function () {
+                    r(this, "b", {
+                        value: 3,
+                        enumerable: !1
+                    })
+                }
+            }), {
+                b: 2
+            })).b) return !0;
+            var e = {},
+                t = {},
+                n = Symbol(),
+                o = "abcdefghijklmnopqrst";
+            return e[n] = 7, o.split("").forEach(function (e) {
+                t[e] = e
+            }), 7 != i({}, e)[n] || p(i({}, t)).join("") != o
+        }) ? function (e, t) {
+            for (var n = v(e), o = arguments.length, i = 1, r = h.f, a = A.f; i < o;)
+                for (var l, u = m(arguments[i++]), s = r ? p(u).concat(r(u)) : p(u), c = s.length, f =
+                    0; f < c;) l = s[f++], d && !a.call(u, l) || (n[l] = u[l]);
+            return n
+        } : i
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = {
+            menus: ["head", "bold", "fontSize", "fontName", "italic", "underline", "strikeThrough",
+                "indent", "lineHeight", "foreColor", "backColor", "link", "list", "todo", "justify",
+                "quote", "emoticon", "image", "video", "table", "code", "splitLine", "undo", "redo"
+            ],
+            fontNames: ["黑体", "仿宋", "楷体", "标楷体", "华文仿宋", "华文楷体", "宋体", "微软雅黑", "Arial", "Tahoma",
+                "Verdana", "Times New Roman", "Courier New"],
+            fontSizes: {
+                "x-small": {
+                    name: "10px",
+                    value: "1"
+                },
+                small: {
+                    name: "13px",
+                    value: "2"
+                },
+                normal: {
+                    name: "16px",
+                    value: "3"
+                },
+                large: {
+                    name: "18px",
+                    value: "4"
+                },
+                "x-large": {
+                    name: "24px",
+                    value: "5"
+                },
+                "xx-large": {
+                    name: "32px",
+                    value: "6"
+                },
+                "xxx-large": {
+                    name: "48px",
+                    value: "7"
+                }
+            },
+            colors: ["#000000", "#ffffff", "#eeece0", "#1c487f", "#4d80bf", "#c24f4a", "#8baa4a",
+                "#7b5ba1", "#46acc8", "#f9963b"],
+            languageType: ["Bash", "C", "C#", "C++", "CSS", "Java", "JavaScript", "JSON", "TypeScript",
+                "Plain text", "Html", "XML", "SQL", "Go", "Kotlin", "Lua", "Markdown", "PHP",
+                "Python", "Shell Session", "Ruby"],
+            languageTab: "　　　　",
+            emotions: [{
+                title: "表情",
+                type: "emoji",
+                content: "😀 😃 😄 😁 😆 😅 😂 🤣 😊 😇 🙂 🙃 😉 😌 😍 😘 😗 😙 😚 😋 😛 😝 😜 🤓 😎 😏 😒 😞 😔 😟 😕 🙁 😣 😖 😫 😩 😢 😭 😤 😠 😡 😳 😱 😨 🤗 🤔 😶 😑 😬 🙄 😯 😴 😷 🤑 😈 🤡 💩 👻 💀 👀 👣"
+                    .split(/\s/)
+            }, {
+                title: "手势",
+                type: "emoji",
+                content: "👐 🙌 👏 🤝 👍 👎 👊 ✊ 🤛 🤜 🤞 ✌️ 🤘 👌 👈 👉 👆 👇 ☝️ ✋ 🤚 🖐 🖖 👋 🤙 💪 🖕 ✍️ 🙏"
+                    .split(/\s/)
+            }],
+            lineHeights: ["1", "1.15", "1.6", "2", "2.5", "3"],
+            undoLimit: 20,
+            indentation: "2em",
+            showMenuTooltips: !0,
+            menuTooltipPosition: "up"
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        n = n(7);
+        t.default = {
+            onchangeTimeout: 200,
+            onchange: null,
+            onfocus: n.EMPTY_FN,
+            onblur: n.EMPTY_FN,
+            onCatalogChange: null,
+            customAlert: function (e, t, n) {
+                window.alert(e), n && console.error("wangEditor: " + n)
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = {
+            pasteFilterStyle: !0,
+            pasteIgnoreImg: !1,
+            pasteTextHandle: function (e) {
+                return e
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = {
+            styleWithCSS: !1
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        n = n(7);
+        t.default = {
+            linkImgCheck: function (e, t, n) {
+                return !0
+            },
+            showLinkImg: !0,
+            showLinkImgAlt: !0,
+            showLinkImgHref: !0,
+            linkImgCallback: n.EMPTY_FN,
+            uploadImgAccept: ["jpg", "jpeg", "png", "gif", "bmp"],
+            uploadImgServer: "",
+            uploadImgShowBase64: !1,
+            uploadImgMaxSize: 5242880,
+            uploadImgMaxLength: 100,
+            uploadFileName: "",
+            uploadImgParams: {},
+            uploadImgParamsWithUrl: !1,
+            uploadImgHeaders: {},
+            uploadImgHooks: {},
+            uploadImgTimeout: 1e4,
+            withCredentials: !1,
+            customUploadImg: null,
+            uploadImgFromMedia: null
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = {
+            focus: !0,
+            height: 300,
+            placeholder: "请输入正文",
+            zIndexFullScreen: 10002,
+            showFullScreen: !0
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = {
+            lang: "zh-CN",
+            languages: {
+                "zh-CN": {
+                    wangEditor: {
+                        "重置": "重置",
+                        "插入": "插入",
+                        "默认": "默认",
+                        "创建": "创建",
+                        "修改": "修改",
+                        "如": "如",
+                        "请输入正文": "请输入正文",
+                        menus: {
+                            title: {
+                                "标题": "标题",
+                                "加粗": "加粗",
+                                "字号": "字号",
+                                "字体": "字体",
+                                "斜体": "斜体",
+                                "下划线": "下划线",
+                                "删除线": "删除线",
+                                "缩进": "缩进",
+                                "行高": "行高",
+                                "文字颜色": "文字颜色",
+                                "背景色": "背景色",
+                                "链接": "链接",
+                                "序列": "序列",
+                                "对齐": "对齐",
+                                "引用": "引用",
+                                "表情": "表情",
+                                "图片": "图片",
+                                "视频": "视频",
+                                "表格": "表格",
+                                "代码": "代码",
+                                "分割线": "分割线",
+                                "恢复": "恢复",
+                                "撤销": "撤销",
+                                "全屏": "全屏",
+                                "取消全屏": "取消全屏",
+                                "待办事项": "待办事项"
+                            },
+                            dropListMenu: {
+                                "设置标题": "设置标题",
+                                "背景颜色": "背景颜色",
+                                "文字颜色": "文字颜色",
+                                "设置字号": "设置字号",
+                                "设置字体": "设置字体",
+                                "设置缩进": "设置缩进",
+                                "对齐方式": "对齐方式",
+                                "设置行高": "设置行高",
+                                "序列": "序列",
+                                head: {
+                                    "正文": "正文"
+                                },
+                                indent: {
+                                    "增加缩进": "增加缩进",
+                                    "减少缩进": "减少缩进"
+                                },
+                                justify: {
+                                    "靠左": "靠左",
+                                    "居中": "居中",
+                                    "靠右": "靠右",
+                                    "两端": "两端"
+                                },
+                                list: {
+                                    "无序列表": "无序列表",
+                                    "有序列表": "有序列表"
+                                }
+                            },
+                            panelMenus: {
+                                emoticon: {
+                                    "默认": "默认",
+                                    "新浪": "新浪",
+                                    emoji: "emoji",
+                                    "手势": "手势"
+                                },
+                                image: {
+                                    "上传图片": "上传图片",
+                                    "网络图片": "网络图片",
+                                    "图片地址": "图片地址",
+                                    "图片文字说明": "图片文字说明",
+                                    "跳转链接": "跳转链接"
+                                },
+                                link: {
+                                    "链接": "链接",
+                                    "链接文字": "链接文字",
+                                    "取消链接": "取消链接",
+                                    "查看链接": "查看链接"
+                                },
+                                video: {
+                                    "插入视频": "插入视频",
+                                    "上传视频": "上传视频"
+                                },
+                                table: {
+                                    "行": "行",
+                                    "列": "列",
+                                    "的": "的",
+                                    "表格": "表格",
+                                    "添加行": "添加行",
+                                    "删除行": "删除行",
+                                    "添加列": "添加列",
+                                    "删除列": "删除列",
+                                    "设置表头": "设置表头",
+                                    "取消表头": "取消表头",
+                                    "插入表格": "插入表格",
+                                    "删除表格": "删除表格"
+                                },
+                                code: {
+                                    "删除代码": "删除代码",
+                                    "修改代码": "修改代码",
+                                    "插入代码": "插入代码"
+                                }
+                            }
+                        },
+                        validate: {
+                            "张图片": "张图片",
+                            "大于": "大于",
+                            "图片链接": "图片链接",
+                            "不是图片": "不是图片",
+                            "返回结果": "返回结果",
+                            "上传图片超时": "上传图片超时",
+                            "上传图片错误": "上传图片错误",
+                            "上传图片失败": "上传图片失败",
+                            "插入图片错误": "插入图片错误",
+                            "一次最多上传": "一次最多上传",
+                            "下载链接失败": "下载链接失败",
+                            "图片验证未通过": "图片验证未通过",
+                            "服务器返回状态": "服务器返回状态",
+                            "上传图片返回结果错误": "上传图片返回结果错误",
+                            "请替换为支持的图片类型": "请替换为支持的图片类型",
+                            "您插入的网络图片无法识别": "您插入的网络图片无法识别",
+                            "您刚才插入的图片链接未通过编辑器校验": "您刚才插入的图片链接未通过编辑器校验",
+                            "插入视频错误": "插入视频错误",
+                            "视频链接": "视频链接",
+                            "不是视频": "不是视频",
+                            "视频验证未通过": "视频验证未通过",
+                            "个视频": "个视频",
+                            "上传视频超时": "上传视频超时",
+                            "上传视频错误": "上传视频错误",
+                            "上传视频失败": "上传视频失败",
+                            "上传视频返回结果错误": "上传视频返回结果错误"
+                        }
+                    }
+                },
+                en: {
+                    wangEditor: {
+                        "重置": "reset",
+                        "插入": "insert",
+                        "默认": "default",
+                        "创建": "create",
+                        "修改": "edit",
+                        "如": "like",
+                        "请输入正文": "please enter the text",
+                        menus: {
+                            title: {
+                                "标题": "head",
+                                "加粗": "bold",
+                                "字号": "font size",
+                                "字体": "font family",
+                                "斜体": "italic",
+                                "下划线": "underline",
+                                "删除线": "strikethrough",
+                                "缩进": "indent",
+                                "行高": "line heihgt",
+                                "文字颜色": "font color",
+                                "背景色": "background",
+                                "链接": "link",
+                                "序列": "numbered list",
+                                "对齐": "align",
+                                "引用": "quote",
+                                "表情": "emoticons",
+                                "图片": "image",
+                                "视频": "media",
+                                "表格": "table",
+                                "代码": "code",
+                                "分割线": "split line",
+                                "恢复": "undo",
+                                "撤销": "redo",
+                                "全屏": "fullscreen",
+                                "取消全屏": "cancel fullscreen",
+                                "待办事项": "todo"
+                            },
+                            dropListMenu: {
+                                "设置标题": "title",
+                                "背景颜色": "background",
+                                "文字颜色": "font color",
+                                "设置字号": "font size",
+                                "设置字体": "font family",
+                                "设置缩进": "indent",
+                                "对齐方式": "align",
+                                "设置行高": "line heihgt",
+                                "序列": "list",
+                                head: {
+                                    "正文": "text"
+                                },
+                                indent: {
+                                    "增加缩进": "indent",
+                                    "减少缩进": "outdent"
+                                },
+                                justify: {
+                                    "靠左": "left",
+                                    "居中": "center",
+                                    "靠右": "right",
+                                    "两端": "justify"
+                                },
+                                list: {
+                                    "无序列表": "unordered",
+                                    "有序列表": "ordered"
+                                }
+                            },
+                            panelMenus: {
+                                emoticon: {
+                                    "表情": "emoji",
+                                    "手势": "gesture"
+                                },
+                                image: {
+                                    "上传图片": "upload image",
+                                    "网络图片": "network image",
+                                    "图片地址": "image link",
+                                    "图片文字说明": "image alt",
+                                    "跳转链接": "hyperlink"
+                                },
+                                link: {
+                                    "链接": "link",
+                                    "链接文字": "link text",
+                                    "取消链接": "unlink",
+                                    "查看链接": "view links"
+                                },
+                                video: {
+                                    "插入视频": "insert video",
+                                    "上传视频": "upload local video"
+                                },
+                                table: {
+                                    "行": "rows",
+                                    "列": "columns",
+                                    "的": " ",
+                                    "表格": "table",
+                                    "添加行": "insert row",
+                                    "删除行": "delete row",
+                                    "添加列": "insert column",
+                                    "删除列": "delete column",
+                                    "设置表头": "set header",
+                                    "取消表头": "cancel header",
+                                    "插入表格": "insert table",
+                                    "删除表格": "delete table"
+                                },
+                                code: {
+                                    "删除代码": "delete code",
+                                    "修改代码": "edit code",
+                                    "插入代码": "insert code"
+                                }
+                            }
+                        },
+                        validate: {
+                            "张图片": "images",
+                            "大于": "greater than",
+                            "图片链接": "image link",
+                            "不是图片": "is not image",
+                            "返回结果": "return results",
+                            "上传图片超时": "upload image timeout",
+                            "上传图片错误": "upload image error",
+                            "上传图片失败": "upload image failed",
+                            "插入图片错误": "insert image error",
+                            "一次最多上传": "once most at upload",
+                            "下载链接失败": "download link failed",
+                            "图片验证未通过": "image validate failed",
+                            "服务器返回状态": "server return status",
+                            "上传图片返回结果错误": "upload image return results error",
+                            "请替换为支持的图片类型": "please replace with a supported image type",
+                            "您插入的网络图片无法识别": "the network picture you inserted is not recognized",
+                            "您刚才插入的图片链接未通过编辑器校验": "the image link you just inserted did not pass the editor verification",
+                            "插入视频错误": "insert video error",
+                            "视频链接": "video link",
+                            "不是视频": "is not video",
+                            "视频验证未通过": "video validate failed",
+                            "个视频": "videos",
+                            "上传视频超时": "upload video timeout",
+                            "上传视频错误": "upload video error",
+                            "上传视频失败": "upload video failed",
+                            "上传视频返回结果错误": "upload video return results error"
+                        }
+                    }
+                }
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(6);
+        t.default = {
+            compatibleMode: function () {
+                return !(!o.UA.isIE() && !o.UA.isOldEdge)
+            },
+            historyMaxSize: 30
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        n = n(7);
+        t.default = {
+            onlineVideoCheck: function (e) {
+                return !0
+            },
+            onlineVideoCallback: n.EMPTY_FN,
+            showLinkVideo: !0,
+            uploadVideoAccept: ["mp4"],
+            uploadVideoServer: "",
+            uploadVideoMaxSize: 1073741824,
+            uploadVideoName: "",
+            uploadVideoParams: {},
+            uploadVideoParamsWithUrl: !1,
+            uploadVideoHeaders: {},
+            uploadVideoHooks: {},
+            uploadVideoTimeout: 72e5,
+            withVideoCredentials: !1,
+            customUploadVideo: null,
+            customInsertVideo: null
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(19));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var l = n(2).__importDefault(n(3)),
+            a = n(6),
+            u = n(7),
+            n = (s.prototype.getRange = function () {
+                return this._currentRange
+            }, s.prototype.saveRange = function (e) {
+                var t, n, o;
+                e ? this._currentRange = e : 0 !== (o = window.getSelection()).rangeCount && (t = o.getRangeAt(
+                    0), null != (n = this.getSelectionContainerElem(t)) && n.length && ("false" ===
+                    n.attr("contenteditable") || n.parentUntil("[contenteditable=false]") || (o =
+                        (e = this.editor).$textElem).isContain(n) && (o.elems[0] === n.elems[0] &&
+                        (0, r.default)(n = o.html()).call(n) === u.EMPTY_P && (o = null == (o =
+                            o.children()) ? void 0 : o.last(), e.selection.createRangeByElem(
+                            o, !0, !0), e.selection.restoreSelection()), this._currentRange = t
+                    )))
+            }, s.prototype.collapseRange = function (e) {
+                void 0 === e && (e = !1);
+                var t = this._currentRange;
+                t && t.collapse(e)
+            }, s.prototype.getSelectionText = function () {
+                var e = this._currentRange;
+                return e ? e.toString() : ""
+            }, s.prototype.getSelectionContainerElem = function (e) {
+                var e = e || this._currentRange;
+                if (e) return e = e.commonAncestorContainer, l.default(1 === e.nodeType ? e : e.parentNode)
+            }, s.prototype.getSelectionStartElem = function (e) {
+                var e = e || this._currentRange;
+                if (e) return e = e.startContainer, l.default(1 === e.nodeType ? e : e.parentNode)
+            }, s.prototype.getSelectionEndElem = function (e) {
+                var e = e || this._currentRange;
+                if (e) return e = e.endContainer, l.default(1 === e.nodeType ? e : e.parentNode)
+            }, s.prototype.isSelectionEmpty = function () {
+                var e = this._currentRange;
+                return !(!e || !e.startContainer || e.startContainer !== e.endContainer || e.startOffset !==
+                    e.endOffset)
+            }, s.prototype.restoreSelection = function () {
+                var e = window.getSelection(),
+                    t = this._currentRange;
+                e && t && (e.removeAllRanges(), e.addRange(t))
+            }, s.prototype.createEmptyRange = function () {
+                var e, t = this.editor,
+                    n = this.getRange();
+                if (n && this.isSelectionEmpty()) try {
+                    a.UA.isWebkit() ? (t.cmd.do("insertHTML", "&#8203;"), n.setEnd(n.endContainer,
+                        n.endOffset + 1), this.saveRange(n)) : (e = l.default(
+                        "<strong>&#8203;</strong>"), t.cmd.do("insertElem", e), this.createRangeByElem(
+                        e, !0))
+                } catch (e) {}
+            }, s.prototype.createRangeByElems = function (e, t) {
+                var n = (window.getSelection ? window : document).getSelection();
+                null != n && n.removeAllRanges();
+                n = document.createRange();
+                n.setStart(e, 0), n.setEnd(t, t.childNodes.length || 1), this.saveRange(n), this.restoreSelection()
+            }, s.prototype.createRangeByElem = function (e, t, n) {
+                var o;
+                e.length && (o = e.elems[0], e = document.createRange(), n ? e.selectNodeContents(o) :
+                    e.selectNode(o), null != t && (e.collapse(t), t || (this.saveRange(e), this.editor
+                    .selection.moveCursor(o))), this.saveRange(e))
+            }, s.prototype.getSelectionRangeTopNodes = function () {
+                var e = null === (t = this.getSelectionStartElem()) || void 0 === t ? void 0 : t.getNodeTop(
+                    this.editor),
+                    t = null === (t = this.getSelectionEndElem()) || void 0 === t ? void 0 : t.getNodeTop(
+                        this.editor);
+                return this.recordSelectionNodes(l.default(e), l.default(t))
+            }, s.prototype.moveCursor = function (e, t) {
+                var n = this.getRange(),
+                    o = 3 === e.nodeType ? null === (o = e.nodeValue) || void 0 === o ? void 0 : o.length :
+                        e.childNodes.length;
+                (a.UA.isFirefox || a.UA.isIE()) && 0 !== o && (3 !== e.nodeType && "BR" !== e.childNodes[
+                o - 1].nodeName || (o -= 1));
+                o = null != t ? t : o;
+                n && e && (n.setStart(e, o), n.setEnd(e, o), this.restoreSelection())
+            }, s.prototype.getCursorPos = function () {
+                var e = window.getSelection();
+                return null == e ? void 0 : e.anchorOffset
+            }, s.prototype.clearWindowSelectionRange = function () {
+                var e = window.getSelection();
+                e && e.removeAllRanges()
+            }, s.prototype.recordSelectionNodes = function (e, t) {
+                for (var n = [], o = e, i = this.editor.$textElem, r = !0; r;) {
+                    var a = null == o ? void 0 : o.getNodeTop(this.editor);
+                    "BODY" === a.getNodeName() && (r = !1), 0 < a.length && (n.push(l.default(o)), null !=
+                    t && t.equal(a) || i.equal(a) ? r = !1 : o = a.getNextSibling())
+                }
+                return n
+            }, s.prototype.setRangeToElem = function (e) {
+                var t = this.getRange();
+                null != t && t.setStart(e, 0), null != t && t.setEnd(e, 0)
+            }, s);
+
+        function s(e) {
+            this._currentRange = null, this.editor = e
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2).__importDefault(n(3)),
+            n = (o.prototype.do = function (e, t) {
+                var n = this.editor;
+                n.config.styleWithCSS && document.execCommand("styleWithCSS", !1, "true");
+                var o = n.selection;
+                if (o.getRange()) {
+                    switch (o.restoreSelection(), e) {
+                        case "insertHTML":
+                            this.insertHTML(t);
+                            break;
+                        case "insertElem":
+                            this.insertElem(t);
+                            break;
+                        default:
+                            this.execCommand(e, t)
+                    }
+                    n.menus.changeActive(), o.saveRange(), o.restoreSelection()
+                }
+            }, o.prototype.insertHTML = function (e) {
+                var t, n = this.editor,
+                    o = n.selection.getRange();
+                null != o && (this.queryCommandSupported("insertHTML") ? this.execCommand("insertHTML",
+                    e) : o.insertNode && (o.deleteContents(), 0 < i.default(e).elems.length ? o
+                        .insertNode(i.default(e).elems[0]) : ((t = document.createElement("p")).appendChild(
+                        document.createTextNode(e)), o.insertNode(t)), n.selection.collapseRange()
+                ))
+            }, o.prototype.insertElem = function (e) {
+                var t = this.editor.selection.getRange();
+                null != t && t.insertNode && (t.deleteContents(), t.insertNode(e.elems[0]))
+            }, o.prototype.execCommand = function (e, t) {
+                document.execCommand(e, !1, t)
+            }, o.prototype.queryCommandValue = function (e) {
+                return document.queryCommandValue(e)
+            }, o.prototype.queryCommandState = function (e) {
+                return document.queryCommandState(e)
+            }, o.prototype.queryCommandSupported = function (e) {
+                return document.queryCommandSupported(e)
+            }, o);
+
+        function o(e) {
+            this.editor = e
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(30)),
+            a = o(n(4)),
+            l = o(n(19)),
+            u = o(n(26)),
+            s = o(n(45));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            c = i.__importDefault(n(3)),
+            f = i.__importDefault(n(291)),
+            d = n(6),
+            p = i.__importDefault(n(303)),
+            h = i.__importDefault(n(304)),
+            A = n(7),
+            n = (v.prototype.init = function () {
+                this._saveRange(), this._bindEventHooks(), f.default(this)
+            }, v.prototype.togglePlaceholder = function () {
+                var e = this.html(),
+                    t = (0, r.default)(t = this.editor.$textContainerElem).call(t, ".placeholder");
+                t.hide(), this.editor.isComposing || e && " " !== e || t.show()
+            }, v.prototype.clear = function () {
+                this.html(A.EMPTY_P)
+            }, v.prototype.html = function (e) {
+                var t = this.editor,
+                    n = t.$textElem;
+                if (null == e) {
+                    var o = n.html(),
+                        i = (o = (o = (o = (o = o.replace(/\u200b/gm, "")).replace(/<p><\/p>/gim, "")).replace(
+                            A.EMPTY_P_LAST_REGEX, "")).replace(A.EMPTY_P_REGEX, "<p>")).match(
+                            /<(img|br|hr|input)[^>]*>/gi);
+                    return null !== i && (0, a.default)(i).call(i, function (e) {
+                        e.match(/\/>/) || (o = o.replace(e, e.substring(0, e.length - 1) + "/>"))
+                    }), o
+                }
+                "" === (e = (0, l.default)(e).call(e)) && (e = A.EMPTY_P), 0 !== (0, u.default)(e).call(
+                    e, "<") && (e = "<p>" + e + "</p>"), n.html(e), t.initSelection()
+            }, v.prototype.setJSON = function (e) {
+                var t = h.default(e).children(),
+                    e = this.editor.$textElem;
+                t && e.replaceChildAll(t)
+            }, v.prototype.getJSON = function () {
+                var e = this.editor.$textElem;
+                return p.default(e)
+            }, v.prototype.text = function (e) {
+                var t = this.editor,
+                    n = t.$textElem;
+                if (null == e) return n.text().replace(/\u200b/gm, "");
+                n.text("<p>" + e + "</p>"), t.initSelection()
+            }, v.prototype.append = function (e) {
+                var t = this.editor;
+                0 !== (0, u.default)(e).call(e, "<") && (e = "<p>" + e + "</p>"), this.html(this.html() +
+                    e), t.initSelection()
+            }, v.prototype._saveRange = function () {
+                var t = this.editor,
+                    n = t.$textElem,
+                    e = c.default(document);
+
+                function o() {
+                    t.selection.saveRange(), t.menus.changeActive()
+                }
+
+                function i() {
+                    o(), e.off("mouseup", i)
+                }
+
+                function r() {
+                    e.on("mouseup", i), n.off("mouseleave", r)
+                }
+                n.on("keyup", o), n.on("click", function e() {
+                    o(), n.off("click", e)
+                }), n.on("mousedown", function () {
+                    n.on("mouseleave", r)
+                }), n.on("mouseup", function (e) {
+                    n.off("mouseleave", r), (0, s.default)(function () {
+                        null !== t.selection.getRange() && o()
+                    }, 0)
+                })
+            }, v.prototype._bindEventHooks = function () {
+                var n = this.editor,
+                    e = n.$textElem,
+                    o = this.eventHooks;
+
+                function t(e) {
+                    e.preventDefault()
+                }
+                e.on("click", function (t) {
+                    var e = o.clickEvents;
+                    (0, a.default)(e).call(e, function (e) {
+                        return e(t)
+                    })
+                }), e.on("keyup", function (t) {
+                    var e;
+                    13 === t.keyCode && (e = o.enterUpEvents, (0, a.default)(e).call(e,
+                        function (e) {
+                            return e(t)
+                        }))
+                }), e.on("keyup", function (t) {
+                    var e = o.keyupEvents;
+                    (0, a.default)(e).call(e, function (e) {
+                        return e(t)
+                    })
+                }), e.on("keydown", function (t) {
+                    var e = o.keydownEvents;
+                    (0, a.default)(e).call(e, function (e) {
+                        return e(t)
+                    })
+                }), e.on("keyup", function (t) {
+                    var e;
+                    8 === t.keyCode && (e = o.deleteUpEvents, (0, a.default)(e).call(e,
+                        function (e) {
+                            return e(t)
+                        }))
+                }), e.on("keydown", function (t) {
+                    var e;
+                    8 === t.keyCode && (e = o.deleteDownEvents, (0, a.default)(e).call(e,
+                        function (e) {
+                            return e(t)
+                        }))
+                }), e.on("paste", function (t) {
+                    var e;
+                    d.UA.isIE() || (t.preventDefault(), e = o.pasteEvents, (0, a.default)(e).call(
+                        e,
+                        function (e) {
+                            return e(t)
+                        }))
+                }), e.on("keydown", function (e) {
+                    (n.isFocus || n.isCompatibleMode) && (e.ctrlKey || e.metaKey) && 90 === e.keyCode &&
+                    (e.preventDefault(), e.shiftKey ? n.history.restore() : n.history.revoke())
+                }), e.on("keyup", function (t) {
+                    var e;
+                    9 === t.keyCode && (t.preventDefault(), e = o.tabUpEvents, (0, a.default)(e)
+                        .call(e, function (e) {
+                            return e(t)
+                        }))
+                }), e.on("keydown", function (t) {
+                    var e;
+                    9 === t.keyCode && (t.preventDefault(), e = o.tabDownEvents, (0, a.default)
+                    (e).call(e, function (e) {
+                        return e(t)
+                    }))
+                }), e.on("scroll", d.throttle(function (t) {
+                    var e = o.textScrollEvents;
+                    (0, a.default)(e).call(e, function (e) {
+                        return e(t)
+                    })
+                }, 100)), c.default(document).on("dragleave", t).on("drop", t).on("dragenter", t).on(
+                    "dragover", t), n.beforeDestroy(function () {
+                    c.default(document).off("dragleave", t).off("drop", t).off("dragenter", t).off(
+                        "dragover", t)
+                }), e.on("drop", function (t) {
+                    t.preventDefault();
+                    var e = o.dropEvents;
+                    (0, a.default)(e).call(e, function (e) {
+                        return e(t)
+                    })
+                }), e.on("click", function (e) {
+                    var t, n = null,
+                        e = e.target,
+                        e = c.default(e);
+                    "A" === e.getNodeName() ? n = e : null != (t = e.parentUntil("a")) && (n =
+                        t), n && (t = o.linkClickEvents, (0, a.default)(t).call(t, function (
+                        e) {
+                        return e(n)
+                    }))
+                }), e.on("click", function (e) {
+                    var t = null,
+                        n = e.target,
+                        n = c.default(n);
+                    "IMG" !== n.getNodeName() || n.elems[0].getAttribute("data-emoji") || (e.stopPropagation(),
+                        t = n), t && (n = o.imgClickEvents, (0, a.default)(n).call(n,
+                        function (e) {
+                            return e(t)
+                        }))
+                }), e.on("click", function (e) {
+                    var t, n = null,
+                        e = e.target,
+                        e = c.default(e);
+                    "PRE" === e.getNodeName() ? n = e : null !== (t = e.parentUntil("pre")) &&
+                        (n = t), n && (t = o.codeClickEvents, (0, a.default)(t).call(t,
+                        function (e) {
+                            return e(n)
+                        }))
+                }), e.on("click", function (e) {
+                    var t = null,
+                        e = e.target,
+                        e = c.default(e);
+                    (t = "HR" === e.getNodeName() ? e : t) && (n.selection.createRangeByElem(t),
+                        n.selection.restoreSelection(), e = o.splitLineEvents, (0, a.default)(e)
+                        .call(e, function (e) {
+                            return e(t)
+                        }))
+                }), n.$toolbarElem.on("click", function (t) {
+                    var e = o.toolbarClickEvents;
+                    (0, a.default)(e).call(e, function (e) {
+                        return e(t)
+                    })
+                }), n.$textContainerElem.on("mousedown", function (e) {
+                    e = e.target;
+                    c.default(e).hasClass("w-e-img-drag-rb") && (e = o.imgDragBarMouseDownEvents,
+                        (0, a.default)(e).call(e, function (e) {
+                            return e()
+                        }))
+                }), e.on("click", function (e) {
+                    var t = null,
+                        e = e.target;
+                    (t = c.default(e).parentUntilEditor("TABLE", n, e)) && (e = o.tableClickEvents,
+                        (0, a.default)(e).call(e, function (e) {
+                            return e(t)
+                        }))
+                }), e.on("keydown", function (t) {
+                    var e;
+                    13 === t.keyCode && (e = o.enterDownEvents, (0, a.default)(e).call(e,
+                        function (e) {
+                            return e(t)
+                        }))
+                }), e.on("click", function (e) {
+                    var t = null,
+                        n = e.target,
+                        n = c.default(n);
+                    "VIDEO" === n.getNodeName() && (e.stopPropagation(), t = n), t && (n = o.videoClickEvents,
+                        (0, a.default)(n).call(n, function (e) {
+                            return e(t)
+                        }))
+                })
+            }, v);
+
+        function v(e) {
+            this.editor = e, this.eventHooks = {
+                onBlurEvents: [],
+                changeEvents: [],
+                dropEvents: [],
+                clickEvents: [],
+                keydownEvents: [],
+                keyupEvents: [],
+                tabUpEvents: [],
+                tabDownEvents: [],
+                enterUpEvents: [],
+                enterDownEvents: [],
+                deleteUpEvents: [],
+                deleteDownEvents: [],
+                pasteEvents: [],
+                linkClickEvents: [],
+                codeClickEvents: [],
+                textScrollEvents: [],
+                toolbarClickEvents: [],
+                imgClickEvents: [],
+                imgDragBarMouseDownEvents: [],
+                tableClickEvents: [],
+                menuClickEvents: [],
+                dropListMenuHoverEvents: [],
+                splitLineEvents: [],
+                videoClickEvents: []
+            }
+        }
+        t.default = n
+    }, function (e, t, n) {
+        n = n(288);
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(289),
+            i = Array.prototype;
+        e.exports = function (e) {
+            var t = e.find;
+            return e === i || e instanceof Array && t === i.find ? o : t
+        }
+    }, function (e, t, n) {
+        n(290);
+        n = n(14);
+        e.exports = n("Array").find
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(29).find,
+            n = n(89),
+            r = !0;
+        "find" in [] && Array(1).find(function () {
+            r = !1
+        }), o({
+            target: "Array",
+            proto: !0,
+            forced: r
+        }, {
+            find: function (e) {
+                return i(this, e, 1 < arguments.length ? arguments[1] : void 0)
+            }
+        }), n("find")
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            i = o.__importDefault(n(292)),
+            r = o.__importDefault(n(293)),
+            a = o.__importDefault(n(294)),
+            l = o.__importDefault(n(295)),
+            u = o.__importDefault(n(302));
+        t.default = function (e) {
+            var t = e.editor,
+                e = e.eventHooks;
+            i.default(t, e.enterUpEvents, e.enterDownEvents), r.default(t, e.deleteUpEvents, e.deleteDownEvents),
+                a.default(t, e.tabDownEvents), l.default(t, e.pasteEvents), u.default(t, e.imgClickEvents)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(26));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a = n(2).__importDefault(n(3));
+        t.default = function (o, e, t) {
+            function i(e) {
+                var t, n = a.default("<p><br></p>");
+                n.insertBefore(e), 0 <= (0, r.default)(t = e.html()).call(t, "<img") ? n.remove() : (o.selection
+                    .createRangeByElem(n, !0, !0), o.selection.restoreSelection(), e.remove())
+            }
+            e.push(function () {
+                var e = o.$textElem,
+                    t = o.selection.getSelectionContainerElem(),
+                    n = t.parent();
+                "<code><br></code>" !== n.html() ? n.equal(e) && ("P" === t.getNodeName() &&
+                    null === t.attr("data-we-empty-p") || t.text() || i(t)) : i(t)
+            }), t.push(function (e) {
+                var t;
+                o.selection.saveRange(null === (t = getSelection()) || void 0 === t ? void 0 :
+                    t.getRangeAt(0)), o.selection.getSelectionContainerElem().id === o.textElemId &&
+                (e.preventDefault(), o.cmd.do("insertHTML", "<p><br></p>"))
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(19));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            a = n(7),
+            l = i.__importDefault(n(3));
+        t.default = function (n, e, t) {
+            e.push(function () {
+                var e = n.$textElem,
+                    t = (0, r.default)(t = e.html().toLowerCase()).call(t);
+                t && "<br>" !== t || (t = l.default(a.EMPTY_P), e.html(" "), e.append(t), n.selection
+                    .createRangeByElem(t, !1, !0), n.selection.restoreSelection(), n.selection
+                    .moveCursor(t.getNode(), 0))
+            }), t.push(function (e) {
+                var t = n.$textElem;
+                (0, r.default)(t = t.html().toLowerCase()).call(t) === a.EMPTY_P && e.preventDefault()
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = function (n, e) {
+            e.push(function () {
+                var e, t;
+                !n.cmd.queryCommandSupported("insertHTML") || (e = n.selection.getSelectionContainerElem()) &&
+                (t = e.parent(), e = e.getNodeName(), t = t.getNodeName(), "CODE" == e ||
+                "CODE" === t || "PRE" === t || /hljs/.test(t) ? n.cmd.do("insertHTML",
+                    n.config.languageTab) : n.cmd.do("insertHTML",
+                    "&nbsp;&nbsp;&nbsp;&nbsp;"))
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(19));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var f = n(128),
+            d = n(6),
+            p = n(7);
+
+        function h(e) {
+            return e = (e = e.replace(/<div>/gim, "<p>").replace(/<\/div>/gim, "</p>")).replace(
+                /<p><\/p>/gim, "<p><br></p>"), (0, r.default)(e).call(e)
+        }
+        t.default = function (c, e) {
+            e.push(function (e) {
+                var t = c.config,
+                    n = t.pasteFilterStyle,
+                    o = t.pasteIgnoreImg,
+                    i = t.pasteTextHandle,
+                    r = f.getPasteHtml(e, n, o),
+                    a = (a = f.getPasteText(e)).replace(/\n/gm, "<br>"),
+                    l = c.selection.getSelectionContainerElem();
+                if (l) {
+                    t = null == l ? void 0 : l.getNodeName(), o = null == l ? void 0 : l.getNodeTop(
+                        c), e = "";
+                    if (o.elems[0] && (e = null == o ? void 0 : o.getNodeName()), "CODE" === t ||
+                    "PRE" === e) return i && d.isFunction(i) && (a = "" + (i(a) || "")),
+                        void c.cmd.do("insertHTML", a.replace(/<br>|<br\/>/gm, "\n").replace(
+                            /<[^>]+>/gm, ""));
+                    if (p.urlRegex.test(a) && n) return i && d.isFunction(i) && (a = "" + (i(a) ||
+                        "")), c.cmd.do("insertHTML", '<a href="' + a +
+                        '" target="_blank">' + a + "</a>");
+                    if (r) try {
+                        if (i && d.isFunction(i) && (r = "" + (i(r) || "")),
+                        /[\.\#\@]?\w+[ ]+\{[^}]*\}/.test(r) && n) c.cmd.do("insertHTML",
+                            "" + h(a));
+                        else {
+                            var u = h(r);
+                            if (function (e) {
+                                if ("" !== e) {
+                                    var t = document.createElement("div");
+                                    return t.innerHTML = e, "P" === (null === (t = t.firstChild) ||
+                                    void 0 === t ? void 0 : t.nodeName)
+                                }
+                            }(u)) {
+                                var s = c.$textElem;
+                                if (c.cmd.do("insertHTML", u), s.equal(l)) return void c.selection
+                                    .createEmptyRange();
+                                ! function (e) {
+                                    if (null != e && e.length) {
+                                        e = e.elems[0];
+                                        return "P" === e.nodeName && "<br>" === e.innerHTML
+                                    }
+                                }(o) || o.remove()
+                            } else c.cmd.do("insertHTML", u)
+                        }
+                    } catch (e) {
+                        i && d.isFunction(i) && (a = "" + (i(a) || "")), c.cmd.do(
+                            "insertHTML", "" + h(a))
+                    }
+                }
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            c = o(n(19)),
+            f = o(n(4)),
+            d = o(n(55));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            p = n(297),
+            r = i.__importDefault(n(301));
+
+        function h(e, t) {
+            var n;
+            return e = (0, c.default)(n = e.toLowerCase()).call(n), p.IGNORE_TAGS.has(e) || !(!t || "img" !==
+                e)
+        }
+        t.default = function (e, a, l) {
+            void 0 === a && (a = !0), void 0 === l && (l = !1);
+            var u = [],
+                s = "";
+            (new r.default).parse(e, {
+                startElement: function (e, t) {
+                    var n, o, i, r;
+                    i = e, (i = (0, c.default)(i).call(i)) && (p.EMPTY_TAGS.has(i) || (s =
+                        i)), h(e, l) || (n = p.NECESSARY_ATTRS.get(e) || [], o = [], (0,
+                        f.default)(t).call(t, function (e) {
+                        var t = e.name;
+                        "style" !== t ? !1 !== (0, d.default)(n).call(n, t) &&
+                            o.push(e) : a || o.push(e)
+                    }), i = o, t = "", t = "<" + (e = e), r = [], (0, f.default)(i)
+                        .call(i, function (e) {
+                            r.push(e.name + '="' + e.value + '"')
+                        }), t = t = (t = 0 < r.length ? t + " " + r.join(" ") : t) + (p
+                        .EMPTY_TAGS.has(e) ? "/" : "") + ">", u.push(t))
+                },
+                characters: function (e) {
+                    e && (h(s, l) || u.push(e))
+                },
+                endElement: function (e) {
+                    h(e, l) || (u.push("</" + e + ">"), s = "")
+                },
+                comment: function (e) {}
+            });
+            var t, e = u.join("");
+            return t = /<span>(.*?)<\/span>/, e = e.replace(/<span>.*?<\/span>/gi, function (e) {
+                e = e.match(t);
+                return null == e ? "" : e[1]
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(129)),
+            n = o(n(120));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.TOP_LEVEL_TAGS = t.EMPTY_TAGS = t.NECESSARY_ATTRS = t.IGNORE_TAGS = void 0, t.IGNORE_TAGS =
+            new r.default(["doctype", "!doctype", "html", "head", "meta", "body", "script", "style", "link",
+                "frame", "iframe", "title", "svg", "center", "o:p"]), t.NECESSARY_ATTRS = new n.default([[
+            "img", ["src", "alt"]], ["a", ["href", "target"]], ["td", ["colspan", "rowspan"]],
+            ["th", ["colspan", "rowspan"]]]), t.EMPTY_TAGS = new r.default(["area", "base", "basefont",
+            "br", "col", "hr", "img", "input", "isindex", "embed"]), t.TOP_LEVEL_TAGS = new r.default([
+            "h1", "h2", "h3", "h4", "h5", "p", "ul", "ol", "table", "blockquote", "pre", "hr",
+            "form"])
+    }, function (e, t, n) {
+        n = n(299);
+        e.exports = n
+    }, function (e, t, n) {
+        n(300), n(69), n(51), n(52);
+        n = n(10);
+        e.exports = n.Set
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(121),
+            n = n(123);
+        e.exports = o("Set", function (e) {
+            return function () {
+                return e(this, arguments.length ? arguments[0] : void 0)
+            }
+        }, n)
+    }, function (e, t) {
+        function n() {}
+        n.prototype = {
+            handler: null,
+            startTagRe: /^<([^>\s\/]+)((\s+[^=>\s]+(\s*=\s*((\"[^"]*\")|(\'[^']*\')|[^>\s]+))?)*)\s*\/?\s*>/m,
+            endTagRe: /^<\/([^>\s]+)[^>]*>/m,
+            attrRe: /([^=\s]+)(\s*=\s*((\"([^"]*)\")|(\'([^']*)\')|[^>\s]+))?/gm,
+            parse: function (e, t) {
+                t && (this.contentHandler = t);
+                for (var n, o, i, r = !1, a = this; 0 < e.length;) "\x3c!--" == e.substring(0, 4) ?
+                    r = -1 == (i = e.indexOf("--\x3e")) || (this.contentHandler.comment(e.substring(
+                        4, i)), e = e.substring(i + 3), !1) : "</" == e.substring(0, 2) ? r = !this
+                        .endTagRe.test(e) || (RegExp.leftContext, n = RegExp.lastMatch, o = RegExp.rightContext,
+                        n.replace(this.endTagRe, function () {
+                            return a.parseEndTag.apply(a, arguments)
+                        }), e = o, !1) : "<" == e.charAt(0) && (r = !this.startTagRe.test(e) || (
+                        RegExp.leftContext, n = RegExp.lastMatch, o = RegExp.rightContext, n.replace(
+                            this.startTagRe,
+                            function () {
+                                return a.parseStartTag.apply(a, arguments)
+                            }), e = o, !1)), r && (e = -1 == (i = e.indexOf("<")) ? (this.contentHandler
+                    .characters(e), "") : (this.contentHandler.characters(e.substring(0, i)),
+                    e.substring(i))), r = !0
+            },
+            parseStartTag: function (e, t, n) {
+                n = this.parseAttributes(t, n);
+                this.contentHandler.startElement(t, n)
+            },
+            parseEndTag: function (e, t) {
+                this.contentHandler.endElement(t)
+            },
+            parseAttributes: function (u, e) {
+                var s = this,
+                    c = [];
+                return e.replace(this.attrRe, function (e, t, n, o, i, r, a, l) {
+                    c.push(s.parseAttribute(u, e, t, n, o, i, r, a, l))
+                }), c
+            },
+            parseAttribute: function (e, t, n) {
+                var o = "";
+                return arguments[7] ? o = arguments[8] : arguments[5] ? o = arguments[6] :
+                    arguments[3] && (o = arguments[4]), {
+                    name: n,
+                    value: !o && !arguments[3] ? null : o
+                }
+            }
+        }, e.exports = n
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = function (t, e) {
+            e.push(function (e) {
+                t.selection.createRangeByElem(e), t.selection.restoreSelection()
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            c = n(6),
+            f = i.__importDefault(n(3));
+        t.default = function u(e) {
+            var s = [],
+                e = e.childNodes() || [];
+            return (0, r.default)(e).call(e, function (e) {
+                var t, n = e.nodeType;
+                if (3 === n && (t = e.textContent || "", t = c.replaceHtmlSymbol(t)), 1 === n) {
+                    (t = {}).tag = e.nodeName.toLowerCase();
+                    for (var o = [], i = e.attributes, r = i.length || 0, a = 0; a < r; a++) {
+                        var l = i[a];
+                        o.push({
+                            name: l.name,
+                            value: l.value
+                        })
+                    }
+                    t.attrs = o, t.children = u(f.default(e))
+                }
+                t && s.push(t)
+            }), s
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            r = o(n(94)),
+            i = o(n(1)),
+            a = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var l = n(2).__importDefault(n(3));
+        t.default = function o(e, t) {
+            var i = t = void 0 === t ? document.createElement("div") : t;
+            return (0, a.default)(e).call(e, function (e) {
+                var t, n;
+                "string" == typeof e && (n = document.createTextNode(e)), "object" === (0, r.default)
+                (e) && (n = document.createElement(e.tag), (0, a.default)(t = e.attrs).call(
+                    t,
+                    function (e) {
+                        l.default(n).attr(e.name, e.value)
+                    }), e.children && 0 < e.children.length && o(e.children, n.getRootNode())),
+                n && i.appendChild(n)
+            }), l.default(i)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            u = o(n(91)),
+            s = o(n(74)),
+            c = o(n(55)),
+            f = o(n(4)),
+            d = o(n(130)),
+            r = o(n(131)),
+            p = o(n(45)),
+            a = o(n(56));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            h = i.__importDefault(n(119)),
+            l = i.__importDefault(n(314)),
+            A = i.__importDefault(n(3)),
+            n = (v.prototype.extend = function (e, t) {
+                t && "function" == typeof t && (this.constructorList[e] = t)
+            }, v.prototype.init = function () {
+                var e, n = this,
+                    t = this.editor.config,
+                    o = t.excludeMenus;
+                !1 === (0, u.default)(o) && (o = []), t.menus = (0, s.default)(e = t.menus).call(e,
+                    function (e) {
+                        return !1 === (0, c.default)(o).call(o, e)
+                    }), (0, f.default)(e = t.menus).call(e, function (e) {
+                    var t = n.constructorList[e];
+                    n._initMenuList(e, t)
+                });
+                for (var i = 0, r = (0, d.default)(h.default.globalCustomMenuConstructorList); i < r.length; i++) {
+                    var a = r[i],
+                        l = a[0],
+                        a = a[1];
+                    this._initMenuList(l, a)
+                }
+                this._addToToolbar(), t.showMenuTooltips && this._bindMenuTooltips()
+            }, v.prototype._initMenuList = function (t, e) {
+                var n;
+                null != e && "function" == typeof e && ((0, r.default)(n = this.menuList).call(n,
+                    function (e) {
+                        return e.key === t
+                    }) ? console.warn("菜单名称重复:" + t) : ((e = new e(this.editor)).key = t, this.menuList
+                    .push(e)))
+            }, v.prototype._bindMenuTooltips = function () {
+                var i = this.editor,
+                    r = i.$toolbarElem,
+                    a = i.config.menuTooltipPosition,
+                    l = A.default('<div class="w-e-menu-tooltip w-e-menu-tooltip-' + a +
+                        '">\n            <div class="w-e-menu-tooltip-item-wrapper">\n              <div></div>\n            </div>\n          </div>'
+                    );
+                l.css("visibility", "hidden"), r.append(l), l.css("z-index", i.zIndex.get("tooltip"));
+                var u = 0;
+
+                function s() {
+                    u && clearTimeout(u)
+                }
+
+                function c() {
+                    s(), l.css("visibility", "hidden")
+                }
+                r.on("mouseover", function (e) {
+                    var t, n, o, e = e.target,
+                        e = A.default(e);
+                    e.isContain(r) ? c() : (null != e.parentUntil(".w-e-droplist") ? c() : e.attr(
+                        "data-title") ? (o = e.attr("data-title"), n = e) : null != (t =
+                        e.parentUntil(".w-e-menu")) && (o = t.attr("data-title"), n = t),
+                        o && n ? (s(), t = n.getOffsetData(), l.text(i.i18next.t(
+                            "menus.title." + o)), n = l.getOffsetData(), o = t.left + t
+                            .width / 2 - n.width / 2, l.css("left", o + "px"), "up" === a ?
+                            l.css("top", t.top - n.height - 8 + "px") : "down" === a && l.css(
+                            "top", t.top + t.height + 8 + "px"), u = (0, p.default)(
+                            function () {
+                                l.css("visibility", "visible")
+                            }, 200)) : c())
+                }).on("mouseleave", function () {
+                    c()
+                })
+            }, v.prototype._addToToolbar = function () {
+                var e, t = this.editor.$toolbarElem;
+                (0, f.default)(e = this.menuList).call(e, function (e) {
+                    e = e.$elem;
+                    e && t.append(e)
+                })
+            }, v.prototype.menuFind = function (e) {
+                for (var t = this.menuList, n = 0, o = t.length; n < o; n++)
+                    if (t[n].key === e) return t[n];
+                return t[0]
+            }, v.prototype.changeActive = function () {
+                var e;
+                (0, f.default)(e = this.menuList).call(e, function (e) {
+                    var t;
+                    (0, p.default)((0, a.default)(t = e.tryChangeActive).call(t, e), 100)
+                })
+            }, v);
+
+        function v(e) {
+            this.editor = e, this.menuList = [], this.constructorList = l.default
+        }
+        t.default = n
+    }, function (e, t, n) {
+        n = n(307);
+        e.exports = n
+    }, function (e, t, n) {
+        n(308);
+        n = n(10);
+        e.exports = n.Object.entries
+    }, function (e, t, n) {
+        var o = n(5),
+            i = n(309).entries;
+        o({
+            target: "Object",
+            stat: !0
+        }, {
+            entries: function (e) {
+                return i(e)
+            }
+        })
+    }, function (e, t, n) {
+        var u = n(15),
+            s = n(63),
+            c = n(27),
+            f = n(58).f,
+            n = function (l) {
+                return function (e) {
+                    for (var t, n = c(e), o = s(n), i = o.length, r = 0, a = []; r < i;) t = o[r++], u &&
+                    !f.call(n, t) || a.push(l ? [t, n[t]] : n[t]);
+                    return a
+                }
+            };
+        e.exports = {
+            entries: n(!0),
+            values: n(!1)
+        }
+    }, function (e, t, n) {
+        n = n(311);
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(312),
+            i = Array.prototype;
+        e.exports = function (e) {
+            var t = e.some;
+            return e === i || e instanceof Array && t === i.some ? o : t
+        }
+    }, function (e, t, n) {
+        n(313);
+        n = n(14);
+        e.exports = n("Array").some
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(29).some;
+        o({
+            target: "Array",
+            proto: !0,
+            forced: !n(71)("some")
+        }, {
+            some: function (e) {
+                return i(this, e, 1 < arguments.length ? arguments[1] : void 0)
+            }
+        })
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            i = o.__importDefault(n(315)),
+            r = o.__importDefault(n(316)),
+            a = o.__importDefault(n(321)),
+            l = o.__importDefault(n(326)),
+            u = o.__importDefault(n(327)),
+            s = o.__importDefault(n(328)),
+            c = o.__importDefault(n(329)),
+            f = o.__importDefault(n(331)),
+            d = o.__importDefault(n(333)),
+            p = o.__importDefault(n(334)),
+            h = o.__importDefault(n(337)),
+            A = o.__importDefault(n(338)),
+            v = o.__importDefault(n(339)),
+            m = o.__importDefault(n(350)),
+            g = o.__importDefault(n(364)),
+            y = o.__importDefault(n(368)),
+            w = o.__importDefault(n(136)),
+            x = o.__importDefault(n(377)),
+            _ = o.__importDefault(n(379)),
+            E = o.__importDefault(n(380)),
+            b = o.__importDefault(n(381)),
+            C = o.__importDefault(n(401)),
+            S = o.__importDefault(n(406)),
+            n = o.__importDefault(n(409));
+        t.default = {
+            bold: i.default,
+            head: r.default,
+            italic: l.default,
+            link: a.default,
+            underline: u.default,
+            strikeThrough: s.default,
+            fontName: c.default,
+            fontSize: f.default,
+            justify: d.default,
+            quote: p.default,
+            backColor: h.default,
+            foreColor: A.default,
+            video: v.default,
+            image: m.default,
+            indent: g.default,
+            emoticon: y.default,
+            list: w.default,
+            lineHeight: x.default,
+            undo: _.default,
+            redo: E.default,
+            table: b.default,
+            code: C.default,
+            splitLine: S.default,
+            todo: n.default
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(23)),
+            a = i.__importDefault(n(3)),
+            i = (o = r.default, i.__extends(l, o), l.prototype.clickHandler = function () {
+                var e = this.editor,
+                    t = e.selection.isSelectionEmpty();
+                t && e.selection.createEmptyRange(), e.cmd.do("bold"), t && (e.selection.collapseRange(),
+                    e.selection.restoreSelection())
+            }, l.prototype.tryChangeActive = function () {
+                this.editor.cmd.queryCommandState("bold") ? this.active() : this.unActive()
+            }, l);
+
+        function l(e) {
+            var t = a.default(
+                '<div class="w-e-menu" data-title="加粗">\n                <i class="w-e-icon-bold"></i>\n            </div>'
+            );
+            return o.call(this, t, e) || this
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(26)),
+            a = o(n(30)),
+            d = o(n(4)),
+            l = o(n(317)),
+            u = o(n(55));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var s, o = n(2),
+            i = o.__importDefault(n(24)),
+            p = o.__importDefault(n(3)),
+            c = n(6),
+            h = n(7),
+            o = (s = i.default, o.__extends(f, s), f.prototype.command = function (e) {
+                var t, n = this.editor,
+                    o = n.selection.getSelectionContainerElem();
+                if (o && n.$textElem.equal(o)) this.setMultilineHead(e);
+                else {
+                    if (-1 < (0, r.default)(t = ["OL", "UL", "LI", "TABLE", "TH", "TR", "CODE", "HR"]).call(
+                        t, p.default(o).getNodeName())) return;
+                    n.cmd.do("formatBlock", e)
+                }
+                "<p>" !== e && this.addUidForSelectionElem()
+            }, f.prototype.addUidForSelectionElem = function () {
+                var e = this.editor.selection.getSelectionContainerElem(),
+                    t = c.getRandomCode();
+                p.default(e).attr("id", t)
+            }, f.prototype.addListenerCatalog = function () {
+                var e = this;
+                this.editor.txt.eventHooks.changeEvents.push(function () {
+                    e.getCatalogs()
+                })
+            }, f.prototype.getCatalogs = function () {
+                var e = this.editor,
+                    t = this.editor.$textElem,
+                    e = e.config.onCatalogChange,
+                    t = (0, a.default)(t).call(t, "h1,h2,h3,h4,h5"),
+                    r = [];
+                (0, d.default)(t).call(t, function (e, t) {
+                    var n = p.default(e),
+                        o = n.attr("id"),
+                        i = n.getNodeName(),
+                        e = n.text();
+                    o || (o = c.getRandomCode(), n.attr("id", o)), e && r.push({
+                        tag: i,
+                        id: o,
+                        text: e
+                    })
+                }), (0, l.default)(this.oldCatalogs) !== (0, l.default)(r) && (this.oldCatalogs = r,
+                e && e(r))
+            }, f.prototype.setMultilineHead = function (i) {
+                var r = this,
+                    n = this.editor,
+                    e = n.selection,
+                    t = null === (o = e.getSelectionContainerElem()) || void 0 === o ? void 0 : o.elems[
+                        0],
+                    a = ["IMG", "VIDEO", "TABLE", "TH", "TR", "UL", "OL", "PRE", "HR", "BLOCKQUOTE"],
+                    o = p.default(e.getSelectionStartElem()),
+                    l = p.default(e.getSelectionEndElem());
+                l.elems[0].outerHTML !== p.default(h.EMPTY_P).elems[0].outerHTML || l.elems[0].nextSibling ||
+                (l = l.prev());
+                var u = [];
+                u.push(o.getNodeTop(n));
+                var s = [],
+                    o = null === (o = e.getRange()) || void 0 === o ? void 0 : o.commonAncestorContainer
+                        .childNodes;
+                null != o && (0, d.default)(o).call(o, function (e, t) {
+                    e === u[0].getNode() && s.push(t), e === l.getNodeTop(n).getNode() && s.push(
+                        t)
+                });
+                for (var c = 0; u[c].getNode() !== l.getNodeTop(n).getNode();) {
+                    if (!u[c].elems[0]) return;
+                    var f = p.default(u[c].next().getNode());
+                    u.push(f), c++
+                }
+                null != u && (0, d.default)(u).call(u, function (e, t) {
+                    var n, o;
+                    r.hasTag(e, a) || (n = p.default(i), o = e.parent().getNode(), n.html("" +
+                        e.html()), o.insertBefore(n.getNode(), e.getNode()), e.remove())
+                }), e.createRangeByElems(t.children[s[0]], t.children[s[1]])
+            }, f.prototype.hasTag = function (e, t) {
+                var n = this;
+                if (!e) return !1;
+                if ((0, u.default)(t).call(t, null == e ? void 0 : e.getNodeName())) return !0;
+                var o = !1;
+                return null !== (e = e.children()) && void 0 !== e && (0, d.default)(e).call(e,
+                    function (e) {
+                        o = n.hasTag(p.default(e), t)
+                    }), o
+            }, f.prototype.tryChangeActive = function () {
+                var e = this.editor.cmd.queryCommandValue("formatBlock");
+                /^h/i.test(e) ? this.active() : this.unActive()
+            }, f);
+
+        function f(e) {
+            var t = this,
+                n = p.default('<div class="w-e-menu" data-title="标题"><i class="w-e-icon-header"></i></div>'),
+                o = {
+                    width: 100,
+                    title: "设置标题",
+                    type: "list",
+                    list: [{
+                        $elem: p.default("<h1>H1</h1>"),
+                        value: "<h1>"
+                    }, {
+                        $elem: p.default("<h2>H2</h2>"),
+                        value: "<h2>"
+                    }, {
+                        $elem: p.default("<h3>H3</h3>"),
+                        value: "<h3>"
+                    }, {
+                        $elem: p.default("<h4>H4</h4>"),
+                        value: "<h4>"
+                    }, {
+                        $elem: p.default("<h5>H5</h5>"),
+                        value: "<h5>"
+                    }, {
+                        $elem: p.default("<p>" + e.i18next.t("menus.dropListMenu.head.正文") + "</p>"),
+                        value: "<p>"
+                    }],
+                    clickHandler: function (e) {
+                        t.command(e)
+                    }
+                },
+                t = s.call(this, n, e, o) || this;
+            return e.config.onCatalogChange && (t.oldCatalogs = [], t.addListenerCatalog(), t.getCatalogs()),
+                t
+        }
+        t.default = o
+    }, function (e, t, n) {
+        e.exports = n(318)
+    }, function (e, t, n) {
+        n = n(319);
+        e.exports = n
+    }, function (e, t, n) {
+        n(320);
+        var o = n(10);
+        o.JSON || (o.JSON = {
+            stringify: JSON.stringify
+        }), e.exports = function (e, t, n) {
+            return o.JSON.stringify.apply(null, arguments)
+        }
+    }, function (e, t, n) {
+        function i(e, t, n) {
+            var o = n.charAt(t - 1),
+                t = n.charAt(t + 1);
+            return u.test(e) && !s.test(t) || s.test(e) && !u.test(o) ? "\\u" + e.charCodeAt(0).toString(16) :
+                e
+        }
+        var o = n(5),
+            r = n(28),
+            n = n(12),
+            a = r("JSON", "stringify"),
+            l = /[\uD800-\uDFFF]/g,
+            u = /^[\uD800-\uDBFF]$/,
+            s = /^[\uDC00-\uDFFF]$/,
+            n = n(function () {
+                return '"\\udf06\\ud834"' !== a("\udf06\ud834") || '"\\udead"' !== a("\udead")
+            });
+        a && o({
+            target: "JSON",
+            stat: !0,
+            forced: n
+        }, {
+            stringify: function (e, t, n) {
+                var o = a.apply(null, arguments);
+                return "string" == typeof o ? o.replace(l, i) : o
+            }
+        })
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(35)),
+            a = i.__importDefault(n(3)),
+            l = i.__importDefault(n(322)),
+            u = i.__importDefault(n(133)),
+            s = i.__importDefault(n(31)),
+            c = i.__importDefault(n(324)),
+            i = (o = r.default, i.__extends(f, o), f.prototype.clickHandler = function () {
+                var e, t = this.editor;
+                this.isActive ? (e = t.selection.getSelectionContainerElem()) && this.createPanel(e.text(),
+                    e.attr("href")) : t.selection.isSelectionEmpty() ? this.createPanel("", "") :
+                    this.createPanel(t.selection.getSelectionText(), "")
+            }, f.prototype.createPanel = function (e, t) {
+                t = l.default(this.editor, e, t);
+                new s.default(this, t).create()
+            }, f.prototype.tryChangeActive = function () {
+                var e = this.editor;
+                u.default(e) ? this.active() : this.unActive()
+            }, f);
+
+        function f(e) {
+            var t = a.default('<div class="w-e-menu" data-title="链接"><i class="w-e-icon-link"></i></div>'),
+                n = o.call(this, t, e) || this;
+            return c.default(e), n
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            c = o(n(19));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            f = n(6),
+            d = i.__importDefault(n(3)),
+            p = i.__importDefault(n(133)),
+            h = n(323);
+        t.default = function (a, e, t) {
+            var n, l = f.getRandom("input-link"),
+                u = f.getRandom("input-text"),
+                o = f.getRandom("btn-ok"),
+                i = f.getRandom("btn-del"),
+                r = p.default(a) ? "inline-block" : "none";
+
+            function s() {
+                var e;
+                !p.default(a) || (e = a.selection.getSelectionContainerElem()) && (a.selection.createRangeByElem(
+                    e), a.selection.restoreSelection(), n = e)
+            }
+            return {
+                width: 300,
+                height: 0,
+                tabs: [{
+                    title: a.i18next.t("menus.panelMenus.link.链接"),
+                    tpl: '<div>\n                        <input\n                            id="' +
+                        u +
+                        '"\n                            type="text"\n                            class="block"\n                            value="' +
+                        e + '"\n                            placeholder="' + a.i18next.t(
+                            "menus.panelMenus.link.链接文字") +
+                        '"/>\n                        </td>\n                        <input\n                            id="' +
+                        l +
+                        '"\n                            type="text"\n                            class="block"\n                            value="' +
+                        t + '"\n                            placeholder="' + a.i18next.t("如") +
+                        ' https://..."/>\n                        </td>\n                        <div class="w-e-button-container">\n                            <button type="button" id="' +
+                        o + '" class="right">\n                                ' + a.i18next.t(
+                            "插入") +
+                        '\n                            </button>\n                            <button type="button" id="' +
+                        i + '" class="gray right" style="display:' + r +
+                        '">\n                                ' + a.i18next.t(
+                            "menus.panelMenus.link.取消链接") +
+                        "\n                            </button>\n                        </div>\n                    </div>",
+                    events: [{
+                        selector: "#" + o,
+                        type: "click",
+                        fn: function () {
+                            a.selection.restoreSelection();
+                            var e = a.selection.getSelectionRangeTopNodes()[0].getNode(),
+                                t = window.getSelection(),
+                                n = d.default("#" + l),
+                                o = d.default("#" + u),
+                                n = (0, c.default)(i = n.val()).call(i),
+                                o = (0, c.default)(i = o.val()).call(i),
+                                i = "",
+                                t = null == (i = t && (null == t || !t.isCollapsed) ?
+                                    null === (r = h.insertHtml(t, e)) || void 0 ===
+                                    r ? void 0 : (0, c.default)(r).call(r) : i) ?
+                                    void 0 : i.replace(/<.*?>/g, ""),
+                                r = null !== (e = null == t ? void 0 : t.length) &&
+                                void 0 !== e ? e : 0;
+                            if (r <= o.length && (e = o.substring(0, r), r = o.substring(
+                                r), t === e && (o = i + r)), n) {
+                                o = o || n;
+                                if (function (e, t) {
+                                    if (void 0 !== (t = a.config.linkCheck(e, t))) {
+                                        if (!0 === t) return 1;
+                                        a.config.customAlert(t, "warning")
+                                    }
+                                }(o, n)) return o = o, n = n, p.default(a) && s(),
+                                    a.cmd.do("insertHTML", '<a href="' + n +
+                                        '" target="_blank">' + o + "</a>"), !0
+                            }
+                        }
+                    }, {
+                        selector: "#" + i,
+                        type: "click",
+                        fn: function () {
+                            var e;
+                            return p.default(a) && (s(), e = n.text(), a.cmd.do(
+                                "insertHTML", "<span>" + e + "</span>")), !0
+                        }
+                    }]
+                }]
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+
+        function p(e, t) {
+            for (var n = e, o = e; n.textContent !== t && "P" !== (null == (n = (o = n).parentNode ? null ==
+            n ? void 0 : n.parentNode : n) ? void 0 : n.nodeName););
+            return o
+        }
+
+        function h(e, t) {
+            var n, o = e.nodeName,
+                i = "";
+            return 3 === e.nodeType ? t : (1 === e.nodeType && ((n = e.getAttribute("style")) && (i = i +
+                ' style="' + n + '"'), (n = e.getAttribute("face")) && (i = i + ' face="' + n +
+                '"'), (e = e.getAttribute("color")) && (i = i + ' color="' + e + '"')), "<" + (o =
+                o.toLowerCase()) + i + ">" + t + "</" + o + ">")
+        }
+
+        function A(e, t, n, o) {
+            for (var i, r = null === (i = t.textContent) || void 0 === i ? void 0 : i.substring(n, o), a =
+                t, l = ""; r = l = h(a, null != r ? r : ""), (a = a.parentElement ? null == a ? void 0 :
+                a.parentElement : a).textContent !== e;);
+            return l
+        }
+
+        function v(e, t) {
+            return (0, r.default)(e).call(e, function (e) {
+                t = h(e, t)
+            }), t
+        }(0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.insertHtml = t.createPartHtml = t.makeHtmlString = t.getTopNode = void 0, t.getTopNode = p, t
+            .makeHtmlString = h, t.createPartHtml = A, t.insertHtml = function (e, t) {
+            var n, o = e.anchorNode,
+                i = e.focusNode,
+                r = e.anchorOffset,
+                a = e.focusOffset,
+                l = null !== (c = t.textContent) && void 0 !== c ? c : "",
+                u = function (e) {
+                    var t, n = null !== (t = e.textContent) && void 0 !== t ? t : "",
+                        o = [];
+                    for (;
+                        (null == e ? void 0 : e.textContent) === n;) "P" !== e.nodeName && o.push(e), e =
+                        e.childNodes[0];
+                    return o
+                }(t),
+                e = "",
+                s = "",
+                c = "",
+                t = o,
+                f = i,
+                d = o;
+            if (null != o && o.isEqualNode(null != i ? i : null)) return v(u, A(l, o, r, a));
+            for (o && (e = A(l, o, null != r ? r : 0)), i && (c = A(l, i, 0, a)), o && (t = p(o, l)), i &&
+            (f = p(i, l)), d = null !== (t = null == t ? void 0 : t.nextSibling) && void 0 !== t ?
+                t : o; null == d || !d.isEqualNode(null != f ? f : null);) "#text" === (null == d ?
+                void 0 : d.nodeName) ? s += null == d ? void 0 : d.textContent : (n = null === (n =
+                    null === (n = null == d ? void 0 : d.firstChild) || void 0 === n ? void 0 : n.parentElement
+            ) || void 0 === n ? void 0 : n.innerHTML, d && (s += h(d, null != n ? n : ""))), d =
+                null !== (n = null == d ? void 0 : d.nextSibling) && void 0 !== n ? n : d;
+            return v(u, "" + e + s + c)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2).__importDefault(n(325));
+        t.default = function (e) {
+            o.default(e)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            i = o.__importDefault(n(3)),
+            r = o.__importDefault(n(36));
+
+        function a(n) {
+            var o;
+            return {
+                showLinkTooltip: function (e) {
+                    var t = [{
+                        $elem: i.default("<span>" + n.i18next.t("menus.panelMenus.link.查看链接") +
+                            "</span>"),
+                        onClick: function (e, t) {
+                            t = t.attr("href");
+                            return window.open(t, "_target"), !0
+                        }
+                    }, {
+                        $elem: i.default("<span>" + n.i18next.t("menus.panelMenus.link.取消链接") +
+                            "</span>"),
+                        onClick: function (e, t) {
+                            e.selection.createRangeByElem(t), e.selection.restoreSelection();
+                            t = t.text();
+                            return e.cmd.do("insertHTML", "<span>" + t + "</span>"), !0
+                        }
+                    }];
+                    (o = new r.default(n, e, t)).create()
+                },
+                hideLinkTooltip: function () {
+                    o && (o.remove(), o = null)
+                }
+            }
+        }
+        t.default = function (e) {
+            var t = (n = a(e)).showLinkTooltip,
+                n = n.hideLinkTooltip;
+            e.txt.eventHooks.linkClickEvents.push(t), e.txt.eventHooks.clickEvents.push(n), e.txt.eventHooks
+                .keyupEvents.push(n), e.txt.eventHooks.toolbarClickEvents.push(n), e.txt.eventHooks.menuClickEvents
+                .push(n), e.txt.eventHooks.textScrollEvents.push(n)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(23)),
+            a = i.__importDefault(n(3)),
+            i = (o = r.default, i.__extends(l, o), l.prototype.clickHandler = function () {
+                var e = this.editor,
+                    t = e.selection.isSelectionEmpty();
+                t && e.selection.createEmptyRange(), e.cmd.do("italic"), t && (e.selection.collapseRange(),
+                    e.selection.restoreSelection())
+            }, l.prototype.tryChangeActive = function () {
+                this.editor.cmd.queryCommandState("italic") ? this.active() : this.unActive()
+            }, l);
+
+        function l(e) {
+            var t = a.default(
+                '<div class="w-e-menu" data-title="斜体">\n                <i class="w-e-icon-italic"></i>\n            </div>'
+            );
+            return o.call(this, t, e) || this
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(23)),
+            a = i.__importDefault(n(3)),
+            i = (o = r.default, i.__extends(l, o), l.prototype.clickHandler = function () {
+                var e = this.editor,
+                    t = e.selection.isSelectionEmpty();
+                t && e.selection.createEmptyRange(), e.cmd.do("underline"), t && (e.selection.collapseRange(),
+                    e.selection.restoreSelection())
+            }, l.prototype.tryChangeActive = function () {
+                this.editor.cmd.queryCommandState("underline") ? this.active() : this.unActive()
+            }, l);
+
+        function l(e) {
+            var t = a.default(
+                '<div class="w-e-menu" data-title="下划线">\n                <i class="w-e-icon-underline"></i>\n            </div>'
+            );
+            return o.call(this, t, e) || this
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(23)),
+            a = i.__importDefault(n(3)),
+            i = (o = r.default, i.__extends(l, o), l.prototype.clickHandler = function () {
+                var e = this.editor,
+                    t = e.selection.isSelectionEmpty();
+                t && e.selection.createEmptyRange(), e.cmd.do("strikeThrough"), t && (e.selection.collapseRange(),
+                    e.selection.restoreSelection())
+            }, l.prototype.tryChangeActive = function () {
+                this.editor.cmd.queryCommandState("strikeThrough") ? this.active() : this.unActive()
+            }, l);
+
+        function l(e) {
+            var t = a.default(
+                '<div class="w-e-menu" data-title="删除线">\n                <i class="w-e-icon-strikethrough"></i>\n            </div>'
+            );
+            return o.call(this, t, e) || this
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var i, o = n(2),
+            r = o.__importDefault(n(24)),
+            a = o.__importDefault(n(3)),
+            l = o.__importDefault(n(330)),
+            o = (i = r.default, o.__extends(u, i), u.prototype.command = function (e) {
+                var t, n, o = this.editor,
+                    i = o.selection.isSelectionEmpty(),
+                    r = null === (n = o.selection.getSelectionContainerElem()) || void 0 === n ? void 0 :
+                        n.elems[0];
+                null != r && (t = "p" !== (null == r ? void 0 : r.nodeName.toLowerCase()), n = (null ==
+                r ? void 0 : r.getAttribute("face")) === e, i && (t && !n && (n = o.selection
+                    .getSelectionRangeTopNodes(), o.selection.createRangeByElem(n[0]), o.selection
+                    .moveCursor(n[0].elems[0])), o.selection.setRangeToElem(r), o.selection
+                    .createEmptyRange()), o.cmd.do("fontName", e), i && (o.selection.collapseRange(),
+                    o.selection.restoreSelection()))
+            }, u.prototype.tryChangeActive = function () {}, u);
+
+        function u(e) {
+            var t = this,
+                n = a.default(
+                    '<div class="w-e-menu" data-title="字体">\n                <i class="w-e-icon-font"></i>\n            </div>'
+                ),
+                o = {
+                    width: 100,
+                    title: "设置字体",
+                    type: "list",
+                    list: new l.default(e.config.fontNames).getItemList(),
+                    clickHandler: function (e) {
+                        t.command(e)
+                    }
+                };
+            return t = i.call(this, n, e, o) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a = n(2).__importDefault(n(3)),
+            n = (l.prototype.getItemList = function () {
+                return this.itemList
+            }, l);
+
+        function l(e) {
+            var t = this;
+            this.itemList = [], (0, r.default)(e).call(e, function (e) {
+                t.itemList.push({
+                    $elem: a.default("<p style=\"font-family:'" + e + "'\">" + e + "</p>"),
+                    value: e
+                })
+            })
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var i, o = n(2),
+            r = o.__importDefault(n(24)),
+            a = o.__importDefault(n(3)),
+            l = o.__importDefault(n(332)),
+            o = (i = r.default, o.__extends(u, i), u.prototype.command = function (e) {
+                var t, n, o = this.editor,
+                    i = o.selection.isSelectionEmpty(),
+                    r = null === (n = o.selection.getSelectionContainerElem()) || void 0 === n ? void 0 :
+                        n.elems[0];
+                null != r && (t = "p" !== (null == r ? void 0 : r.nodeName.toLowerCase()), n = (null ==
+                r ? void 0 : r.getAttribute("size")) === e, i && (t && !n && (n = (t = o.selection
+                    .getSelectionRangeTopNodes())[0].elems[0], o.selection.createRangeByElem(
+                    t[0]), o.selection.moveCursor(n), r = n), o.selection.setRangeToElem(r),
+                    o.selection.createEmptyRange()), o.cmd.do("fontSize", e), i && (o.selection
+                    .collapseRange(), o.selection.restoreSelection()))
+            }, u.prototype.tryChangeActive = function () {}, u);
+
+        function u(e) {
+            var t = this,
+                n = a.default(
+                    '<div class="w-e-menu" data-title="字号">\n                <i class="w-e-icon-text-heigh"></i>\n            </div>'
+                ),
+                o = {
+                    width: 160,
+                    title: "设置字号",
+                    type: "list",
+                    list: new l.default(e.config.fontSizes).getItemList(),
+                    clickHandler: function (e) {
+                        t.command(e)
+                    }
+                };
+            return t = i.call(this, n, e, o) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2).__importDefault(n(3)),
+            n = (i.prototype.getItemList = function () {
+                return this.itemList
+            }, i);
+
+        function i(e) {
+            for (var t in this.itemList = [], e) {
+                var n = e[t];
+                this.itemList.push({
+                    $elem: o.default('<p style="font-size:' + t + '">' + n.name + "</p>"),
+                    value: n.value
+                })
+            }
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4)),
+            a = o(n(26));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var l, o = n(2),
+            i = o.__importDefault(n(24)),
+            u = o.__importDefault(n(3)),
+            s = ["LI"],
+            c = ["UL", "BLOCKQUOTE"],
+            o = (l = i.default, o.__extends(f, l), f.prototype.command = function (t) {
+                var e = this.editor,
+                    n = e.selection,
+                    o = n.getSelectionContainerElem();
+                n.saveRange();
+                e = e.selection.getSelectionRangeTopNodes();
+                if (null != o && o.length)
+                    if (this.isSpecialNode(o, e[0]) || this.isSpecialTopNode(e[0])) {
+                        o = this.getSpecialNodeUntilTop(o, e[0]);
+                        if (null == o) return;
+                        u.default(o).css("text-align", t)
+                    } else(0, r.default)(e).call(e, function (e) {
+                        e.css("text-align", t)
+                    });
+                n.restoreSelection()
+            }, f.prototype.getSpecialNodeUntilTop = function (e, t) {
+                for (var n = e.elems[0], o = t.elems[0]; null != n;) {
+                    if (-1 !== (0, a.default)(s).call(s, null == n ? void 0 : n.nodeName)) return n;
+                    if (n.parentNode === o) return n;
+                    n = n.parentNode
+                }
+                return n
+            }, f.prototype.isSpecialNode = function (e, t) {
+                t = this.getSpecialNodeUntilTop(e, t);
+                return null != t && -1 !== (0, a.default)(s).call(s, t.nodeName)
+            }, f.prototype.isSpecialTopNode = function (e) {
+                return null != e && -1 !== (0, a.default)(c).call(c, null === (e = e.elems[0]) || void 0 ===
+                e ? void 0 : e.nodeName)
+            }, f.prototype.tryChangeActive = function () {}, f);
+
+        function f(e) {
+            var t = this,
+                n = u.default(
+                    '<div class="w-e-menu" data-title="对齐"><i class="w-e-icon-paragraph-left"></i></div>'),
+                o = {
+                    width: 100,
+                    title: "对齐方式",
+                    type: "list",
+                    list: [{
+                        $elem: u.default(
+                            '<p>\n                            <i class="w-e-icon-paragraph-left w-e-drop-list-item"></i>\n                            ' +
+                            e.i18next.t("menus.dropListMenu.justify.靠左") +
+                            "\n                        </p>"),
+                        value: "left"
+                    }, {
+                        $elem: u.default(
+                            '<p>\n                            <i class="w-e-icon-paragraph-center w-e-drop-list-item"></i>\n                            ' +
+                            e.i18next.t("menus.dropListMenu.justify.居中") +
+                            "\n                        </p>"),
+                        value: "center"
+                    }, {
+                        $elem: u.default(
+                            '<p>\n                            <i class="w-e-icon-paragraph-right w-e-drop-list-item"></i>\n                            ' +
+                            e.i18next.t("menus.dropListMenu.justify.靠右") +
+                            "\n                        </p>"),
+                        value: "right"
+                    }, {
+                        $elem: u.default(
+                            '<p>\n                            <i class="w-e-icon-paragraph-justify w-e-drop-list-item"></i>\n                            ' +
+                            e.i18next.t("menus.dropListMenu.justify.两端") +
+                            "\n                        </p>"),
+                        value: "justify"
+                    }],
+                    clickHandler: function (e) {
+                        t.command(e)
+                    }
+                };
+            return t = l.call(this, n, e, o) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            l = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var r, o = n(2),
+            u = o.__importDefault(n(3)),
+            i = o.__importDefault(n(23)),
+            a = o.__importDefault(n(335)),
+            s = o.__importDefault(n(336)),
+            c = n(7),
+            o = (r = i.default, o.__extends(f, r), f.prototype.clickHandler = function () {
+                var e = this.editor,
+                    t = e.selection.isSelectionEmpty(),
+                    n = e.selection.getSelectionRangeTopNodes(),
+                    o = n[n.length - 1];
+                if ("BLOCKQUOTE" !== this.getTopNodeName()) {
+                    var i = s.default(n);
+                    i.insertAfter(o), this.delSelectNode(n);
+                    var r = null === (r = i.childNodes()) || void 0 === r ? void 0 : r.last().getNode();
+                    return null == r ? void 0 : (r.textContent ? e.selection.moveCursor(r) : e.selection
+                        .moveCursor(r, 0), this.tryChangeActive(), void u.default(c.EMPTY_P).insertAfter(
+                        i))
+                }
+                var r = u.default(o.childNodes()),
+                    i = r.length,
+                    a = o;
+                (0, l.default)(r).call(r, function (e) {
+                    e = u.default(e);
+                    e.insertAfter(a), a = e
+                }), o.remove(), e.selection.moveCursor(r.elems[i - 1]), this.tryChangeActive(), t &&
+                (e.selection.collapseRange(), e.selection.restoreSelection())
+            }, f.prototype.tryChangeActive = function () {
+                var e;
+                "BLOCKQUOTE" === (null === (e = this.editor.selection.getSelectionRangeTopNodes()[0]) ||
+                void 0 === e ? void 0 : e.getNodeName()) ? this.active(): this.unActive()
+            }, f.prototype.getTopNodeName = function () {
+                var e = this.editor.selection.getSelectionRangeTopNodes()[0];
+                return null == e ? void 0 : e.getNodeName()
+            }, f.prototype.delSelectNode = function (e) {
+                (0, l.default)(e).call(e, function (e) {
+                    e.remove()
+                })
+            }, f);
+
+        function f(e) {
+            var t = u.default(
+                '<div class="w-e-menu" data-title="引用">\n                <i class="w-e-icon-quotes-left"></i>\n            </div>'
+                ),
+                n = r.call(this, t, e) || this;
+            return a.default(e), n
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            r = n(7),
+            a = o.__importDefault(n(3));
+        t.default = function (i) {
+            i.txt.eventHooks.enterDownEvents.push(function (e) {
+                var t, n = i.selection.getSelectionContainerElem(),
+                    o = i.selection.getSelectionRangeTopNodes()[0];
+                "BLOCKQUOTE" === (null == o ? void 0 : o.getNodeName()) && ("BLOCKQUOTE" === n.getNodeName() &&
+                (t = null === (t = n.childNodes()) || void 0 === t ? void 0 : t.getNode(),
+                    i.selection.moveCursor(t)), "" === n.text() && (e.preventDefault(), n.remove(),
+                    (n = a.default(r.EMPTY_P)).insertAfter(o), i.selection.moveCursor(n.getNode(),
+                    0)), "" === o.text() && o.remove())
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a = n(2).__importDefault(n(3));
+        t.default = function (e) {
+            var t = a.default("<blockquote></blockquote>");
+            return (0, r.default)(e).call(e, function (e) {
+                t.append(e.clone(!0))
+            }), t
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(25));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a, o = n(2),
+            i = o.__importDefault(n(24)),
+            l = o.__importDefault(n(3)),
+            u = n(6),
+            o = (a = i.default, o.__extends(s, a), s.prototype.command = function (e) {
+                var t, n = this.editor,
+                    o = n.selection.isSelectionEmpty(),
+                    i = null === (t = n.selection.getSelectionContainerElem()) || void 0 === t ? void 0 :
+                        t.elems[0];
+                null != i && (t = "p" !== (null == i ? void 0 : i.nodeName.toLowerCase()), i = null ==
+                    i ? void 0 : i.style.backgroundColor, i = u.hexToRgb(e) === i, o && (t && !i &&
+                        (i = n.selection.getSelectionRangeTopNodes(), n.selection.createRangeByElem(
+                            i[0]), n.selection.moveCursor(i[0].elems[0])), n.selection.createEmptyRange()
+                    ), n.cmd.do("backColor", e), o && (n.selection.collapseRange(), n.selection.restoreSelection())
+                )
+            }, s.prototype.tryChangeActive = function () {}, s);
+
+        function s(e) {
+            var t = this,
+                n = l.default(
+                    '<div class="w-e-menu" data-title="背景色">\n                <i class="w-e-icon-paint-brush"></i>\n            </div>'
+                ),
+                o = {
+                    width: 120,
+                    title: "背景颜色",
+                    type: "inline-block",
+                    list: (0, r.default)(o = e.config.colors).call(o, function (e) {
+                        return {
+                            $elem: l.default('<i style="color:' + e +
+                                ';" class="w-e-icon-paint-brush"></i>'),
+                            value: e
+                        }
+                    }),
+                    clickHandler: function (e) {
+                        t.command(e)
+                    }
+                };
+            return t = a.call(this, n, e, o) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(25));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a, o = n(2),
+            i = o.__importDefault(n(24)),
+            l = o.__importDefault(n(3)),
+            o = (a = i.default, o.__extends(u, a), u.prototype.command = function (e) {
+                var t, n, o, i = this.editor,
+                    r = i.selection.isSelectionEmpty(),
+                    a = null === (n = i.selection.getSelectionContainerElem()) || void 0 === n ? void 0 :
+                        n.elems[0];
+                null != a && (t = "p" !== (null == a ? void 0 : a.nodeName.toLowerCase()), n = (null ==
+                a ? void 0 : a.getAttribute("color")) === e, r && (t && !n && (o = i.selection
+                    .getSelectionRangeTopNodes(), i.selection.createRangeByElem(o[0]), i.selection
+                    .moveCursor(o[0].elems[0])), i.selection.setRangeToElem(a), i.selection
+                    .createEmptyRange()), o = i.selection.getSelectionText(), "A" === a.nodeName &&
+                a.textContent === o && (o = l.default("<span>&#8203;</span>").getNode(), a.appendChild(
+                    o)), i.cmd.do("foreColor", e), r && (i.selection.collapseRange(), i.selection
+                    .restoreSelection()))
+            }, u.prototype.tryChangeActive = function () {}, u);
+
+        function u(e) {
+            var t = this,
+                n = l.default(
+                    '<div class="w-e-menu" data-title="文字颜色">\n                <i class="w-e-icon-pencil2"></i>\n            </div>'
+                ),
+                o = {
+                    width: 120,
+                    title: "文字颜色",
+                    type: "inline-block",
+                    list: (0, r.default)(o = e.config.colors).call(o, function (e) {
+                        return {
+                            $elem: l.default('<i style="color:' + e +
+                                ';" class="w-e-icon-pencil2"></i>'),
+                            value: e
+                        }
+                    }),
+                    clickHandler: function (e) {
+                        t.command(e)
+                    }
+                };
+            return t = a.call(this, n, e, o) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(3)),
+            a = i.__importDefault(n(31)),
+            l = i.__importDefault(n(35)),
+            u = i.__importDefault(n(340)),
+            s = i.__importDefault(n(346)),
+            i = (o = l.default, i.__extends(c, o), c.prototype.clickHandler = function () {
+                this.createPanel("")
+            }, c.prototype.createPanel = function (e) {
+                e = u.default(this.editor, e);
+                new a.default(this, e).create()
+            }, c.prototype.tryChangeActive = function () {}, c);
+
+        function c(e) {
+            var t = r.default(
+                '<div class="w-e-menu" data-title="视频">\n                <i class="w-e-icon-play"></i>\n            </div>'
+                ),
+                n = o.call(this, t, e) || this;
+            return s.default(e), n
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            u = o(n(19));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            s = n(6),
+            c = i.__importDefault(n(3)),
+            f = i.__importDefault(n(341)),
+            d = n(7);
+        t.default = function (t, e) {
+            var n = t.config,
+                o = new f.default(t),
+                i = s.getRandom("input-iframe"),
+                r = s.getRandom("btn-ok"),
+                a = s.getRandom("input-upload"),
+                l = s.getRandom("btn-local-ok");
+            return l = [{
+                title: t.i18next.t("menus.panelMenus.video.上传视频"),
+                tpl: '<div class="w-e-up-video-container">\n                    <div id="' + l +
+                    '" class="w-e-up-btn">\n                        <i class="w-e-icon-upload2"></i>\n                    </div>\n                    <div style="display:none;">\n                        <input id="' +
+                    a +
+                    '" type="file" accept="video/*"/>\n                    </div>\n                 </div>',
+                events: [{
+                    selector: "#" + l,
+                    type: "click",
+                    fn: function () {
+                        var e = c.default("#" + a).elems[0];
+                        if (!e) return !0;
+                        e.click()
+                    }
+                }, {
+                    selector: "#" + a,
+                    type: "change",
+                    fn: function () {
+                        var e = c.default("#" + a).elems[0];
+                        if (!e) return !0;
+                        e = e.files;
+                        return e.length && o.uploadVideo(e), !0
+                    }
+                }]
+            }, {
+                title: t.i18next.t("menus.panelMenus.video.插入视频"),
+                tpl: '<div>\n                    <input \n                        id="' + i +
+                    '" \n                        type="text" \n                        class="block" \n                        placeholder="' +
+                    t.i18next.t("如") +
+                    '：<iframe src=... ></iframe>"/>\n                    </td>\n                    <div class="w-e-button-container">\n                        <button type="button" id="' +
+                    r + '" class="right">\n                            ' + t.i18next.t("插入") +
+                    "\n                        </button>\n                    </div>\n                </div>",
+                events: [{
+                    selector: "#" + r,
+                    type: "click",
+                    fn: function () {
+                        var e = c.default("#" + i),
+                            e = (0, u.default)(e = e.val()).call(e);
+                        if (e && function (e) {
+                            if (!0 === (e = t.config.onlineVideoCheck(e)))
+                                return 1;
+                            "string" == typeof e && t.config.customAlert(e,
+                                "error")
+                        }(e)) return e = e, t.cmd.do("insertHTML", e + d.EMPTY_P),
+                            t.config.onlineVideoCallback(e), !0
+                    }
+                }]
+            }], r = {
+                width: 300,
+                height: 0,
+                tabs: []
+            }, window.FileReader && (n.uploadVideoServer || n.customUploadVideo) && r.tabs.push(l[0]),
+            n.showLinkVideo && r.tabs.push(l[1]), r
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            w = o(n(131)),
+            x = o(n(56)),
+            _ = o(n(4)),
+            E = o(n(26));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            b = n(6),
+            C = i.__importDefault(n(134)),
+            S = i.__importDefault(n(135)),
+            r = n(7),
+            a = n(6),
+            n = (l.prototype.uploadVideo = function (e) {
+                var o, i, r, a, l, t, n, u, s, c, f, d, p, h, A, v, m, g, y = this;
+                e.length && (o = this.editor, i = o.config, r = function (e) {
+                        return o.i18next.t("validate." + e)
+                    }, v = i.uploadVideoServer, a = i.uploadVideoMaxSize / 1024, l = i.uploadVideoName,
+                        t = i.uploadVideoParams, n = i.uploadVideoParamsWithUrl, u = i.uploadVideoHeaders,
+                        s = i.uploadVideoHooks, c = i.uploadVideoTimeout, g = i.withVideoCredentials, f =
+                        i.customUploadVideo, d = i.uploadVideoAccept, p = [], h = [], b.arrForEach(e,
+                        function (e) {
+                            var t = e.name,
+                                n = e.size / 1024 / 1024;
+                            t && n && (d instanceof Array ? (0, w.default)(d).call(d, function (e) {
+                                return e === t.split(".")[t.split(".").length - 1]
+                            }) ? a < n ? h.push("【" + t + "】" + r("大于") + " " + a + "M") :
+                                p.push(e) : h.push("【" + t + "】" + r("不是视频")) : h.push("【" + d +
+                                "】" + r("uploadVideoAccept 不是Array")))
+                        }), h.length ? i.customAlert(r("视频验证未通过") + ": \n" + h.join("\n"),
+                        "warning") : 0 !== p.length ? f && "function" == typeof f ? f(p, (0, x.default)
+                    (m = this.insertVideo).call(m, this)) : (A = new FormData, (0, _.default)(p)
+                        .call(p, function (e, t) {
+                            var n = l || e.name;
+                            1 < p.length && (n += t + 1), A.append(n, e)
+                        }), v && (v = (m = v.split("#"))[0], m = m[1] || "", (0, _.default)(b).call(
+                        b, t,
+                        function (e, t) {
+                            n && (0 < (0, E.default)(v).call(v, "?") ? v += "&" : v += "?",
+                                v = v + e + "=" + t), A.append(e, t)
+                        }), m && (v += "#" + m), "string" == typeof (g = C.default(v, {
+                        timeout: c,
+                        formData: A,
+                        headers: u,
+                        withCredentials: !!g,
+                        beforeSend: function (e) {
+                            if (s.before) return s.before(e, o, p)
+                        },
+                        onTimeout: function (e) {
+                            i.customAlert(r("上传视频超时"), "error"), s.timeout && s
+                                .timeout(e, o)
+                        },
+                        onProgress: function (e, t) {
+                            var n = new S.default(o);
+                            t.lengthComputable && (e = t.loaded / t.total, n.show(
+                                e))
+                        },
+                        onError: function (e) {
+                            i.customAlert(r("上传视频错误"), "error", r("上传视频错误") +
+                                "，" + r("服务器返回状态") + ": " + e.status), s.error &&
+                            s.error(e, o)
+                        },
+                        onFail: function (e, t) {
+                            i.customAlert(r("上传视频失败"), "error", r("上传视频返回结果错误") +
+                                ("，" + r("返回结果")) + ": " + t), s.fail && s.fail(
+                                e, o, t)
+                        },
+                        onSuccess: function (e, t) {
+                            if (s.customInsert) s.customInsert((0, x.default)(n =
+                                y.insertVideo).call(n, y), t, o);
+                            else {
+                                if ("0" != t.errno) return i.customAlert(r(
+                                    "上传视频失败"), "error", r(
+                                    "上传视频返回结果错误") + "，" + r("返回结果") +
+                                    " errno=" + t.errno), void(s.fail &&
+                                    s.fail(e, o, t));
+                                var n = t.data;
+                                y.insertVideo(n.url), s.success && s.success(e,
+                                    o, t)
+                            }
+                        }
+                    })) && i.customAlert(g, "error"))) : i.customAlert(r("传入的文件不合法"), "warning")
+                )
+            }, l.prototype.insertVideo = function (e) {
+                function t(e, t) {
+                    return o.i18next.t((t = void 0 === t ? "validate." : t) + e)
+                }
+                var n, o = this.editor,
+                    i = o.config;
+                i.customInsertVideo ? i.customInsertVideo(e) : (a.UA.isFirefox ? o.cmd.do("insertHTML",
+                    '<p data-we-video-p="true"><video src="' + e +
+                    '" controls="controls" style="max-width:100%"></video></p><p>&#8203</p>') :
+                    o.cmd.do("insertHTML", '<video src="' + e +
+                        '" controls="controls" style="max-width:100%"></video>' + r.EMPTY_P), (n =
+                    document.createElement("video")).onload = function () {
+                    n = null
+                }, n.onerror = function () {
+                    i.customAlert(t("插入视频错误"), "error", "wangEditor: " + t("插入视频错误") + "，" + t(
+                        "视频链接") + ' "' + e + '"，' + t("下载链接失败")), n = null
+                }, n.onabort = function () {
+                    return n = null
+                }, n.src = e)
+            }, l);
+
+        function l(e) {
+            this.editor = e
+        }
+        t.default = n
+    }, function (e, t, n) {
+        e.exports = n(343)
+    }, function (e, t, n) {
+        n = n(344);
+        e.exports = n
+    }, function (e, t, n) {
+        n(345);
+        n = n(10);
+        e.exports = n.Date.now
+    }, function (e, t, n) {
+        n(5)({
+            target: "Date",
+            stat: !0
+        }, {
+            now: function () {
+                return (new Date).getTime()
+            }
+        })
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            i = o.__importDefault(n(347)),
+            r = o.__importDefault(n(349));
+        t.default = function (e) {
+            i.default(e), r.default(e)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.createShowHideFn = void 0;
+        var o = n(2),
+            r = o.__importDefault(n(3)),
+            a = o.__importDefault(n(36)),
+            l = o.__importDefault(n(348));
+
+        function i(n) {
+            function o(e, t) {
+                return n.i18next.t((t = void 0 === t ? "" : t) + e)
+            }
+            var i;
+            return {
+                showVideoTooltip: function (e) {
+                    var t = [{
+                        $elem: r.default("<span class='w-e-icon-trash-o'></span>"),
+                        onClick: function (e, t) {
+                            return t.remove(), !0
+                        }
+                    }, {
+                        $elem: r.default("<span>100%</span>"),
+                        onClick: function (e, t) {
+                            return t.attr("width", "100%"), t.removeAttr("height"), !0
+                        }
+                    }, {
+                        $elem: r.default("<span>50%</span>"),
+                        onClick: function (e, t) {
+                            return t.attr("width", "50%"), t.removeAttr("height"), !0
+                        }
+                    }, {
+                        $elem: r.default("<span>30%</span>"),
+                        onClick: function (e, t) {
+                            return t.attr("width", "30%"), t.removeAttr("height"), !0
+                        }
+                    }, {
+                        $elem: r.default("<span>" + o("重置") + "</span>"),
+                        onClick: function (e, t) {
+                            return t.removeAttr("width"), t.removeAttr("height"), !0
+                        }
+                    }, {
+                        $elem: r.default("<span>" + o("menus.justify.靠左") + "</span>"),
+                        onClick: function (e, t) {
+                            return l.default(t, "left"), !0
+                        }
+                    }, {
+                        $elem: r.default("<span>" + o("menus.justify.居中") + "</span>"),
+                        onClick: function (e, t) {
+                            return l.default(t, "center"), !0
+                        }
+                    }, {
+                        $elem: r.default("<span>" + o("menus.justify.靠右") + "</span>"),
+                        onClick: function (e, t) {
+                            return l.default(t, "right"), !0
+                        }
+                    }];
+                    (i = new a.default(n, e, t)).create()
+                },
+                hideVideoTooltip: function () {
+                    i && (i.remove(), i = null)
+                }
+            }
+        }
+        t.createShowHideFn = i, t.default = function (e) {
+            var t = (n = i(e)).showVideoTooltip,
+                n = n.hideVideoTooltip;
+            e.txt.eventHooks.videoClickEvents.push(t), e.txt.eventHooks.clickEvents.push(n), e.txt.eventHooks
+                .keyupEvents.push(n), e.txt.eventHooks.toolbarClickEvents.push(n), e.txt.eventHooks.menuClickEvents
+                .push(n), e.txt.eventHooks.textScrollEvents.push(n), e.txt.eventHooks.changeEvents.push(
+                n)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(55));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a = n(2).__importDefault(n(3));
+        t.default = function (e, t) {
+            (e = function (e, t) {
+                var n, o = e.elems[0];
+                for (; null != o;) {
+                    if ((0, r.default)(t).call(t, null == o ? void 0 : o.nodeName)) return o;
+                    if ("BODY" === (null === (n = null == o ? void 0 : o.parentNode) || void 0 ===
+                    n ? void 0 : n.nodeName)) return null;
+                    o = o.parentNode
+                }
+                return o
+            }(e, ["P"])) && a.default(e).css("text-align", t)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(6);
+        t.default = function (n) {
+            var e, o;
+            i.UA.isFirefox && (e = n.txt, o = n.selection, e.eventHooks.keydownEvents.push(function (e) {
+                var t = o.getSelectionContainerElem();
+                !t || (t = (t = t.getNodeTop(n)).length && t.prev().length ? t.prev() :
+                    null) && t.attr("data-we-video-p") && 0 === o.getCursorPos() && 8 ===
+                e.keyCode && t.remove()
+            }))
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(25));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a, o = n(2),
+            l = n(7),
+            u = o.__importDefault(n(3)),
+            s = o.__importDefault(n(31)),
+            i = o.__importDefault(n(35)),
+            c = o.__importDefault(n(351)),
+            f = o.__importDefault(n(363)),
+            o = (a = i.default, o.__extends(d, a), d.prototype.clickHandler = function () {
+                this.imgPanelConfig.onlyUploadConf || this.createPanel()
+            }, d.prototype.createPanel = function () {
+                var e = this.imgPanelConfig,
+                    e = new s.default(this, e);
+                this.setPanel(e), e.create()
+            }, d.prototype.tryChangeActive = function () {}, d);
+
+        function d(e) {
+            var t, n = this,
+                o = u.default('<div class="w-e-menu" data-title="图片"><i class="w-e-icon-image"></i></div>'),
+                i = f.default(e);
+            return i.onlyUploadConf && (o = i.onlyUploadConf.$elem, (0, r.default)(t = i.onlyUploadConf.events)
+                .call(t, function (e) {
+                    var t = e.type,
+                        n = e.fn || l.EMPTY_FN;
+                    o.on(t, function (e) {
+                        e.stopPropagation(), n(e)
+                    })
+                })), (n = a.call(this, o, e) || this).imgPanelConfig = i, c.default(e), n
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            i = o.__importDefault(n(352)),
+            r = o.__importDefault(n(353)),
+            a = o.__importDefault(n(354)),
+            l = o.__importDefault(n(362));
+        t.default = function (e) {
+            i.default(e), r.default(e), a.default(e), l.default(e)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            r = n(128),
+            a = o.__importDefault(n(97));
+
+        function i(e, t) {
+            var n, o, i;
+            ! function (e) {
+                for (var t = (null === (e = e.clipboardData) || void 0 === e ? void 0 : e.types) || [], n =
+                    0; n < t.length; n++)
+                    if ("Files" === t[n]) return 1
+            }(e) && (o = e, n = (i = (n = t).config).pasteFilterStyle, i = i.pasteIgnoreImg, r.getPasteHtml(
+                o, n, i) || r.getPasteText(o)) || (e = r.getPasteImgs(e)).length && new a.default(t).uploadImg(
+                e)
+        }
+        t.default = function (t) {
+            t.txt.eventHooks.pasteEvents.unshift(function (e) {
+                i(e, t)
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2).__importDefault(n(97));
+        t.default = function (t) {
+            t.txt.eventHooks.dropEvents.push(function (e) {
+                (e = e.dataTransfer && e.dataTransfer.files) && e.length && new o.default(t).uploadImg(
+                    e)
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            g = o(n(30)),
+            y = o(n(355));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.createShowHideFn = void 0;
+        var w = n(2).__importDefault(n(3));
+        n(360);
+        var l = n(6);
+
+        function x(e, t, n, o, i) {
+            e.attr("style", "width:" + t + "px; height:" + n + "px; left:" + o + "px; top:" + i + "px;")
+        }
+
+        function r(e) {
+            var A, t, n, v, m, r = e.$textContainerElem,
+                a = (t = r, (n = w.default(
+                    '<div class="w-e-img-drag-mask">\n            <div class="w-e-img-drag-show-size"></div>\n            <div class="w-e-img-drag-rb"></div>\n         </div>'
+                )).hide(), t.append(n), n);
+
+            function o() {
+                (0, g.default)(r).call(r, ".w-e-img-drag-mask").hide()
+            }
+            return m = r, (v = a).on("click", function (e) {
+                e.stopPropagation()
+            }), v.on("mousedown", ".w-e-img-drag-rb", function (e) {
+                var t, n, o, i, r, a, l, u, s, c, f;
+
+                function d() {
+                    f.off("mousemove", p), f.off("mouseup", h)
+                }
+
+                function p(e) {
+                    e.stopPropagation(), e.preventDefault(), s = i + (e.clientX - t), c = r + (e.clientY -
+                        n), s / c != u && (c = s / u), s = (0, y.default)(s.toFixed(2)), c = (0,
+                        y.default)(c.toFixed(2)), (0, g.default)(v).call(v,
+                        ".w-e-img-drag-show-size").text(s.toFixed(2).replace(".00", "") +
+                        "px * " + c.toFixed(2).replace(".00", "") + "px"), x(v, s, c, a, l)
+                }
+
+                function h() {
+                    A.attr("width", s + ""), A.attr("height", c + "");
+                    var e = A.getBoundingClientRect();
+                    x(v, s, c, e.left - o.left, e.top - o.top), d()
+                }
+                e.preventDefault(), A && (t = e.clientX, n = e.clientY, o = m.getBoundingClientRect(),
+                    e = A.getBoundingClientRect(), i = e.width, r = e.height, a = e.left - o.left,
+                    l = e.top - o.top, u = i / r, s = i, c = r, (f = w.default(document)).on(
+                    "mousemove", p), f.on("mouseup", h), f.on("mouseleave", d))
+            }), w.default(document).on("click", o), e.beforeDestroy(function () {
+                w.default(document).off("click", o)
+            }), {
+                showDrag: function (e) {
+                    if (l.UA.isIE()) return !1;
+                    var t, n, o, i;
+                    e && (n = a, o = A = e, i = (t = r).getBoundingClientRect(), e = o.getBoundingClientRect(),
+                        t = e.width.toFixed(2), o = e.height.toFixed(2), (0, g.default)(n).call(
+                        n, ".w-e-img-drag-show-size").text(t + "px * " + o + "px"), x(n, (0,
+                        y.default)(t), (0, y.default)(o), e.left - i.left, e.top - i.top),
+                        n.show())
+                },
+                hideDrag: o
+            }
+        }
+        t.createShowHideFn = r, t.default = function (e) {
+            var t = (n = r(e)).showDrag,
+                n = n.hideDrag;
+            e.txt.eventHooks.imgClickEvents.push(t), e.txt.eventHooks.textScrollEvents.push(n), e.txt.eventHooks
+                .keyupEvents.push(n), e.txt.eventHooks.toolbarClickEvents.push(n), e.txt.eventHooks.menuClickEvents
+                .push(n), e.txt.eventHooks.changeEvents.push(n)
+        }
+    }, function (e, t, n) {
+        e.exports = n(356)
+    }, function (e, t, n) {
+        n = n(357);
+        e.exports = n
+    }, function (e, t, n) {
+        n(358);
+        n = n(10);
+        e.exports = n.parseFloat
+    }, function (e, t, n) {
+        var o = n(5),
+            n = n(359);
+        o({
+            global: !0,
+            forced: parseFloat != n
+        }, {
+            parseFloat: n
+        })
+    }, function (e, t, n) {
+        var o = n(8),
+            i = n(92).trim,
+            n = n(72),
+            r = o.parseFloat,
+            n = 1 / r(n + "-0") != -1 / 0;
+        e.exports = n ? function (e) {
+            var t = i(String(e)),
+                e = r(t);
+            return 0 === e && "-" == t.charAt(0) ? -0 : e
+        } : r
+    }, function (e, t, n) {
+        var o = n(21),
+            i = n(361),
+            n = {
+                insert: "head",
+                singleton: !1
+            };
+        o(i = "string" == typeof (i = i.__esModule ? i.default : i) ? [[e.i, i, ""]] : i, n);
+        e.exports = i.locals || {}
+    }, function (e, t, n) {
+        (t = n(22)(!1)).push([e.i,
+            ".w-e-text-container {\n  overflow: hidden;\n}\n.w-e-img-drag-mask {\n  position: absolute;\n  z-index: 1;\n  border: 1px dashed #ccc;\n  box-sizing: border-box;\n}\n.w-e-img-drag-mask .w-e-img-drag-rb {\n  position: absolute;\n  right: -5px;\n  bottom: -5px;\n  width: 16px;\n  height: 16px;\n  border-radius: 50%;\n  background: #ccc;\n  cursor: se-resize;\n}\n.w-e-img-drag-mask .w-e-img-drag-show-size {\n  min-width: 110px;\n  height: 22px;\n  line-height: 22px;\n  font-size: 14px;\n  color: #999;\n  position: absolute;\n  left: 0;\n  top: 0;\n  background-color: #999;\n  color: #fff;\n  border-radius: 2px;\n  padding: 0 5px;\n}\n",
+            ""]), e.exports = t
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.createShowHideFn = void 0;
+        var o = n(2),
+            r = o.__importDefault(n(3)),
+            a = o.__importDefault(n(36));
+
+        function i(n) {
+            function o(e, t) {
+                return n.i18next.t((t = void 0 === t ? "" : t) + e)
+            }
+            var i;
+            return {
+                showImgTooltip: function (e) {
+                    var t = [{
+                        $elem: r.default("<span class='w-e-icon-trash-o'></span>"),
+                        onClick: function (e, t) {
+                            return e.selection.createRangeByElem(t), e.selection.restoreSelection(),
+                                e.cmd.do("delete"), !0
+                        }
+                    }, {
+                        $elem: r.default("<span>30%</span>"),
+                        onClick: function (e, t) {
+                            return t.attr("width", "30%"), t.removeAttr("height"), !0
+                        }
+                    }, {
+                        $elem: r.default("<span>50%</span>"),
+                        onClick: function (e, t) {
+                            return t.attr("width", "50%"), t.removeAttr("height"), !0
+                        }
+                    }, {
+                        $elem: r.default("<span>100%</span>"),
+                        onClick: function (e, t) {
+                            return t.attr("width", "100%"), t.removeAttr("height"), !0
+                        }
+                    }];
+                    t.push({
+                        $elem: r.default("<span>" + o("重置") + "</span>"),
+                        onClick: function (e, t) {
+                            return t.removeAttr("width"), t.removeAttr("height"), !0
+                        }
+                    }), e.attr("data-href") && t.push({
+                        $elem: r.default("<span>" + o("查看链接") + "</span>"),
+                        onClick: function (e, t) {
+                            t = t.attr("data-href");
+                            return t && (t = decodeURIComponent(t), window.open(t,
+                                "_target")), !0
+                        }
+                    }), (i = new a.default(n, e, t)).create()
+                },
+                hideImgTooltip: function () {
+                    i && (i.remove(), i = null)
+                }
+            }
+        }
+        t.createShowHideFn = i, t.default = function (e) {
+            var t = (n = i(e)).showImgTooltip,
+                n = n.hideImgTooltip;
+            e.txt.eventHooks.imgClickEvents.push(t), e.txt.eventHooks.clickEvents.push(n), e.txt.eventHooks
+                .keyupEvents.push(n), e.txt.eventHooks.toolbarClickEvents.push(n), e.txt.eventHooks.menuClickEvents
+                .push(n), e.txt.eventHooks.textScrollEvents.push(n), e.txt.eventHooks.imgDragBarMouseDownEvents
+                .push(n), e.txt.eventHooks.changeEvents.push(n)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            A = o(n(25)),
+            v = o(n(19));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            m = i.__importDefault(n(3)),
+            g = n(6),
+            y = i.__importDefault(n(97));
+        t.default = function (n) {
+            function e(e, t) {
+                return n.i18next.t((t = void 0 === t ? "menus.panelMenus.image." : t) + e)
+            }
+            var o = n.config,
+                i = new y.default(n),
+                r = g.getRandom("up-trigger-id"),
+                a = g.getRandom("up-file-id"),
+                l = g.getRandom("input-link-url"),
+                u = g.getRandom("input-link-url-alt"),
+                s = g.getRandom("input-link-url-href"),
+                t = g.getRandom("btn-link");
+
+            function c(e, t, n) {
+                return '<div class="' + e + '" data-title="' + n + '">\n            <div id="' + r +
+                    '" class="w-e-up-btn">\n                <i class="' + t +
+                    '"></i>\n            </div>\n            <div style="display:none;">\n                <input id="' +
+                    a + '" type="file" ' + f + ' accept="' + d +
+                    '"/>\n            </div>\n        </div>'
+            }
+            var f = 1 === o.uploadImgMaxLength ? "" : 'multiple="multiple"',
+                d = (0, A.default)(h = o.uploadImgAccept).call(h, function (e) {
+                    return "image/" + e
+                }).join(","),
+                p = [{
+                    selector: "#" + r,
+                    type: "click",
+                    fn: function () {
+                        var e = o.uploadImgFromMedia;
+                        if (e && "function" == typeof e) return e(), !0;
+                        e = m.default("#" + a).elems[0];
+                        if (!e) return !0;
+                        e.click()
+                    }
+                }, {
+                    selector: "#" + a,
+                    type: "change",
+                    fn: function () {
+                        var e = m.default("#" + a).elems[0];
+                        if (!e) return !0;
+                        e = e.files;
+                        return null != e && e.length && i.uploadImg(e), !0
+                    }
+                }],
+                h = ['<input\n            id="' + l +
+                '"\n            type="text"\n            class="block"\n            placeholder="' +
+                e("图片地址") + '"/>'];
+            return o.showLinkImgAlt && h.push('\n        <input\n            id="' + u +
+                '"\n            type="text"\n            class="block"\n            placeholder="' +
+                e("图片文字说明") + '"/>'), o.showLinkImgHref && h.push(
+                '\n        <input\n            id="' + s +
+                '"\n            type="text"\n            class="block"\n            placeholder="' +
+                e("跳转链接") + '"/>'), t = [{
+                title: e("上传图片"),
+                tpl: c("w-e-up-img-container", "w-e-icon-upload2", ""),
+                events: p
+            }, {
+                title: e("网络图片"),
+                tpl: "<div>\n                    " + h.join("") +
+                    '\n                    <div class="w-e-button-container">\n                        <button type="button" id="' +
+                    t + '" class="right">' + e("插入", "") +
+                    "</button>\n                    </div>\n                </div>",
+                events: [{
+                    selector: "#" + t,
+                    type: "click",
+                    fn: function () {
+                        var e, t, n = m.default("#" + l),
+                            n = (0, v.default)(n = n.val()).call(n);
+                        if (n && (o.showLinkImgAlt && (e = (0, v.default)(e = m.default(
+                            "#" + u).val()).call(e)), o.showLinkImgHref &&
+                        (t = (0, v.default)(t = m.default("#" + s).val()).call(
+                            t)),
+                            function (e) {
+                                if (!0 === (e = o.linkImgCheck(e))) return 1;
+                                "string" == typeof e && o.customAlert(e,
+                                    "error")
+                            }(n))) return i.insertImg(n, e, t), !0
+                    }
+                }]
+            }], p = {
+                width: 300,
+                height: 0,
+                tabs: [],
+                onlyUploadConf: {
+                    $elem: m.default(c("w-e-menu", "w-e-icon-image", "图片")),
+                    events: p
+                }
+            }, window.FileReader && (o.uploadImgShowBase64 || o.uploadImgServer || o.customUploadImg ||
+                o.uploadImgFromMedia) && p.tabs.push(t[0]), o.showLinkImg && (p.tabs.push(t[1]), p.onlyUploadConf =
+                void 0), p
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a, o = n(2),
+            l = o.__importDefault(n(3)),
+            i = o.__importDefault(n(24)),
+            u = o.__importDefault(n(365)),
+            o = (a = i.default, o.__extends(s, a), s.prototype.command = function (t) {
+                var e, n = this.editor,
+                    o = n.selection.getSelectionContainerElem();
+                o && n.$textElem.equal(o) ? 0 < (e = n.selection.getSelectionRangeTopNodes()).length &&
+                    (0, r.default)(e).call(e, function (e) {
+                        u.default(l.default(e), t, n)
+                    }) : o && 0 < o.length && (0, r.default)(o).call(o, function (e) {
+                    u.default(l.default(e), t, n)
+                }), n.selection.restoreSelection(), this.tryChangeActive()
+            }, s.prototype.tryChangeActive = function () {
+                var e = this.editor,
+                    t = e.selection.getSelectionStartElem(),
+                    e = l.default(t).getNodeTop(e);
+                e.length <= 0 || ("" != e.elems[0].style.paddingLeft ? this.active() : this.unActive())
+            }, s);
+
+        function s(e) {
+            var t = this,
+                n = l.default(
+                    '<div class="w-e-menu" data-title="缩进">\n                <i class="w-e-icon-indent-increase"></i>\n            </div>'
+                ),
+                o = {
+                    width: 130,
+                    title: "设置缩进",
+                    type: "list",
+                    list: [{
+                        $elem: l.default(
+                            '<p>\n                            <i class="w-e-icon-indent-increase w-e-drop-list-item"></i>\n                            ' +
+                            e.i18next.t("menus.dropListMenu.indent.增加缩进") +
+                            "\n                        <p>"),
+                        value: "increase"
+                    }, {
+                        $elem: l.default(
+                            '<p>\n                            <i class="w-e-icon-indent-decrease w-e-drop-list-item"></i>\n                            ' +
+                            e.i18next.t("menus.dropListMenu.indent.减少缩进") +
+                            "\n                        <p>"),
+                        value: "decrease"
+                    }],
+                    clickHandler: function (e) {
+                        t.command(e)
+                    }
+                };
+            return t = a.call(this, n, e, o) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(44)),
+            a = o(n(19));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            l = i.__importDefault(n(366)),
+            u = i.__importDefault(n(367)),
+            s = /^(\d+)(\w+)$/,
+            c = /^(\d+)%$/;
+
+        function f(e) {
+            var t = e.config.indentation;
+            if ("string" == typeof t) {
+                if (s.test(t)) {
+                    var e = (0, r.default)(n = (0, a.default)(t).call(t).match(s)).call(n, 1, 3),
+                        n = e[0],
+                        e = e[1];
+                    return {
+                        value: Number(n),
+                        unit: e
+                    }
+                }
+                if (c.test(t)) return {
+                    value: Number((0, a.default)(t).call(t).match(c)[1]),
+                    unit: "%"
+                }
+            } else if (void 0 !== t.value && t.unit) return t;
+            return {
+                value: 2,
+                unit: "em"
+            }
+        }
+        t.default = function (e, t, n) {
+            e = e.getNodeTop(n), /^P$/i.test(e.getNodeName()) && ("increase" === t ? l.default(e, f(n)) :
+                "decrease" === t && u.default(e, f(n)))
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(44));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.default = function (e, t) {
+            var n = e.elems[0];
+            "" === n.style.paddingLeft ? e.css("padding-left", t.value + t.unit) : (n = n.style.paddingLeft,
+                n = (0, r.default)(n).call(n, 0, n.length - t.unit.length), n = Number(n) + t.value,
+                e.css("padding-left", "" + n + t.unit))
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(44));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.default = function (e, t) {
+            var n = e.elems[0];
+            "" !== n.style.paddingLeft && (n = n.style.paddingLeft, n = (0, r.default)(n).call(n, 0, n.length -
+                t.unit.length), 0 < (n = Number(n) - t.value) ? e.css("padding-left", "" + n +
+                t.unit) : e.css("padding-left", ""))
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(3)),
+            a = i.__importDefault(n(35)),
+            l = i.__importDefault(n(31)),
+            u = i.__importDefault(n(369)),
+            i = (o = a.default, i.__extends(s, o), s.prototype.createPanel = function () {
+                var e = u.default(this.editor);
+                new l.default(this, e).create()
+            }, s.prototype.clickHandler = function () {
+                this.createPanel()
+            }, s.prototype.tryChangeActive = function () {}, s);
+
+        function s(e) {
+            var t = r.default(
+                '<div class="w-e-menu" data-title="表情">\n                <i class="w-e-icon-happy"></i>\n            </div>'
+            );
+            return o.call(this, t, e) || this
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(25)),
+            a = o(n(74)),
+            l = o(n(19));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var u = n(2).__importDefault(n(3));
+        t.default = function (o) {
+            var e = o.config.emotions;
+            return {
+                width: 300,
+                height: 230,
+                tabs: (0, r.default)(e).call(e, function (e) {
+                    return {
+                        title: o.i18next.t("menus.panelMenus.emoticon." + e.title),
+                        tpl: "<div>" + (n = [], (n = "image" == (t = e).type ? (n = (0, r.default)
+                        (e = t.content).call(e, function (e) {
+                            return "string" == typeof e ? "" :
+                                '<span  title="' + e.alt +
+                                '">\n                    <img class="eleImg" data-emoji="' +
+                                e.alt + '" style src="' + e.src +
+                                '" alt="[' + e.alt +
+                                ']">\n                </span>'
+                        }), (0, a.default)(n).call(n, function (e) {
+                            return "" !== e
+                        })) : (0, r.default)(t = t.content).call(t, function (e) {
+                            return '<span class="eleImg" title="' + e + '">' +
+                                e + "</span>"
+                        })).join("").replace(/&nbsp;/g, "")) + "</div>",
+                        events: [{
+                            selector: ".eleImg",
+                            type: "click",
+                            fn: function (e) {
+                                var t = u.default(e.target);
+                                return t = "IMG" === t.getNodeName() ? (0, l.default)
+                                (e = t.parent().html()).call(e) : "<span>" + t.html() +
+                                    "</span>", o.cmd.do("insertHTML", t), !0
+                            }
+                        }]
+                    };
+                    var t, n
+                })
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.createListHandle = t.ClassType = void 0;
+        var o, i = n(2),
+            r = i.__importDefault(n(3)),
+            a = i.__importDefault(n(371)),
+            l = i.__importDefault(n(373)),
+            u = i.__importDefault(n(374)),
+            s = i.__importDefault(n(375)),
+            i = i.__importDefault(n(376));
+        (n = o = t.ClassType || (t.ClassType = {})).Wrap = "WrapListHandle", n.Join = "JoinListHandle", n.StartJoin =
+            "StartJoinListHandle", n.EndJoin = "EndJoinListHandle", n.Other = "OtherListHandle";
+        var c = {
+            WrapListHandle: a.default,
+            JoinListHandle: l.default,
+            StartJoinListHandle: u.default,
+            EndJoinListHandle: s.default,
+            OtherListHandle: i.default
+        };
+        t.createListHandle = function (e, t, n) {
+            if (e === o.Other && void 0 === n) throw new Error("other 类需要传入 range");
+            return e !== o.Other ? new c[e](t) : new c[e](t, n)
+        };
+        f.prototype.getSelectionRangeElem = function () {
+            return r.default(this.handle.selectionRangeElem.get())
+        }, i = f;
+
+        function f(e) {
+            this.handle = e, this.handle.exec()
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            A = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var r, o = n(2),
+            v = o.__importDefault(n(3)),
+            i = n(57),
+            m = n(46),
+            o = (r = i.ListHandle, o.__extends(a, r), a.prototype.exec = function () {
+                var t, e = this.options,
+                    n = e.listType,
+                    o = e.listTarget,
+                    i = e.$selectionElem,
+                    r = e.$startElem,
+                    a = e.$endElem,
+                    l = [],
+                    u = null == i ? void 0 : i.getNodeName(),
+                    e = r.prior,
+                    s = a.prior;
+                if ((r.prior || a.prior) && (null != e && e.prev().length || null != s && s.next().length)) {
+                    for (var c = e; c.length;) l.push(c), c = null != s && s.equal(c) ? v.default(void 0) :
+                        c.next();
+                    var e = e.prev(),
+                        f = s.next();
+                    if (u === n ? t = m.createElementFragment(l, m.createDocumentFragment(), "p") : (t =
+                        m.createElement(o), (0, A.default)(l).call(l, function (e) {
+                        t.append(e.elems[0])
+                    })), e.length && f.length) {
+                        for (var d = []; f.length;) d.push(f), f = f.next();
+                        var p, h = m.createElement(u);
+                        (0, A.default)(d).call(d, function (e) {
+                            h.append(e.elems[0])
+                        }), v.default(h).insertAfter(i), this.selectionRangeElem.set(t), (p = i.next())
+                            .length ? m.insertBefore(i, t, p.elems[0]) : i.parent().elems[0].append(t)
+                    } else e.length ? (this.selectionRangeElem.set(t), (p = i.next()).length ? m.insertBefore(
+                        i, t, p.elems[0]) : i.parent().elems[0].append(t)) : (this.selectionRangeElem
+                        .set(t), m.insertBefore(i, t, i.elems[0]))
+                } else(0, A.default)(p = null == i ? void 0 : i.children()).call(p, function (e) {
+                    l.push(v.default(e))
+                }), u === n ? t = m.createElementFragment(l, m.createDocumentFragment(), "p") : (t =
+                    m.createElement(o), (0, A.default)(l).call(l, function (e) {
+                    t.append(e.elems[0])
+                })), this.selectionRangeElem.set(t), m.insertBefore(i, t, i.elems[0]), i.remove()
+            }, a);
+
+        function a(e) {
+            return r.call(this, e) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        a.prototype.set = function (e) {
+            var t, n;
+            e instanceof DocumentFragment && (n = [], (0, r.default)(t = e.childNodes).call(t, function (
+                e) {
+                n.push(e)
+            }), e = n), this._element = e
+        }, a.prototype.get = function () {
+            return this._element
+        }, a.prototype.clear = function () {
+            this._element = null
+        }, i = a;
+
+        function a() {
+            this._element = null
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            m = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var r, o = n(2),
+            g = o.__importDefault(n(3)),
+            i = n(57),
+            y = n(46),
+            o = (r = i.ListHandle, o.__extends(a, r), a.prototype.exec = function () {
+                var t, e = this.options,
+                    n = e.editor,
+                    o = e.listType,
+                    i = e.listTarget,
+                    r = e.$startElem,
+                    e = e.$endElem,
+                    a = n.selection.getSelectionRangeTopNodes(),
+                    n = null == r ? void 0 : r.getNodeName();
+                if (n === (null == e ? void 0 : e.getNodeName()))
+                    if (2 < a.length)
+                        if (a.shift(), a.pop(), t = y.createElementFragment(y.filterSelectionNodes(a),
+                            y.createDocumentFragment()), n === o) null !== (p = e.children()) &&
+                        void 0 !== p && (0, m.default)(p).call(p, function (e) {
+                            t.append(e)
+                        }), e.remove(), this.selectionRangeElem.set(t), r.elems[0].append(t);
+                        else {
+                            for (var l = document.createDocumentFragment(), u = document.createDocumentFragment(),
+                                     s = y.getStartPoint(r); s.length;) {
+                                var c = s.elems[0];
+                                s = s.next(), l.append(c)
+                            }
+                            for (var f = y.getEndPoint(e), d = []; f.length;) d.unshift(f.elems[0]), f =
+                                f.prev();
+                            (0, m.default)(d).call(d, function (e) {
+                                u.append(e)
+                            });
+                            var p = y.createElement(i);
+                            p.append(l), p.append(t), p.append(u), this.selectionRangeElem.set(t = p),
+                                g.default(p).insertAfter(r), null !== (p = r.children()) && void 0 !==
+                            p && p.length || r.remove(), null !== (p = e.children()) && void 0 !==
+                            p && p.length || e.remove()
+                        }
+                    else {
+                        a.length = 0;
+                        for (s = y.getStartPoint(r); s.length;) a.push(s), s = s.next();
+                        for (f = y.getEndPoint(e), d = []; f.length;) d.unshift(f), f = f.prev();
+                        a.push.apply(a, d), n === o ? (t = y.createElementFragment(a, y.createDocumentFragment(),
+                            "p"), this.selectionRangeElem.set(t), y.insertBefore(r, t, e.elems[0])) : (
+                            t = y.createElement(i), (0, m.default)(a).call(a, function (e) {
+                                t.append(e.elems[0])
+                            }), this.selectionRangeElem.set(t), g.default(t).insertAfter(r)), null !==
+                        (i = r.children()) && void 0 !== i && i.length || e.remove(), null !== (i = e.children()) &&
+                        void 0 !== i && i.length || e.remove()
+                    } else {
+                    for (var h = [], f = y.getEndPoint(e); f.length;) h.unshift(f), f = f.prev();
+                    for (var A, v = [], s = y.getStartPoint(r); s.length;) v.push(s), s = s.next();
+                    t = y.createDocumentFragment(), a.shift(), a.pop(), (0, m.default)(v).call(v,
+                        function (e) {
+                            return t.append(e.elems[0])
+                        }), t = y.createElementFragment(y.filterSelectionNodes(a), t), (0, m.default)
+                    (h).call(h, function (e) {
+                        return t.append(e.elems[0])
+                    }), this.selectionRangeElem.set(t), n === o ? (r.elems[0].append(t), null !==
+                    (A = e.children()) && void 0 !== A && A.length || e.remove()) : null !== (A =
+                        e.children()) && void 0 !== A && A.length ? (A = e.children(), y.insertBefore(
+                        A, t, A.elems[0])) : e.elems[0].append(t)
+                }
+            }, a);
+
+        function a(e) {
+            return r.call(this, e) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            u = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var r, o = n(2),
+            s = o.__importDefault(n(3)),
+            i = n(57),
+            c = n(46),
+            o = (r = i.ListHandle, o.__extends(a, r), a.prototype.exec = function () {
+                var t, e = this.options,
+                    n = e.editor,
+                    o = e.listType,
+                    i = e.listTarget,
+                    r = e.$startElem,
+                    e = n.selection.getSelectionRangeTopNodes(),
+                    n = null == r ? void 0 : r.getNodeName();
+                e.shift();
+                for (var a = [], l = c.getStartPoint(r); l.length;) a.push(l), l = l.next();
+                n === o ? (t = c.createDocumentFragment(), (0, u.default)(a).call(a, function (e) {
+                    return t.append(e.elems[0])
+                }), t = c.createElementFragment(c.filterSelectionNodes(e), t), this.selectionRangeElem
+                    .set(t), r.elems[0].append(t)) : (t = c.createElement(i), (0, u.default)(a).call(
+                    a,
+                    function (e) {
+                        return t.append(e.elems[0])
+                    }), t = c.createElementFragment(c.filterSelectionNodes(e), t), this.selectionRangeElem
+                    .set(t), s.default(t).insertAfter(r), null !== (e = r.children()) && void 0 !==
+                e && e.length || r.remove())
+            }, a);
+
+        function a(e) {
+            return r.call(this, e) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            u = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var r, o = n(2),
+            s = o.__importDefault(n(3)),
+            i = n(57),
+            c = n(46),
+            o = (r = i.ListHandle, o.__extends(a, r), a.prototype.exec = function () {
+                var e = this.options,
+                    t = e.editor,
+                    n = e.listType,
+                    o = e.listTarget,
+                    i = e.$endElem,
+                    e = t.selection.getSelectionRangeTopNodes(),
+                    t = null == i ? void 0 : i.getNodeName();
+                e.pop();
+                for (var r, a = [], l = c.getEndPoint(i); l.length;) a.unshift(l), l = l.prev();
+                t === n ? (r = c.createElementFragment(c.filterSelectionNodes(e), c.createDocumentFragment()),
+                    (0, u.default)(a).call(a, function (e) {
+                        return r.append(e.elems[0])
+                    }), this.selectionRangeElem.set(r), null !== (n = i.children()) && void 0 !==
+                n && n.length ? (n = i.children(), c.insertBefore(n, r, n.elems[0])) : i.elems[
+                    0].append(r)) : ((e = c.filterSelectionNodes(e)).push.apply(e, a), r = c.createElementFragment(
+                    e, c.createElement(o)), this.selectionRangeElem.set(r), s.default(r).insertBefore(
+                    i), null !== (o = i.children()) && void 0 !== o && o.length || i.remove())
+            }, a);
+
+        function a(e) {
+            return r.call(this, e) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = n(57),
+            a = n(46),
+            i = (o = r.ListHandle, i.__extends(l, o), l.prototype.exec = function () {
+                var e = this.options,
+                    t = e.editor,
+                    e = e.listTarget,
+                    t = t.selection.getSelectionRangeTopNodes(),
+                    e = a.createElementFragment(a.filterSelectionNodes(t), a.createElement(e));
+                this.selectionRangeElem.set(e), this.range.insertNode(e)
+            }, l);
+
+        function l(e, t) {
+            e = o.call(this, e) || this;
+            return e.range = t, e
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            x = o(n(4)),
+            _ = o(n(26));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var r, o = n(2),
+            i = o.__importDefault(n(24)),
+            E = o.__importDefault(n(3)),
+            a = o.__importDefault(n(378)),
+            b = n(6),
+            o = (r = i.default, o.__extends(l, r), l.prototype.command = function (t) {
+                var n = this,
+                    e = (window.getSelection ? window : document).getSelection(),
+                    o = ["P"],
+                    i = this.editor,
+                    r = "";
+                i.selection.restoreSelection();
+                var a = E.default(i.selection.getSelectionContainerElem());
+                if (null != a && a.length) {
+                    var l = E.default(i.selection.getSelectionContainerElem()),
+                        u = E.default(i.selection.getSelectionStartElem()).elems[0],
+                        s = "",
+                        c = [],
+                        f = "";
+                    if (a && i.$textElem.equal(a)) {
+                        if (b.UA.isIE()) return;
+                        var d = [],
+                            p = [],
+                            h = [],
+                            A = E.default(i.selection.getSelectionStartElem()),
+                            v = E.default(i.selection.getSelectionEndElem()),
+                            a = null === (a = i.selection.getRange()) || void 0 === a ? void 0 : a.commonAncestorContainer
+                                .childNodes;
+                        p.push(this.getDom(A.elems[0])), null != a && (0, x.default)(a).call(a,
+                            function (e, t) {
+                                e === n.getDom(A.elems[0]) && d.push(t), e === n.getDom(v.elems[0]) &&
+                                d.push(t)
+                            });
+                        var m, g = 0;
+                        for (h.push(this.getDom(A.elems[0])); p[g] !== this.getDom(v.elems[0]);) m = E.default(
+                            p[g].nextElementSibling).elems[0], -1 !== (0, _.default)(o).call(o, E.default(
+                            m).getNodeName()) && h.push(m), p.push(m), g++;
+                        if ("P" !== E.default(p[0]).getNodeName()) {
+                            for (var g = 0, y = 0; y < p.length; y++)
+                                if ("P" === E.default(p[y]).getNodeName()) {
+                                    g = y;
+                                    break
+                                } if (0 === g) return;
+                            for (var w = 0; w !== g;) p.shift(), w++
+                        }
+                        return this.setRange(p[0], p[p.length - 1]), (0, x.default)(p).call(p, function (
+                            e) {
+                            s = e.getAttribute("style"), c = s ? s.split(";") : [], f = "", r =
+                                (f = "P" === E.default(e).getNodeName() && t ? n.styleProcessing(
+                                    c) + "line-height:" + t + ";" : n.styleProcessing(c), r +
+                                ("<" + E.default(e).getNodeName().toLowerCase() +
+                                    ' style="' + f + '">' + e.innerHTML + "</" + E.default(
+                                        e).getNodeName().toLowerCase()) + ">")
+                        }), this.action(r, i), u = l.elems[0], void this.setRange(u.children[d[0]],
+                            u.children[d[1]])
+                    }
+                    u = this.getDom(u), -1 !== (0, _.default)(o).call(o, E.default(u).getNodeName()) &&
+                    (s = u.getAttribute("style"), c = s ? s.split(";") : [], null != e && e.selectAllChildren(
+                        u), i.selection.saveRange(), t ? (f = s ? this.styleProcessing(c) +
+                        "line-height:" + t + ";" : "line-height:" + t + ";", r = "<" + E.default(
+                        u).getNodeName().toLowerCase() + ' style="' + f + '">' + u.innerHTML +
+                        "</" + E.default(u).getNodeName().toLowerCase() + ">", "BLOCKQUOTE" ===
+                    E.default(u).getNodeName() ? E.default(u).css("line-height", t) : this.action(
+                        r, i)) : s && (f = this.styleProcessing(c), r = "" === f ? "<" + E.default(
+                        u).getNodeName().toLowerCase() + ">" + u.innerHTML + "</" + E.default(
+                        u).getNodeName().toLowerCase() + ">" : "<" + E.default(u).getNodeName()
+                        .toLowerCase() + ' style="' + f + '">' + u.innerHTML + "</" + E.default(
+                        u).getNodeName().toLowerCase() + ">", this.action(r, i)))
+                }
+            }, l.prototype.getDom = function (e) {
+                e = E.default(e).elems[0];
+                return e.parentNode ? e = function e(t, n) {
+                    var o = E.default(t.parentNode);
+                    return n.$textElem.equal(o) ? t : e(o.elems[0], n)
+                }(e, this.editor) : e
+            }, l.prototype.action = function (e, t) {
+                t.cmd.do("insertHTML", e)
+            }, l.prototype.styleProcessing = function (e) {
+                var t = "";
+                return (0, x.default)(e).call(e, function (e) {
+                    "" !== e && -1 === (0, _.default)(e).call(e, "line-height") && (t = t + e +
+                        ";")
+                }), t
+            }, l.prototype.setRange = function (e, t) {
+                var n = this.editor,
+                    o = (window.getSelection ? window : document).getSelection();
+                null != o && o.removeAllRanges();
+                var i = document.createRange(),
+                    t = t;
+                i.setStart(e, 0), i.setEnd(t, 1), null != o && o.addRange(i), n.selection.saveRange(),
+                null != o && o.removeAllRanges(), n.selection.restoreSelection()
+            }, l.prototype.tryChangeActive = function () {
+                var e = this.editor,
+                    t = e.selection.getSelectionContainerElem();
+                t && e.$textElem.equal(t) || 0 !== (e = E.default(e.selection.getSelectionStartElem()))
+                    .length && ((e = (e = this.getDom(e.elems[0])).getAttribute("style") ? e.getAttribute(
+                    "style") : "") && -1 !== (0, _.default)(e).call(e, "line-height") ? this.active() :
+                    this.unActive())
+            }, l);
+
+        function l(t) {
+            var n = this,
+                e = E.default(
+                    '<div class="w-e-menu" data-title="行高">\n                    <i class="w-e-icon-row-height"></i>\n                </div>'
+                ),
+                o = {
+                    width: 100,
+                    title: "设置行高",
+                    type: "list",
+                    list: new a.default(t, t.config.lineHeights).getItemList(),
+                    clickHandler: function (e) {
+                        t.selection.saveRange(), n.command(e)
+                    }
+                };
+            return n = r.call(this, e, t, o) || this
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a = n(2).__importDefault(n(3)),
+            n = (l.prototype.getItemList = function () {
+                return this.itemList
+            }, l);
+
+        function l(e, t) {
+            var n = this;
+            this.itemList = [{
+                $elem: a.default("<span>" + e.i18next.t("默认") + "</span>"),
+                value: ""
+            }], (0, r.default)(t).call(t, function (e) {
+                n.itemList.push({
+                    $elem: a.default("<span>" + e + "</span>"),
+                    value: e
+                })
+            })
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(3)),
+            n = i.__importDefault(n(23)),
+            i = (o = n.default, i.__extends(a, o), a.prototype.clickHandler = function () {
+                var e = this.editor;
+                e.history.revoke();
+                var t = e.$textElem.children();
+                null != t && t.length && (t = t.last(), e.selection.createRangeByElem(t, !1, !0), e.selection
+                    .restoreSelection())
+            }, a.prototype.tryChangeActive = function () {
+                this.editor.isCompatibleMode || (this.editor.history.size[0] ? this.active() : this.unActive())
+            }, a);
+
+        function a(e) {
+            var t = r.default(
+                '<div class="w-e-menu" data-title="撤销">\n                <i class="w-e-icon-undo"></i>\n            </div>'
+            );
+            return o.call(this, t, e) || this
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(3)),
+            n = i.__importDefault(n(23)),
+            i = (o = n.default, i.__extends(a, o), a.prototype.clickHandler = function () {
+                var e = this.editor;
+                e.history.restore();
+                var t = e.$textElem.children();
+                null != t && t.length && (t = t.last(), e.selection.createRangeByElem(t, !1, !0), e.selection
+                    .restoreSelection())
+            }, a.prototype.tryChangeActive = function () {
+                this.editor.isCompatibleMode || (this.editor.history.size[1] ? this.active() : this.unActive())
+            }, a);
+
+        function a(e) {
+            var t = r.default(
+                '<div class="w-e-menu" data-title="恢复">\n                <i class="w-e-icon-redo"></i>\n            </div>'
+            );
+            return o.call(this, t, e) || this
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(35)),
+            a = i.__importDefault(n(3)),
+            l = i.__importDefault(n(382)),
+            u = i.__importDefault(n(31)),
+            s = i.__importDefault(n(391)),
+            i = (o = r.default, i.__extends(c, o), c.prototype.clickHandler = function () {
+                this.createPanel()
+            }, c.prototype.createPanel = function () {
+                var e = l.default(this.editor);
+                new u.default(this, e).create()
+            }, c.prototype.tryChangeActive = function () {}, c);
+
+        function c(e) {
+            var t = a.default('<div class="w-e-menu" data-title="表格"><i class="w-e-icon-table2"></i></div>'),
+                n = o.call(this, t, e) || this;
+            return s.default(e), n
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(383));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            l = n(6),
+            u = i.__importDefault(n(3));
+        n(388);
+        var s = i.__importDefault(n(390));
+
+        function c(e) {
+            return 0 < e && (0, r.default)(e)
+        }
+        t.default = function (n) {
+            var o = new s.default(n),
+                i = l.getRandom("w-col-id"),
+                r = l.getRandom("w-row-id"),
+                e = l.getRandom("btn-link"),
+                t = "menus.panelMenus.table.",
+                a = [{
+                    title: (a = function (e) {
+                        return n.i18next.t(e)
+                    })(t + "插入表格"),
+                    tpl: '<div>\n                    <div class="w-e-table">\n                        <span>' +
+                        a("创建") + '</span>\n                        <input id="' + r +
+                        '"  type="text" class="w-e-table-input" value="5"/></td>\n                        <span>' +
+                        a(t + "行") + '</span>\n                        <input id="' + i +
+                        '" type="text" class="w-e-table-input" value="5"/></td>\n                        <span>' +
+                        (a(t + "列") + a(t + "的") + a(t + "表格")) +
+                        '</span>\n                    </div>\n                    <div class="w-e-button-container">\n                        <button type="button" id="' +
+                        e + '" class="right">' + a("插入") +
+                        "</button>\n                    </div>\n                </div>",
+                    events: [{
+                        selector: "#" + e,
+                        type: "click",
+                        fn: function () {
+                            var e = Number(u.default("#" + i).val()),
+                                t = Number(u.default("#" + r).val());
+                            return c(t) && c(e) ? (o.createAction(t, e), !0) : (n.config
+                                .customAlert("表格行列请输入正整数", "warning"), !1)
+                        }
+                    }]
+                }];
+            return (e = {
+                width: 330,
+                height: 0,
+                tabs: []
+            }).tabs.push(a[0]), e
+        }
+    }, function (e, t, n) {
+        e.exports = n(384)
+    }, function (e, t, n) {
+        n = n(385);
+        e.exports = n
+    }, function (e, t, n) {
+        n(386);
+        n = n(10);
+        e.exports = n.Number.isInteger
+    }, function (e, t, n) {
+        n(5)({
+            target: "Number",
+            stat: !0
+        }, {
+            isInteger: n(387)
+        })
+    }, function (e, t, n) {
+        var o = n(13),
+            i = Math.floor;
+        e.exports = function (e) {
+            return !o(e) && isFinite(e) && i(e) === e
+        }
+    }, function (e, t, n) {
+        var o = n(21),
+            i = n(389),
+            n = {
+                insert: "head",
+                singleton: !1
+            };
+        o(i = "string" == typeof (i = i.__esModule ? i.default : i) ? [[e.i, i, ""]] : i, n);
+        e.exports = i.locals || {}
+    }, function (e, t, n) {
+        (t = n(22)(!1)).push([e.i,
+            ".w-e-table {\n  display: flex;\n}\n.w-e-table .w-e-table-input {\n  width: 40px;\n  text-align: center!important;\n  margin: 0 5px;\n}\n",
+            ""]), e.exports = t
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            a = n(7),
+            r = o.__importDefault(n(3)),
+            n = (i.prototype.createAction = function (e, t) {
+                var n = this.editor,
+                    o = r.default(n.selection.getSelectionContainerElem()),
+                    i = r.default(o.elems[0]).parentUntilEditor("UL", n),
+                    o = r.default(o.elems[0]).parentUntilEditor("OL", n);
+                i || o || (t = this.createTableHtml(e, t), n.cmd.do("insertHTML", t))
+            }, i.prototype.createTableHtml = function (e, t) {
+                for (var n = "", o = "", i = 0; i < e; i++) {
+                    for (var o = "", r = 0; r < t; r++) o += 0 === i ? "<th></th>" : "<td></td>";
+                    n = n + "<tr>" + o + "</tr>"
+                }
+                return '<table border="0" width="100%" cellpadding="0" cellspacing="0"><tbody>' + n +
+                    "</tbody></table>" + a.EMPTY_P
+            }, i);
+
+        function i(e) {
+            this.editor = e
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            i = o.__importDefault(n(392)),
+            r = o.__importDefault(n(400));
+        t.default = function (e) {
+            i.default(e), r.default(e)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            l = o.__importDefault(n(3)),
+            i = o.__importDefault(n(36)),
+            u = o.__importDefault(n(393)),
+            r = o.__importDefault(n(399)),
+            s = n(7);
+
+        function a(n) {
+            var o;
+            return {
+                showTableTooltip: function (e) {
+                    var a = new r.default(n),
+                        t = function (e, t) {
+                            return n.i18next.t((t = void 0 === t ? "menus.panelMenus.table." : t) + e)
+                        },
+                        t = [{
+                            $elem: l.default("<span>" + t("删除表格") + "</span>"),
+                            onClick: function (e, t) {
+                                return e.selection.createRangeByElem(t), e.selection.restoreSelection(),
+                                    e.cmd.do("insertHTML", s.EMPTY_P), !0
+                            }
+                        }, {
+                            $elem: l.default("<span>" + t("添加行") + "</span>"),
+                            onClick: function (e, t) {
+                                if (c(e)) return !0;
+                                var n = l.default(e.selection.getSelectionStartElem()),
+                                    o = a.getRowNode(n.elems[0]);
+                                if (!o) return !0;
+                                n = Number(a.getCurrentRowIndex(t.elems[0], o)), o = a.getTableHtml(
+                                    t.elems[0]), n = f(t, n = a.getTableHtml(u.default.ProcessingRow(
+                                    l.default(o), n).elems[0]));
+                                return e.selection.createRangeByElem(t), e.selection.restoreSelection(),
+                                    e.cmd.do("insertHTML", n), !0
+                            }
+                        }, {
+                            $elem: l.default("<span>" + t("删除行") + "</span>"),
+                            onClick: function (e, t) {
+                                if (c(e)) return !0;
+                                var n = l.default(e.selection.getSelectionStartElem()),
+                                    o = a.getRowNode(n.elems[0]);
+                                if (!o) return !0;
+                                var i = Number(a.getCurrentRowIndex(t.elems[0], o)),
+                                    r = a.getTableHtml(t.elems[0]),
+                                    n = u.default.DeleteRow(l.default(r), i).elems[0].children[
+                                        0].children.length,
+                                    o = "";
+                                return e.selection.createRangeByElem(t), e.selection.restoreSelection(),
+                                    o = f(t, o = 0 === n ? s.EMPTY_P : a.getTableHtml(u.default
+                                        .DeleteRow(l.default(r), i).elems[0])), e.cmd.do(
+                                    "insertHTML", o), !0
+                            }
+                        }, {
+                            $elem: l.default("<span>" + t("添加列") + "</span>"),
+                            onClick: function (e, t) {
+                                if (c(e)) return !0;
+                                var n = l.default(e.selection.getSelectionStartElem()),
+                                    o = a.getCurrentColIndex(n.elems[0]),
+                                    n = a.getTableHtml(t.elems[0]),
+                                    o = f(t, o = a.getTableHtml(u.default.ProcessingCol(l.default(
+                                        n), o).elems[0]));
+                                return e.selection.createRangeByElem(t), e.selection.restoreSelection(),
+                                    e.cmd.do("insertHTML", o), !0
+                            }
+                        }, {
+                            $elem: l.default("<span>" + t("删除列") + "</span>"),
+                            onClick: function (e, t) {
+                                if (c(e)) return !0;
+                                var n = l.default(e.selection.getSelectionStartElem()),
+                                    o = a.getCurrentColIndex(n.elems[0]),
+                                    i = a.getTableHtml(t.elems[0]),
+                                    r = u.default.DeleteCol(l.default(i), o).elems[0].children[
+                                        0].children[0].children.length,
+                                    n = "";
+                                return e.selection.createRangeByElem(t), e.selection.restoreSelection(),
+                                    n = f(t, n = 1 === r ? s.EMPTY_P : a.getTableHtml(u.default
+                                        .DeleteCol(l.default(i), o).elems[0])), e.cmd.do(
+                                    "insertHTML", n), !0
+                            }
+                        }, {
+                            $elem: l.default("<span>" + t("设置表头") + "</span>"),
+                            onClick: function (e, t) {
+                                if (c(e)) return !0;
+                                var n = l.default(e.selection.getSelectionStartElem()),
+                                    o = a.getRowNode(n.elems[0]);
+                                if (!o) return !0;
+                                n = Number(a.getCurrentRowIndex(t.elems[0], o));
+                                0 !== n && (n = 0);
+                                o = a.getTableHtml(t.elems[0]), n = f(t, n = a.getTableHtml(u.default
+                                    .setTheHeader(l.default(o), n, "th").elems[0]));
+                                return e.selection.createRangeByElem(t), e.selection.restoreSelection(),
+                                    e.cmd.do("insertHTML", n), !0
+                            }
+                        }, {
+                            $elem: l.default("<span>" + t("取消表头") + "</span>"),
+                            onClick: function (e, t) {
+                                var n = l.default(e.selection.getSelectionStartElem()),
+                                    o = a.getRowNode(n.elems[0]);
+                                if (!o) return !0;
+                                n = Number(a.getCurrentRowIndex(t.elems[0], o));
+                                0 !== n && (n = 0);
+                                o = a.getTableHtml(t.elems[0]), n = f(t, n = a.getTableHtml(u.default
+                                    .setTheHeader(l.default(o), n, "td").elems[0]));
+                                return e.selection.createRangeByElem(t), e.selection.restoreSelection(),
+                                    e.cmd.do("insertHTML", n), !0
+                            }
+                        }];
+                    (o = new i.default(n, e, t)).create()
+                },
+                hideTableTooltip: function () {
+                    o && (o.remove(), o = null)
+                }
+            }
+        }
+
+        function c(e) {
+            var t = e.selection.getSelectionStartElem(),
+                e = e.selection.getSelectionEndElem();
+            return (null == t ? void 0 : t.elems[0]) !== (null == e ? void 0 : e.elems[0])
+        }
+
+        function f(e, t) {
+            e = e.elems[0].nextSibling;
+            return e && "<br>" !== e.innerHTML || (t += "" + s.EMPTY_P), t
+        }
+        t.default = function (e) {
+            var t = (n = a(e)).showTableTooltip,
+                n = n.hideTableTooltip;
+            e.txt.eventHooks.tableClickEvents.push(t), e.txt.eventHooks.clickEvents.push(n), e.txt.eventHooks
+                .keyupEvents.push(n), e.txt.eventHooks.toolbarClickEvents.push(n), e.txt.eventHooks.menuClickEvents
+                .push(n), e.txt.eventHooks.textScrollEvents.push(n)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            l = o(n(44)),
+            u = o(n(93)),
+            s = o(n(4)),
+            c = o(n(137));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var f = n(2).__importDefault(n(3));
+
+        function d(e, t) {
+            for (; 0 !== e.children.length;) e.removeChild(e.children[0]);
+            for (var n = 0; n < t.length; n++) e.appendChild(t[n])
+        }
+
+        function p(e) {
+            var t = e.elems[0].children[0];
+            return t = "COLGROUP" === t.nodeName ? e.elems[0].children[e.elems[0].children.length - 1] : t
+        }
+        t.default = {
+            ProcessingRow: function (e, t) {
+                for (var n = p(e), o = (e = (0, l.default)(Array.prototype).apply(n.children))[0].children
+                    .length, i = document.createElement("tr"), r = 0; r < o; r++) {
+                    var a = document.createElement("td");
+                    i.appendChild(a)
+                }
+                return (0, u.default)(e).call(e, t + 1, 0, i), d(n, e), f.default(n.parentNode)
+            },
+            ProcessingCol: function (e, i) {
+                for (var e = p(e), r = (0, l.default)(Array.prototype).apply(e.children), t = 0; t <
+                r.length; t++) ! function (e) {
+                    var t = [];
+                    for ((0, s.default)(n = (0, c.default)(r[e].children)).call(n, function (e) {
+                        t.push(e)
+                    }); 0 !== r[e].children.length;) r[e].removeChild(r[e].children[0]);
+                    var n = "TH" !== f.default(t[0]).getNodeName() ? document.createElement(
+                        "td") : document.createElement("th");
+                    (0, u.default)(t).call(t, i + 1, 0, n);
+                    for (var o = 0; o < t.length; o++) r[e].appendChild(t[o])
+                }(t);
+                return d(e, r), f.default(e.parentNode)
+            },
+            DeleteRow: function (e, t) {
+                var n = p(e),
+                    e = (0, l.default)(Array.prototype).apply(n.children);
+                return (0, u.default)(e).call(e, t, 1), d(n, e), f.default(n.parentNode)
+            },
+            DeleteCol: function (e, i) {
+                for (var e = p(e), r = (0, l.default)(Array.prototype).apply(e.children), t = 0; t <
+                r.length; t++) ! function (e) {
+                    var t, n = [];
+                    for ((0, s.default)(t = (0, c.default)(r[e].children)).call(t, function (e) {
+                        n.push(e)
+                    }); 0 !== r[e].children.length;) r[e].removeChild(r[e].children[0]);
+                    (0, u.default)(n).call(n, i, 1);
+                    for (var o = 0; o < n.length; o++) r[e].appendChild(n[o])
+                }(t);
+                return d(e, r), f.default(e.parentNode)
+            },
+            setTheHeader: function (e, t, n) {
+                for (var o = p(e), i = (e = (0, l.default)(Array.prototype).apply(o.children))[t].children,
+                         r = document.createElement("tr"), a = 0; a < i.length; a++) ! function (e) {
+                    var t = document.createElement(n);
+                    (0, s.default)(e = (0, c.default)(i[e].children)).call(e, function (e) {
+                        t.appendChild(e)
+                    }), r.appendChild(t)
+                }(a);
+                return (0, u.default)(e).call(e, t, 1, r), d(o, e), f.default(o.parentNode)
+            }
+        }
+    }, function (e, t, n) {
+        n = n(395);
+        e.exports = n
+    }, function (e, t, n) {
+        n(51), n(396);
+        n = n(10);
+        e.exports = n.Array.from
+    }, function (e, t, n) {
+        var o = n(5),
+            i = n(397);
+        o({
+            target: "Array",
+            stat: !0,
+            forced: !n(113)(function (e) {
+                Array.from(e)
+            })
+        }, {
+            from: i
+        })
+    }, function (e, t, n) {
+        "use strict";
+        var p = n(38),
+            h = n(33),
+            A = n(398),
+            v = n(105),
+            m = n(34),
+            g = n(73),
+            y = n(107);
+        e.exports = function (e) {
+            var t, n, o, i, r, a, l = h(e),
+                u = "function" == typeof this ? this : Array,
+                s = arguments.length,
+                c = 1 < s ? arguments[1] : void 0,
+                f = void 0 !== c,
+                e = y(l),
+                d = 0;
+            if (f && (c = p(c, 2 < s ? arguments[2] : void 0, 2)), null == e || u == Array && v(e))
+                for (n = new u(t = m(l.length)); d < t; d++) a = f ? c(l[d], d) : l[d], g(n, d, a);
+            else
+                for (r = (i = e.call(l)).next, n = new u; !(o = r.call(i)).done; d++) a = f ? A(i, c, [
+                    o.value, d], !0) : o.value, g(n, d, a);
+            return n.length = d, n
+        }
+    }, function (e, t, n) {
+        var i = n(20),
+            r = n(108);
+        e.exports = function (t, e, n, o) {
+            try {
+                return o ? e(i(n)[0], n[1]) : e(n)
+            } catch (e) {
+                throw r(t), e
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4)),
+            a = o(n(137));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var l = n(2).__importDefault(n(3)),
+            n = (u.prototype.getRowNode = function (e) {
+                var t = l.default(e).elems[0];
+                return t.parentNode ? t = null === (e = l.default(t).parentUntil("TR", t)) || void 0 ===
+                e ? void 0 : e.elems[0] : t
+            }, u.prototype.getCurrentRowIndex = function (e, n) {
+                var o = 0,
+                    t = e.children[0];
+                return "COLGROUP" === t.nodeName && (t = e.children[e.children.length - 1]), (0, r.default)
+                (t = (0, a.default)(t.children)).call(t, function (e, t) {
+                    e === n && (o = t)
+                }), o
+            }, u.prototype.getCurrentColIndex = function (e) {
+                var n = 0,
+                    o = "TD" === l.default(e).getNodeName() || "TH" === l.default(e).getNodeName() ? e :
+                        null === (t = l.default(e).parentUntil("TD", e)) || void 0 === t ? void 0 : t.elems[
+                            0],
+                    t = l.default(o).parent();
+                return (0, r.default)(t = (0, a.default)(t.elems[0].children)).call(t, function (e, t) {
+                    e === o && (n = t)
+                }), n
+            }, u.prototype.getTableHtml = function (e) {
+                return '<table border="0" width="100%" cellpadding="0" cellspacing="0">' + l.default(e)
+                    .html() + "</table>"
+            }, u);
+
+        function u(e) {
+            this.editor = e
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = function (o) {
+            var e = o.txt,
+                i = o.selection;
+            e.eventHooks.keydownEvents.push(function (e) {
+                o.selection.saveRange();
+                var t, n = i.getSelectionContainerElem();
+                !n || (n = (t = n.getNodeTop(o)).length && t.prev().length ? t.prev() : null) &&
+                "TABLE" === n.getNodeName() && i.isSelectionEmpty() && 0 === i.getCursorPos() &&
+                8 === e.keyCode && (!!(n = t.next()).length && function (e) {
+                    if (e.length) {
+                        e = e.elems[0];
+                        return "P" === e.nodeName && "<br>" === e.innerHTML
+                    }
+                }(t) && (t.remove(), o.selection.setRangeToElem(n.elems[0])), e.preventDefault())
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            a = o(n(25));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.formatCodeHtml = void 0;
+        var o = n(2),
+            i = o.__importDefault(n(35)),
+            r = o.__importDefault(n(3)),
+            l = n(6),
+            u = o.__importDefault(n(402)),
+            s = o.__importDefault(n(138)),
+            c = o.__importDefault(n(31)),
+            f = o.__importDefault(n(403));
+        t.formatCodeHtml = function (e, t) {
+            return t && (t = function e(t) {
+                var n;
+                var o = t.match(/<span\sclass="hljs[\s|\S]+?\/span>/gm);
+                if (!o || !o.length) return t;
+                var i = (0, a.default)(n = l.deepClone(o)).call(n, function (e) {
+                    return (e = e.replace(/<span\sclass="hljs[^>]+>/, "")).replace(
+                        /<\/span>/, "")
+                });
+                for (var r = 0; r < o.length; r++) t = t.replace(o[r], i[r]);
+                return e(t)
+            }(t), null === (o = (n = t).match(/<pre[\s|\S]+?\/pre>/g)) || (0, a.default)(o).call(
+                o,
+                function (e) {
+                    n = n.replace(e, e.replace(/<\/code><code>/g, "\n").replace(/<br>/g, ""))
+                }), t = l.replaceSpecialSymbol(t = n));
+            var n, o
+        };
+        var d, o = (d = i.default, o.__extends(p, d), p.prototype.insertLineCode = function (e) {
+            var t = this.editor,
+                e = r.default("<code>" + e + "</code>");
+            t.cmd.do("insertElem", e), t.selection.createRangeByElem(e, !1), t.selection.restoreSelection()
+        }, p.prototype.clickHandler = function () {
+            var e = this.editor,
+                t = e.selection.getSelectionText();
+            this.isActive || (e.selection.isSelectionEmpty() ? this.createPanel("", "") : this.insertLineCode(
+                t))
+        }, p.prototype.createPanel = function (e, t) {
+            t = u.default(this.editor, e, t);
+            new c.default(this, t).create()
+        }, p.prototype.tryChangeActive = function () {
+            var e = this.editor;
+            s.default(e) ? this.active() : this.unActive()
+        }, p);
+
+        function p(e) {
+            var t = r.default(
+                '<div class="w-e-menu" data-title="代码"><i class="w-e-icon-terminal"></i></div>'),
+                n = d.call(this, t, e) || this;
+            return f.default(e), n
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            s = o(n(25));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            c = n(6),
+            f = i.__importDefault(n(3)),
+            d = i.__importDefault(n(138)),
+            p = n(7);
+        t.default = function (o, e, t) {
+            var n, i = c.getRandom("input-iframe"),
+                r = c.getRandom("select"),
+                a = c.getRandom("btn-ok");
+
+            function l(e) {
+                var t;
+                d.default(o) && d.default(o) && ((t = null == (t = o.selection.getSelectionStartElem()) ?
+                    void 0 : t.getNodeTop(o)) && (o.selection.createRangeByElem(t), o.selection
+                    .restoreSelection())), o.cmd.do("insertHTML", e);
+                e = o.selection.getSelectionStartElem(), e = null == e ? void 0 : e.getNodeTop(o);
+                f.default(p.EMPTY_P).insertAfter(e)
+            }
+
+            function u(e) {
+                return o.i18next.t(e)
+            }
+            return {
+                width: 500,
+                height: 0,
+                tabs: [{
+                    title: u("menus.panelMenus.code.插入代码"),
+                    tpl: '<div>\n                        <select name="" id="' + r +
+                        '">\n                            ' + (0, s.default)(n = o.config.languageType)
+                            .call(n, function (e) {
+                                return "<option " + (t == e ? "selected" : "") + ' value ="' +
+                                    e + '">' + e + "</option>"
+                            }) +
+                        '\n                        </select>\n                        <textarea id="' +
+                        i +
+                        '" type="text" class="wang-code-textarea" placeholder="" style="height: 160px">' +
+                        e.replace(/&quot;/g, '"') +
+                        '</textarea>\n                        <div class="w-e-button-container">\n                            <button type="button" id="' +
+                        a + '" class="right">' + (d.default(o) ? u("修改") : u("插入")) +
+                        "</button>\n                        </div>\n                    </div>",
+                    events: [{
+                        selector: "#" + a,
+                        type: "click",
+                        fn: function () {
+                            var e = document.getElementById(i),
+                                t = f.default("#" + r).val(),
+                                n = e.value,
+                                e = o.highlight ? o.highlight.highlightAuto(n).value :
+                                    "<xmp>" + n + "</xmp>";
+                            if (n) return !d.default(o) && (l('<pre><code class="' +
+                                t + '">' + e + "</code></pre>"), !0)
+                        }
+                    }]
+                }]
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            i = o.__importDefault(n(404)),
+            r = o.__importDefault(n(405));
+        t.default = function (e) {
+            i.default(e), r.default(e)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.createShowHideFn = void 0;
+        var o = n(2),
+            r = o.__importDefault(n(3)),
+            a = o.__importDefault(n(36));
+
+        function i(o) {
+            var i;
+            return {
+                showCodeTooltip: function (e) {
+                    var t, n = [{
+                        $elem: r.default("<span>" + (n = "删除代码", o.i18next.t((t = void 0 === t ?
+                            "menus.panelMenus.code." : t) + n)) + "</span>"),
+                        onClick: function (e, t) {
+                            return t.remove(), !0
+                        }
+                    }];
+                    (i = new a.default(o, e, n)).create()
+                },
+                hideCodeTooltip: function () {
+                    i && (i.remove(), i = null)
+                }
+            }
+        }
+        t.createShowHideFn = i, t.default = function (e) {
+            var t = (n = i(e)).showCodeTooltip,
+                n = n.hideCodeTooltip;
+            e.txt.eventHooks.codeClickEvents.push(t), e.txt.eventHooks.clickEvents.push(n), e.txt.eventHooks
+                .toolbarClickEvents.push(n), e.txt.eventHooks.menuClickEvents.push(n), e.txt.eventHooks
+                .textScrollEvents.push(n)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            r = n(7),
+            a = o.__importDefault(n(3));
+        t.default = function (o) {
+            var n = o.$textElem,
+                i = o.selection,
+                e = o.txt.eventHooks.keydownEvents;
+            e.push(function (e) {
+                var t;
+                40 === e.keyCode && (t = i.getSelectionContainerElem(), e = null === (e = n.children()) ||
+                void 0 === e ? void 0 : e.last(), "XMP" === (null == t ? void 0 : t.elems[
+                    0].tagName) && "PRE" === (null == e ? void 0 : e.elems[0].tagName) &&
+                (e = a.default(r.EMPTY_P), n.append(e)))
+            }), e.push(function (e) {
+                o.selection.saveRange();
+                var t, n = i.getSelectionContainerElem();
+                n && (n = null == (t = n.getNodeTop(o)) ? void 0 : t.prev(), t = null == t ?
+                    void 0 : t.getNextSibling(), n.length && "PRE" === (null == n ? void 0 :
+                    n.getNodeName()) && 0 === t.length && 0 === i.getCursorPos() && 8 ===
+                e.keyCode && e.preventDefault())
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(23)),
+            a = i.__importDefault(n(3)),
+            l = i.__importDefault(n(407)),
+            u = n(6),
+            s = n(7),
+            i = (o = r.default, i.__extends(c, o), c.prototype.clickHandler = function () {
+                var e, t = this.editor,
+                    n = t.selection.getRange(),
+                    o = t.selection.getSelectionContainerElem();
+                null != o && o.length && (t = (e = a.default(o.elems[0])).parentUntil("TABLE", o.elems[
+                    0]), o = e.children(), "CODE" !== e.getNodeName() && (t && "TABLE" === a.default(
+                    t.elems[0]).getNodeName() || (!o || 0 === o.length || "IMG" !== a.default(
+                    o.elems[0]).getNodeName() || null != n && n.collapsed) && this.createSplitLine()))
+            }, c.prototype.createSplitLine = function () {
+                var e = "<hr/>" + s.EMPTY_P;
+                u.UA.isFirefox && (e = "<hr/><p></p>"), this.editor.cmd.do("insertHTML", e)
+            }, c.prototype.tryChangeActive = function () {}, c);
+
+        function c(e) {
+            var t = a.default(
+                '<div class="w-e-menu" data-title="分割线"><i class="w-e-icon-split-line"></i></div>'),
+                n = o.call(this, t, e) || this;
+            return l.default(e), n
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2).__importDefault(n(408));
+        t.default = function (e) {
+            o.default(e)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            i = o.__importDefault(n(3)),
+            r = o.__importDefault(n(36));
+
+        function a(n) {
+            var o;
+            return {
+                showSplitLineTooltip: function (e) {
+                    var t = [{
+                        $elem: i.default("<span>" + n.i18next.t("menus.panelMenus.删除") +
+                            "</span>"),
+                        onClick: function (e, t) {
+                            return e.selection.createRangeByElem(t), e.selection.restoreSelection(),
+                                e.cmd.do("delete"), !0
+                        }
+                    }];
+                    (o = new r.default(n, e, t)).create()
+                },
+                hideSplitLineTooltip: function () {
+                    o && (o.remove(), o = null)
+                }
+            }
+        }
+        t.default = function (e) {
+            var t = (n = a(e)).showSplitLineTooltip,
+                n = n.hideSplitLineTooltip;
+            e.txt.eventHooks.splitLineEvents.push(t), e.txt.eventHooks.clickEvents.push(n), e.txt.eventHooks
+                .keyupEvents.push(n), e.txt.eventHooks.toolbarClickEvents.push(n), e.txt.eventHooks.menuClickEvents
+                .push(n), e.txt.eventHooks.textScrollEvents.push(n)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a, o = n(2),
+            l = o.__importDefault(n(3)),
+            i = o.__importDefault(n(23)),
+            u = n(98),
+            s = o.__importDefault(n(415)),
+            c = o.__importDefault(n(139)),
+            o = (a = i.default, o.__extends(f, a), f.prototype.clickHandler = function () {
+                var e = this.editor;
+                u.isAllTodo(e) ? (this.cancelTodo(), this.tryChangeActive()) : this.setTodo()
+            }, f.prototype.tryChangeActive = function () {
+                u.isAllTodo(this.editor) ? this.active() : this.unActive()
+            }, f.prototype.setTodo = function () {
+                var o = this.editor,
+                    e = o.selection.getSelectionRangeTopNodes();
+                (0, r.default)(e).call(e, function (e) {
+                    var t, n;
+                    "P" === (null == e ? void 0 : e.getNodeName()) && (n = null === (n = (t = c
+                        .default(e).getTodo()).children()) || void 0 === n ? void 0 : n.getNode(),
+                        t.insertAfter(e), o.selection.moveCursor(n), e.remove())
+                }), this.tryChangeActive()
+            }, f.prototype.cancelTodo = function () {
+                var o = this.editor,
+                    e = o.selection.getSelectionRangeTopNodes();
+                (0, r.default)(e).call(e, function (e) {
+                    var t = null === (n = null === (t = e.childNodes()) || void 0 === t ? void 0 :
+                        t.childNodes()) || void 0 === n ? void 0 : n.clone(!0),
+                        n = l.default("<p></p>");
+                    n.append(t), n.insertAfter(e), null !== (t = n.childNodes()) && void 0 !==
+                    t && t.get(0).remove(), o.selection.moveCursor(n.getNode()), e.remove()
+                })
+            }, f);
+
+        function f(e) {
+            var t = l.default(
+                '<div class="w-e-menu" data-title="待办事项">\n                    <i class="w-e-icon-checkbox-checked"></i>\n                </div>'
+                ),
+                n = a.call(this, t, e) || this;
+            return s.default(e), n
+        }
+        t.default = o
+    }, function (e, t, n) {
+        e.exports = n(411)
+    }, function (e, t, n) {
+        n = n(412);
+        e.exports = n
+    }, function (e, t, n) {
+        var o = n(413),
+            i = Array.prototype;
+        e.exports = function (e) {
+            var t = e.every;
+            return e === i || e instanceof Array && t === i.every ? o : t
+        }
+    }, function (e, t, n) {
+        n(414);
+        n = n(14);
+        e.exports = n("Array").every
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(5),
+            i = n(29).every;
+        o({
+            target: "Array",
+            proto: !0,
+            forced: !n(71)("every")
+        }, {
+            every: function (e) {
+                return i(this, e, 1 < arguments.length ? arguments[1] : void 0)
+            }
+        })
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            A = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            v = i.__importDefault(n(3)),
+            m = n(98),
+            g = i.__importDefault(n(139)),
+            y = n(98),
+            w = n(7);
+        t.default = function (h) {
+            h.txt.eventHooks.enterDownEvents.push(function (e) {
+                if (m.isAllTodo(h)) {
+                    e.preventDefault();
+                    var t, n, o, i, r, a, l = h.selection,
+                        u = l.getSelectionRangeTopNodes()[0],
+                        s = null === (c = u.childNodes()) || void 0 === c ? void 0 : c.get(0),
+                        e = null === (t = window.getSelection()) || void 0 === t ? void 0 : t.anchorNode,
+                        c = l.getRange();
+                    if (null != c && c.collapsed || (t = null == c ? void 0 : c.commonAncestorContainer
+                        .childNodes, n = null == c ? void 0 : c.startContainer, o = null ==
+                    c ? void 0 : c.endContainer, d = null == c ? void 0 : c.startOffset,
+                        p = null == c ? void 0 : c.endOffset, r = i = 0, a = [], null != t &&
+                    (0, A.default)(t).call(t, function (e, t) {
+                        e.contains(n) && (i = t), e.contains(o) && (r = t)
+                    }), 1 < r - i && (null != t && (0, A.default)(t).call(t, function (
+                        e, t) {
+                        t <= i || r <= t || a.push(e)
+                    }), (0, A.default)(a).call(a, function (e) {
+                        e.remove()
+                    })), y.dealTextNode(n, d), y.dealTextNode(o, p, !1), h.selection.moveCursor(
+                        o, 0)), "" === u.text()) {
+                        var f = v.default(w.EMPTY_P);
+                        return f.insertAfter(u), l.moveCursor(f.getNode()), void u.remove()
+                    }
+                    var d = l.getCursorPos(),
+                        p = m.getCursorNextNode(null == s ? void 0 : s.getNode(), e, d),
+                        f = g.default(v.default(p)),
+                        e = f.getInputContainer(),
+                        d = e.parent().getNode(),
+                        p = f.getTodo(),
+                        f = e.getNode().nextSibling;
+                    "" === (null == s ? void 0 : s.text()) && null != s && s.append(v.default(
+                        "<br>")), p.insertAfter(u), f && "" !== (null == f ? void 0 : f.textContent) ?
+                        l.moveCursor(d) : ("BR" !== (null == f ? void 0 : f.nodeName) && v.default(
+                            "<br>").insertAfter(e), l.moveCursor(d, 1))
+                }
+            }), h.txt.eventHooks.deleteUpEvents.push(function () {
+                var e = h.selection.getSelectionRangeTopNodes()[0];
+                e && y.isTodo(e) && "" === e.text() && (v.default(w.EMPTY_P).insertAfter(e), e.remove())
+            }), h.txt.eventHooks.deleteDownEvents.push(function (e) {
+                if (m.isAllTodo(h)) {
+                    var t = h.selection,
+                        n = t.getSelectionRangeTopNodes()[0],
+                        o = null === (l = n.childNodes()) || void 0 === l ? void 0 : l.getNode(),
+                        i = v.default("<p></p>"),
+                        r = i.getNode(),
+                        a = null === (u = window.getSelection()) || void 0 === u ? void 0 : u.anchorNode,
+                        l = t.getCursorPos(),
+                        u = a.previousSibling;
+                    if ("" === n.text()) {
+                        e.preventDefault();
+                        a = v.default(w.EMPTY_P);
+                        return a.insertAfter(n), n.remove(), void t.moveCursor(a.getNode(), 0)
+                    }
+                    "SPAN" === (null == u ? void 0 : u.nodeName) && "INPUT" === u.childNodes[0]
+                        .nodeName && 0 === l && (e.preventDefault(), null != o && (0, A.default)
+                    (o = o.childNodes).call(o, function (e, t) {
+                        0 !== t && r.appendChild(e.cloneNode(!0))
+                    }), i.insertAfter(n), n.remove())
+                }
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var s = n(2).__importDefault(n(3)),
+            c = n(6),
+            f = n(7),
+            d = "1px solid #c9d8db",
+            p = "#FFF",
+            h = "1px solid #EEE";
+        t.default = function (e) {
+            var t = e.toolbarSelector,
+                n = s.default(t),
+                o = e.textSelector,
+                i = e.config.height,
+                r = e.i18next,
+                a = s.default("<div></div>"),
+                l = s.default("<div></div>"),
+                t = null;
+            null == o ? (u = n.children(), n.append(a).append(l), a.css("background-color", p).css(
+                "border", d).css("border-bottom", h), l.css("border", d).css("border-top",
+                "none").css("height", i + "px")) : (n.append(a), t = s.default(o).children(), s.default(
+                o).append(l), u = l.children()), (o = s.default("<div></div>")).attr(
+                "contenteditable", "true").css("width", "100%").css("height", "100%"), (r = s.default(
+                "<div>" + r.t(e.config.placeholder) + "</div>")).addClass("placeholder"), u && u.length ?
+                (o.append(u), r.hide()) : o.append(s.default(f.EMPTY_P)), t && t.length && (o.append(t),
+                r.hide()), l.append(o), l.append(r), a.addClass("w-e-toolbar").css("z-index", e.zIndex
+                .get("toolbar")), l.addClass("w-e-text-container"), l.css("z-index", e.zIndex.get()),
+                o.addClass("w-e-text");
+            var u = c.getRandom("toolbar-elem");
+            a.attr("id", u), t = c.getRandom("text-elem"), o.attr("id", t), (r = l.getBoundingClientRect()
+                .height) !== o.getBoundingClientRect().height && o.css("min-height", r + "px"), e.$toolbarElem =
+                a, e.$textContainerElem = l, e.$textElem = o, e.toolbarElemId = u, e.textElemId = t
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var a = n(2).__importDefault(n(3)),
+            l = n(7);
+        t.default = function e(t, n) {
+            var o = t.$textElem,
+                i = o.children();
+            if (!i || !i.length) return o.append(a.default(l.EMPTY_P)), void e(t);
+            var r = i.last();
+            if (n && (i = r.html().toLowerCase(), n = r.getNodeName(), "<br>" !== i && "<br/>" !== i ||
+            "P" !== n)) return o.append(a.default(l.EMPTY_P)), void e(t);
+            t.selection.createRangeByElem(r, !1, !0), t.config.focus ? t.selection.restoreSelection() :
+                t.selection.clearWindowSelectionRange()
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var a = n(2).__importDefault(n(3));
+
+        function l(e) {
+            (0, e.config.onfocus)(e.txt.html() || "")
+        }
+        t.default = function (e) {
+            var t, n;
+            (t = e).txt.eventHooks.changeEvents.push(function () {
+                var e = t.config.onchange;
+                e && e(t.txt.html() || ""), t.txt.togglePlaceholder()
+            }),
+                function (i) {
+                    function e(e) {
+                        var t = e.target,
+                            n = a.default(t),
+                            o = i.$textElem,
+                            t = i.$toolbarElem,
+                            o = o.isContain(n),
+                            n = t.isContain(n),
+                            e = t.elems[0] == e.target;
+                        o ? (i.isFocus || l(i), i.isFocus = !0) : n && !e || !i.isFocus || (n = (o = i)
+                            .config.onblur, e = o.txt.html() || "", (0, r.default)(o = o.txt.eventHooks
+                            .onBlurEvents).call(o, function (e) {
+                            return e()
+                        }), n(e), i.isFocus = !1)
+                    }
+                    i.isFocus = !1, document.activeElement === i.$textElem.elems[0] && i.config.focus &&
+                    (l(i), i.isFocus = !0);
+                    a.default(document).on("click", e), i.beforeDestroy(function () {
+                        a.default(document).off("click", e)
+                    })
+                }(e), (n = e).$textElem.on("compositionstart", function () {
+                n.isComposing = !0, n.txt.togglePlaceholder()
+            }).on("compositionend", function () {
+                n.isComposing = !1, n.txt.togglePlaceholder()
+            })
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        }), t.default = function (e) {
+            var t = (n = e.config).lang,
+                n = n.languages;
+            if (null == e.i18next) e.i18next = {
+                t: function (e) {
+                    e = e.split(".");
+                    return e[e.length - 1]
+                }
+            };
+            else try {
+                e.i18next.init({
+                    ns: "wangEditor",
+                    lng: t,
+                    defaultNS: "wangEditor",
+                    resources: n
+                })
+            } catch (e) {
+                throw new Error("i18next:" + e)
+            }
+        }
+    }, function (e, o, t) {
+        "use strict";
+        var n = t(0),
+            i = n(t(1)),
+            r = n(t(30));
+        (0, i.default)(o, "__esModule", {
+            value: !0
+        }), o.setUnFullScreen = o.setFullScreen = void 0;
+        var a = t(2).__importDefault(t(3));
+        t(421);
+        var l = "w-e-icon-fullscreen",
+            u = "w-e-icon-fullscreen_exit",
+            s = "w-e-full-screen-editor";
+        o.setFullScreen = function (e) {
+            var t = a.default(e.toolbarSelector),
+                n = e.$textContainerElem,
+                o = e.$toolbarElem,
+                i = (0, r.default)(o).call(o, "i." + l),
+                e = e.config;
+            i.removeClass(l), i.addClass(u), t.addClass(s), t.css("z-index", e.zIndexFullScreen);
+            o = o.getBoundingClientRect();
+            n.css("height", "calc(100% - " + o.height + "px)")
+        };
+        o.setUnFullScreen = function (e) {
+            var t = a.default(e.toolbarSelector),
+                n = e.$textContainerElem,
+                o = e.$toolbarElem,
+                o = (0, r.default)(o).call(o, "i." + u),
+                e = e.config;
+            o.removeClass(u), o.addClass(l), t.removeClass(s), t.css("z-index", "auto"), n.css("height",
+                e.height + "px")
+        };
+        o.default = function (t) {
+            var e, n;
+            t.textSelector || t.config.showFullScreen && (e = t.$toolbarElem, (n = a.default(
+                '<div class="w-e-menu" data-title="全屏">\n            <i class="' + l +
+                '"></i>\n        </div>')).on("click", function (e) {
+                (0, r.default)(e = a.default(e.currentTarget)).call(e, "i").hasClass(l) ? (
+                    n.attr("data-title", "取消全屏"), o.setFullScreen(t)) : (n.attr(
+                    "data-title", "全屏"), o.setUnFullScreen(t))
+            }), e.append(n))
+        }
+    }, function (e, t, n) {
+        var o = n(21),
+            i = n(422),
+            n = {
+                insert: "head",
+                singleton: !1
+            };
+        o(i = "string" == typeof (i = i.__esModule ? i.default : i) ? [[e.i, i, ""]] : i, n);
+        e.exports = i.locals || {}
+    }, function (e, t, n) {
+        (t = n(22)(!1)).push([e.i,
+            ".w-e-full-screen-editor {\n  position: fixed;\n  width: 100%!important;\n  height: 100%!important;\n  left: 0;\n  top: 0;\n}\n",
+            ""]), e.exports = t
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(30));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        t.default = function (e, t) {
+            e = e.$textElem, t = (0, r.default)(e).call(e, "[id='" + t + "']").getOffsetData().top;
+            e.scrollTop(t)
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2).__importDefault(n(127)),
+            i = {
+                menu: 2,
+                panel: 2,
+                toolbar: 1,
+                tooltip: 1,
+                textContainer: 1
+            },
+            n = (r.prototype.get = function (e) {
+                return e && this.tier[e] ? this.baseZIndex + this.tier[e] : this.baseZIndex
+            }, r.prototype.init = function (e) {
+                this.baseZIndex == o.default.zIndex && (this.baseZIndex = e.config.zIndex)
+            }, r);
+
+        function r() {
+            this.tier = i, this.baseZIndex = o.default.zIndex
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            a = o(n(74)),
+            r = o(n(4));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            i = o.__importDefault(n(426)),
+            l = n(6),
+            u = n(7);
+        var s, o = (s = i.default, o.__extends(c, s), c.prototype.save = function () {
+            this.data.length && (this.editor.history.save(this.data), this.data.length = 0, this.emit())
+        }, c.prototype.emit = function () {
+            var e;
+            (0, r.default)(e = this.editor.txt.eventHooks.changeEvents).call(e, function (e) {
+                return e()
+            })
+        }, c.prototype.observe = function () {
+            var e = this;
+            s.prototype.observe.call(this, this.editor.$textElem.elems[0]);
+            var t = this.editor.config.onchangeTimeout;
+            this.asyncSave = l.debounce(function () {
+                e.save()
+            }, t), this.editor.isCompatibleMode || this.editor.$textElem.on("compositionend",
+                function () {
+                    e.asyncSave()
+                })
+        }, c);
+
+        function c(i) {
+            var r = s.call(this, function (e, t) {
+                var n, o;
+                if (n = e, o = t.target, e = (0, a.default)(n).call(n, function (e) {
+                    var t = e.type,
+                        n = e.target,
+                        e = e.attributeName;
+                    return "attributes" != t || "attributes" == t && ("contenteditable" ==
+                        e || n != o)
+                }), (n = r.data).push.apply(n, e), i.isCompatibleMode) r.asyncSave();
+                else if (!i.isComposing) return r.asyncSave()
+            }) || this;
+            return r.editor = i, r.data = [], r.asyncSave = u.EMPTY_FN, r
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        n = n(0)(n(1));
+        (0, n.default)(t, "__esModule", {
+            value: !0
+        });
+        (0, n.default)(o.prototype, "target", {
+            get: function () {
+                return this.node
+            },
+            enumerable: !1,
+            configurable: !0
+        }), o.prototype.observe = function (e) {
+            this.node instanceof Node || (this.node = e, this.connect())
+        }, o.prototype.connect = function () {
+            if (this.node) return this.observer.observe(this.node, this.options), this;
+            throw new Error("还未初始化绑定，请您先绑定有效的 Node 节点")
+        }, o.prototype.disconnect = function () {
+            var e = this.observer.takeRecords();
+            e.length && this.callback(e), this.observer.disconnect()
+        }, n = o;
+
+        function o(t, e) {
+            var n = this;
+            this.options = {
+                subtree: !0,
+                childList: !0,
+                attributes: !0,
+                attributeOldValue: !0,
+                characterData: !0,
+                characterDataOldValue: !0
+            }, this.callback = function (e) {
+                t(e, n)
+            }, this.observer = new MutationObserver(this.callback), e && (this.options = e)
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0)(n(1));
+        (0, o.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            r = i.__importDefault(n(428)),
+            a = i.__importDefault(n(435)),
+            l = i.__importDefault(n(436)),
+            o = ((0, o.default)(u.prototype, "size", {
+                get: function () {
+                    return this.scroll.size
+                },
+                enumerable: !1,
+                configurable: !0
+            }), u.prototype.observe = function () {
+                this.content.observe(), this.scroll.observe(), this.editor.isCompatibleMode || this.range
+                    .observe()
+            }, u.prototype.save = function (e) {
+                e.length && (this.content.save(e), this.scroll.save(), this.editor.isCompatibleMode ||
+                this.range.save())
+            }, u.prototype.revoke = function () {
+                this.editor.change.disconnect();
+                var e = this.content.revoke();
+                e && (this.scroll.revoke(), this.editor.isCompatibleMode || (this.range.revoke(), this.editor
+                    .$textElem.focus())), this.editor.change.connect(), e && this.editor.change.emit()
+            }, u.prototype.restore = function () {
+                this.editor.change.disconnect();
+                var e = this.content.restore();
+                e && (this.scroll.restore(), this.editor.isCompatibleMode || (this.range.restore(),
+                    this.editor.$textElem.focus())), this.editor.change.connect(), e && this.editor
+                    .change.emit()
+            }, u);
+
+        function u(e) {
+            this.editor = e, this.content = new r.default(e), this.scroll = new a.default(e), this.range =
+                new l.default(e)
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(2),
+            i = o.__importDefault(n(429)),
+            r = o.__importDefault(n(433)),
+            n = (a.prototype.observe = function () {
+                this.editor.isCompatibleMode ? this.cache = new r.default(this.editor) : this.cache =
+                    new i.default(this.editor), this.cache.observe()
+            }, a.prototype.save = function (e) {
+                this.editor.isCompatibleMode ? this.cache.save() : this.cache.compile(e)
+            }, a.prototype.revoke = function () {
+                var e;
+                return null === (e = this.cache) || void 0 === e ? void 0 : e.revoke()
+            }, a.prototype.restore = function () {
+                var e;
+                return null === (e = this.cache) || void 0 === e ? void 0 : e.restore()
+            }, a);
+
+        function a(e) {
+            this.editor = e
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            r = i.__importDefault(n(99)),
+            a = i.__importDefault(n(431)),
+            l = n(432),
+            i = (o = r.default, i.__extends(u, o), u.prototype.observe = function () {
+                this.resetMaxSize(this.editor.config.historyMaxSize)
+            }, u.prototype.compile = function (e) {
+                return this.save(a.default(e)), this
+            }, u.prototype.revoke = function () {
+                return o.prototype.revoke.call(this, function (e) {
+                    l.revoke(e)
+                })
+            }, u.prototype.restore = function () {
+                return o.prototype.restore.call(this, function (e) {
+                    l.restore(e)
+                })
+            }, u);
+
+        function u(e) {
+            var t = o.call(this, e.config.historyMaxSize) || this;
+            return t.editor = e, t
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        n = n(0)(n(1));
+        (0, n.default)(t, "__esModule", {
+            value: !0
+        }), t.CeilStack = void 0;
+        o.prototype.resetMax = function (e) {
+            e = Math.abs(e), this.reset || isNaN(e) || (this.max = e, this.reset = !0)
+        }, (0, n.default)(o.prototype, "size", {
+            get: function () {
+                return this.data.length
+            },
+            enumerable: !1,
+            configurable: !0
+        }), o.prototype.instack = function (e) {
+            return this.data.unshift(e), this.max && this.size > this.max && (this.data.length = this.max),
+                this
+        }, o.prototype.outstack = function () {
+            return this.data.shift()
+        }, o.prototype.clear = function () {
+            return this.data.length = 0, this
+        }, n = o;
+
+        function o(e) {
+            void 0 === e && (e = 0), this.data = [], this.max = 0, this.reset = !1, (e = Math.abs(e)) && (
+                this.max = e)
+        }
+        t.CeilStack = n
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            u = o(n(4)),
+            s = o(n(26));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.compliePosition = t.complieNodes = t.compileValue = t.compileType = void 0;
+        var c = n(6);
+
+        function f(e) {
+            switch (e) {
+                case "childList":
+                    return "node";
+                case "attributes":
+                    return "attr";
+                default:
+                    return "text"
+            }
+        }
+
+        function d(e) {
+            switch (e.type) {
+                case "attributes":
+                    return e.target.getAttribute(e.attributeName) || "";
+                case "characterData":
+                    return e.target.textContent;
+                default:
+                    return ""
+            }
+        }
+
+        function p(e) {
+            var t = {};
+            return e.addedNodes.length && (t.add = c.toArray(e.addedNodes)), e.removedNodes.length && (t.remove =
+                c.toArray(e.removedNodes)), t
+        }
+
+        function h(e) {
+            e = e.previousSibling ? {
+                type: "before",
+                target: e.previousSibling
+            } : e.nextSibling ? {
+                type: "after",
+                target: e.nextSibling
+            } : {
+                type: "parent",
+                target: e.target
+            };
+            return e
+        }
+        t.compileType = f, t.compileValue = d, t.complieNodes = p, t.compliePosition = h;
+        var A = ["UL", "OL", "H1", "H2", "H3", "H4", "H5", "H6"];
+
+        function v(e, t) {
+            for (var n = 0, o = t.length - 1; 0 < o && e.contains(t[o]); o--) n++;
+            return n
+        }
+        t.default = function (e) {
+            var r = [],
+                a = !1,
+                l = [];
+            return (0, u.default)(e).call(e, function (e, t) {
+                var n, o, i = {
+                    type: f(e.type),
+                    target: e.target,
+                    attr: e.attributeName || "",
+                    value: d(e) || "",
+                    oldValue: e.oldValue || "",
+                    nodes: p(e),
+                    position: h(e)
+                };
+                r.push(i), c.UA.isFirefox && (a && e.addedNodes.length && 1 == e.addedNodes[0].nodeType &&
+                (o = {
+                    type: "node",
+                    target: n = e.addedNodes[0],
+                    attr: "",
+                    value: "",
+                    oldValue: "",
+                    nodes: {
+                        add: [a]
+                    },
+                    position: {
+                        type: "parent",
+                        target: n
+                    }
+                }, -1 != (0, s.default)(A).call(A, n.nodeName) ? (o.nodes.add = c.toArray(
+                    n.childNodes), r.push(o)) : 3 == a.nodeType ? (v(n, l) && (o.nodes
+                    .add = c.toArray(n.childNodes)), r.push(o)) : -1 == (0, s.default)
+                (A).call(A, e.target.nodeName) && v(n, l) && (o.nodes.add = c.toArray(
+                    n.childNodes), r.push(o))), "node" == i.type && 1 == e.removedNodes
+                    .length ? (a = e.removedNodes[0], l.push(a)) : (a = !1, l.length = 0))
+            }), r
+        }
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(4)),
+            a = o(n(130));
+
+        function l(t, e) {
+            var n = t.position.target;
+            switch (t.position.type) {
+                case "before":
+                    n.nextSibling ? (n = n.nextSibling, (0, r.default)(e).call(e, function (e) {
+                        t.target.insertBefore(e, n)
+                    })) : (0, r.default)(e).call(e, function (e) {
+                        t.target.appendChild(e)
+                    });
+                    break;
+                case "after":
+                    (0, r.default)(e).call(e, function (e) {
+                        t.target.insertBefore(e, n)
+                    });
+                    break;
+                default:
+                    (0, r.default)(e).call(e, function (e) {
+                        n.appendChild(e)
+                    })
+            }
+        }(0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.restore = t.revoke = void 0;
+        var u = {
+            node: function (t) {
+                for (var e = 0, n = (0, a.default)(t.nodes); e < n.length; e++) {
+                    var o = n[e],
+                        i = o[0],
+                        o = o[1];
+                    "add" === i ? (0, r.default)(o).call(o, function (e) {
+                        t.target.removeChild(e)
+                    }) : l(t, o)
+                }
+            },
+            text: function (e) {
+                e.target.textContent = e.oldValue
+            },
+            attr: function (e) {
+                var t = e.target;
+                null == e.oldValue ? t.removeAttribute(e.attr) : t.setAttribute(e.attr, e.oldValue)
+            }
+        };
+        t.revoke = function (e) {
+            for (var t = e.length - 1; - 1 < t; t--) {
+                var n = e[t];
+                u[n.type](n)
+            }
+        };
+        var s = {
+            node: function (e) {
+                for (var t = 0, n = (0, a.default)(e.nodes); t < n.length; t++) {
+                    var o = n[t],
+                        i = o[0],
+                        o = o[1];
+                    "add" === i ? l(e, o) : (0, r.default)(o).call(o, function (e) {
+                        e.parentNode.removeChild(e)
+                    })
+                }
+            },
+            text: function (e) {
+                e.target.textContent = e.value
+            },
+            attr: function (e) {
+                e.target.setAttribute(e.attr, e.value)
+            }
+        };
+        t.restore = function (e) {
+            for (var t = 0, n = e; t < n.length; t++) {
+                var o = n[t];
+                s[o.type](o)
+            }
+        }
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o = n(434),
+            n = (i.prototype.observe = function () {
+                this.data.resetMax(this.editor.config.historyMaxSize), this.data.insertLast(this.editor
+                    .$textElem.html())
+            }, i.prototype.save = function () {
+                return this.data.insertLast(this.editor.$textElem.html()), this
+            }, i.prototype.revoke = function () {
+                var e = this.data.prev();
+                return !!e && (this.editor.$textElem.html(e), !0)
+            }, i.prototype.restore = function () {
+                var e = this.data.next();
+                return !!e && (this.editor.$textElem.html(e), !0)
+            }, i);
+
+        function i(e) {
+            this.editor = e, this.data = new o.TailChain
+        }
+        t.default = n
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            r = o(n(93));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        }), t.TailChain = void 0;
+        a.prototype.resetMax = function (e) {
+            (e = Math.abs(e)) && (this.max = e)
+        }, (0, i.default)(a.prototype, "size", {
+            get: function () {
+                return this.data.length
+            },
+            enumerable: !1,
+            configurable: !0
+        }), a.prototype.insertLast = function (e) {
+            var t;
+            for (this.isRe && ((0, r.default)(t = this.data).call(t, this.point + 1), this.isRe = !1),
+                     this.data.push(e); this.max && this.size > this.max;) this.data.shift();
+            return this.point = this.size - 1, this
+        }, a.prototype.current = function () {
+            return this.data[this.point]
+        }, a.prototype.prev = function () {
+            if (this.isRe || (this.isRe = !0), this.point--, !(this.point < 0)) return this.current();
+            this.point = 0
+        }, a.prototype.next = function () {
+            if (this.isRe || (this.isRe = !0), this.point++, !(this.point >= this.size)) return this.current();
+            this.point = this.size - 1
+        }, i = a;
+
+        function a() {
+            this.data = [], this.max = 0, this.point = 0, this.isRe = !1
+        }
+        t.TailChain = i
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        });
+        var o, i = n(2),
+            n = i.__importDefault(n(99)),
+            i = (o = n.default, i.__extends(r, o), r.prototype.observe = function () {
+                var e = this;
+                this.target = this.editor.$textElem.elems[0], this.editor.$textElem.on("scroll",
+                    function () {
+                        e.last = e.target.scrollTop
+                    }), this.resetMaxSize(this.editor.config.historyMaxSize)
+            }, r.prototype.save = function () {
+                return o.prototype.save.call(this, [this.last, this.target.scrollTop]), this
+            }, r.prototype.revoke = function () {
+                var t = this;
+                return o.prototype.revoke.call(this, function (e) {
+                    t.target.scrollTop = e[0]
+                })
+            }, r.prototype.restore = function () {
+                var t = this;
+                return o.prototype.restore.call(this, function (e) {
+                    t.target.scrollTop = e[1]
+                })
+            }, r);
+
+        function r(e) {
+            var t = o.call(this, e.config.historyMaxSize) || this;
+            return t.editor = e, t.last = 0, t.target = e.$textElem.elems[0], t
+        }
+        t.default = i
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0)(n(1));
+        (0, o.default)(t, "__esModule", {
+            value: !0
+        });
+        var i = n(2),
+            r = i.__importDefault(n(99)),
+            a = i.__importDefault(n(3)),
+            l = n(6);
+
+        function u(e) {
+            return {
+                start: [e.startContainer, e.startOffset],
+                end: [e.endContainer, e.endOffset],
+                root: e.commonAncestorContainer,
+                collapsed: e.collapsed
+            }
+        }
+        var s, o = (s = r.default, i.__extends(c, s), (0, o.default)(c.prototype, "rangeHandle", {
+            get: function () {
+                var e = document.getSelection();
+                return e && e.rangeCount ? e.getRangeAt(0) : document.createRange()
+            },
+            enumerable: !1,
+            configurable: !0
+        }), c.prototype.observe = function () {
+            var t = this;
+
+            function e() {
+                var e = t.rangeHandle;
+                t.root !== e.commonAncestorContainer && !t.root.contains(e.commonAncestorContainer) ||
+                t.editor.isComposing || t.updateLastRange()
+            }
+            this.root = this.editor.$textElem.elems[0], this.resetMaxSize(this.editor.config.historyMaxSize),
+                a.default(document).on("selectionchange", e), this.editor.beforeDestroy(function () {
+                a.default(document).off("selectionchange", e)
+            }), t.editor.$textElem.on("keydown", function (e) {
+                "Backspace" != e.key && "Delete" != e.key || t.updateLastRange()
+            })
+        }, c.prototype.save = function () {
+            var e = u(this.rangeHandle);
+            return s.prototype.save.call(this, [this.lastRange, e]), this.lastRange = e, this
+        }, c.prototype.set = function (e) {
+            try {
+                if (e) {
+                    var t = this.rangeHandle;
+                    return t.setStart.apply(t, e.start), t.setEnd.apply(t, e.end), this.editor.menus
+                        .changeActive(), !0
+                }
+            } catch (e) {
+                return !1
+            }
+            return !1
+        }, c.prototype.revoke = function () {
+            var t = this;
+            return s.prototype.revoke.call(this, function (e) {
+                t.set(e[0])
+            })
+        }, c.prototype.restore = function () {
+            var t = this;
+            return s.prototype.restore.call(this, function (e) {
+                t.set(e[1])
+            })
+        }, c);
+
+        function c(e) {
+            var t = s.call(this, e.config.historyMaxSize) || this;
+            return t.editor = e, t.lastRange = u(document.createRange()), t.root = e.$textElem.elems[0], t.updateLastRange =
+                l.debounce(function () {
+                    t.lastRange = u(t.rangeHandle)
+                }, e.config.onchangeTimeout), t
+        }
+        t.default = o
+    }, function (e, t, n) {
+        "use strict";
+        var o = n(0),
+            i = o(n(1)),
+            a = o(n(30));
+        (0, i.default)(t, "__esModule", {
+            value: !0
+        });
+        var l = n(2).__importDefault(n(3));
+        n(438), t.default = function (n) {
+            var o, i, r = !1;
+            return n.txt.eventHooks.changeEvents.push(function () {
+                r && (0, a.default)(o).call(o, ".w-e-content-preview").html(n.$textElem.html())
+            }), {
+                disable: function () {
+                    var e, t;
+                    r || (n.$textElem.hide(), e = n.zIndex.get("textContainer"), t = n.txt.html(),
+                        o = l.default('<div class="w-e-content-mantle" style="z-index:' + e +
+                            '">\n                <div class="w-e-content-preview w-e-text">' +
+                            t + "</div>\n            </div>"), n.$textContainerElem.append(
+                        o), t = n.zIndex.get("menu"), i = l.default(
+                        '<div class="w-e-menue-mantle" style="z-index:' + t +
+                        '"></div>'), n.$toolbarElem.append(i), r = !0)
+                },
+                enable: function () {
+                    r && (o.remove(), i.remove(), n.$textElem.show(), r = !1)
+                }
+            }
+        }
+    }, function (e, t, n) {
+        var o = n(21),
+            i = n(439),
+            n = {
+                insert: "head",
+                singleton: !1
+            };
+        o(i = "string" == typeof (i = i.__esModule ? i.default : i) ? [[e.i, i, ""]] : i, n);
+        e.exports = i.locals || {}
+    }, function (e, t, n) {
+        (t = n(22)(!1)).push([e.i,
+            ".w-e-content-mantle {\n  width: 100%;\n  height: 100%;\n  overflow-y: auto;\n}\n.w-e-content-mantle .w-e-content-preview {\n  width: 100%;\n  min-height: 100%;\n  padding: 0 10px;\n  line-height: 1.5;\n}\n.w-e-content-mantle .w-e-content-preview img {\n  cursor: default;\n}\n.w-e-content-mantle .w-e-content-preview img:hover {\n  box-shadow: none;\n}\n.w-e-menue-mantle {\n  position: absolute;\n  height: 100%;\n  width: 100%;\n  top: 0;\n  left: 0;\n}\n",
+            ""]), e.exports = t
+    }, function (e, t, n) {
+        "use strict";
+        (0, n(0)(n(1)).default)(t, "__esModule", {
+            value: !0
+        })
+    }], i.c = o, i.d = function (e, t, n) {
+        i.o(e, t) || Object.defineProperty(e, t, {
+            enumerable: !0,
+            get: n
+        })
+    }, i.r = function (e) {
+        "undefined" != typeof Symbol && Symbol.toStringTag && Object.defineProperty(e, Symbol.toStringTag, {
+            value: "Module"
+        }), Object.defineProperty(e, "__esModule", {
+            value: !0
+        })
+    }, i.t = function (t, e) {
+        if (1 & e && (t = i(t)), 8 & e) return t;
+        if (4 & e && "object" == typeof t && t && t.__esModule) return t;
+        var n = Object.create(null);
+        if (i.r(n), Object.defineProperty(n, "default", {
+            enumerable: !0,
+            value: t
+        }), 2 & e && "string" != typeof t)
+            for (var o in t) i.d(n, o, function (e) {
+                return t[e]
+            }.bind(null, o));
+        return n
+    }, i.n = function (e) {
+        var t = e && e.__esModule ? function () {
+            return e.default
+        } : function () {
+            return e
+        };
+        return i.d(t, "a", t), t
+    }, i.o = function (e, t) {
+        return Object.prototype.hasOwnProperty.call(e, t)
+    }, i.p = "", i(i.s = 140).default;
+
+    function i(e) {
+        if (o[e]) return o[e].exports;
+        var t = o[e] = {
+            i: e,
+            l: !1,
+            exports: {}
+        };
+        return n[e].call(t.exports, t, t.exports, i), t.l = !0, t.exports
+    }
+    var n, o
+});
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleList.html b/ruoyi-content/src/main/resources/templates/content/article/articleList.html
index 3265e694a..c9d00e107 100644
--- a/ruoyi-content/src/main/resources/templates/content/article/articleList.html
+++ b/ruoyi-content/src/main/resources/templates/content/article/articleList.html
@@ -287,10 +287,8 @@
             cache: false,
             success: function (data) {
                 if (data.result) {
-                    const code = {
-                        'code': 0
-                    };
-                    $.operate.successCallback(code);
+                    $.modal.alertSuccess("删除成功！");
+                    $.table.search();
                 } else {
                     $.modal.alertError(data.info);
                 }
diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
index 0ae2d97d5..b0272e8bd 100644
--- a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
+++ b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
@@ -5,11 +5,164 @@
     <th:block th:include="include :: layout-latest-css"/>
     <th:block th:include="include :: ztree-css"/>
     <th:block th:include="include :: datetimepicker-css"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no"/>
+    <meta name="format-detection" content="telephone=no,email=no">
 </head>
 <style>
     #tree_1_check {
         display: none;
     }
+
+    .layui-layer-btn0 {
+        display: none;
+    }
+
+    p {
+        margin: 0;
+        padding: 0;
+    }
+
+    #div1 {
+        margin: 10px auto;
+        border: 1px solid #ccc;
+    }
+
+    #div1 .title {
+        width: 100%;
+        margin: 0 auto;
+        position: relative;
+        z-index: 0;
+        padding: 5px 24px;
+        border-top: 1px solid #ccc;
+        box-sizing: border-box;
+    }
+
+    .text {
+        min-height: 27.43px;
+    }
+
+    .head, .author {
+        display: block;
+        width: 100%;
+        font-size: 20px;
+        color: #000;
+        min-height: 30px;
+        margin-bottom: 5px;
+        outline: none;
+        resize: none;
+        border: none;
+    }
+
+    .head {
+        font-size: 24px;
+    }
+
+    .head[contenteditable]:empty:before, .author[contenteditable]:empty:before {
+        content: attr(placeholder);
+        color: #D4D4D4;
+    }
+
+    .head[contenteditable]:focus, .author[contenteditable]:focus {
+        content: none;
+    }
+
+    .editorcontent {
+        font-size: 18px;
+        line-height: 20px;
+        height: 370px;
+        overflow: auto;
+        padding-top: 10px;
+        border-top: 1px solid #ccc;
+    }
+
+    .editorcontent div {
+        min-height: 27.43px;
+    }
+
+    /* 上传图片*/
+    .abstract {
+        font-size: .26rem;
+        margin: 10px 0;
+        color: #333;
+        float: left;
+    }
+
+    .cover_abstract {
+        width: 100%;
+        display: flex;
+    }
+
+    .imgload {
+        position: relative;
+        width: 25%;
+        text-align: center;
+        overflow: hidden;
+        height: 90px;
+        line-height: 90px;
+        background-color: #fbfdff;
+        border: 1px dashed #c0ccda;
+        border-radius: 6px;
+        margin: 0 10px;
+        box-sizing: border-box;
+    }
+
+    .fileImg {
+        position: absolute;
+        top: 0;
+        left: 0;
+        display: inline-block;
+        width: 100%;
+        height: 100%;
+        background: none;
+        margin: 0px;
+        padding: 0px;
+        opacity: 0;
+        filter: alpha(opacity=0);
+        cursor: pointer;
+        z-index: 2;
+    }
+
+    .avatar {
+        position: absolute;
+        top: 0;
+        left: 0;
+        display: inline-block;
+        width: 100%;
+        height: 100%;
+        z-index: 1;
+    }
+
+    .addIcon {
+        position: relative;
+        top: 0;
+        left: 0;
+        display: inline-block;
+        width: 100%;
+        height: 100%;
+    }
+
+    .addIcon::before {
+        content: '';
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        width: 30px;
+        margin-left: -15px;
+        margin-top: -2px;
+        border-top: 2px solid #cccccc;
+    }
+
+    .addIcon::after {
+        content: '';
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        height: 30px;
+        margin-left: -2px;
+        margin-top: -15px;
+        border-left: 2px solid #ccc;
+    }
 </style>
 <body class="gray-bg">
 <div class="container-div">
@@ -53,6 +206,9 @@
                 <i class="fa fa-remove"></i> 批量移除
             </a>
             <a class="btn btn-success" style="margin-left: 15px;" data-toggle="modal" data-target="#myModal4">
+                <i class="fa fa-newspaper-o"></i> 导入文章
+            </a>
+            <a class="btn btn-success" style="margin-left: 15px;" onclick="createArticle()">
                 <i class="fa fa-newspaper-o"></i> 创建文章
             </a>
         </div>
@@ -187,7 +343,7 @@
                 <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
                         class="sr-only">Close</span>
                 </button>
-                <h5 class="modal-title" style="text-align: left; font-size: 23px;">创建文章</h5>
+                <h5 class="modal-title" style="text-align: left; font-size: 23px;">导入文章</h5>
             </div>
             <div class="modal-body" style="background: #ffffff;">
                 <form class="form-horizontal m" id="form-picAdverts-add3">
@@ -246,21 +402,78 @@
         </div>
     </div>
 </div>
+<div class="modal inmodal" id="myModal5" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" style="width: 800px;">
+        <div class="modal-content animated fadeIn">
+            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5; padding: 15px 15px;">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
+                        class="sr-only">Close</span>
+                </button>
+                <h5 class="modal-title" style="text-align: left; font-size: 23px;">创建文章</h5>
+            </div>
+            <div class="modal-body" style="background: #ffffff;">
+                <form class="form-horizontal" id="form-picAdverts-add5">
+                    <div class="col-md-12" style="margin-top: -15px;">
+                        <div class="form-group">
+                            <div id="div1">
+                                <div class="toolbar"></div>
+                                <div class="title">
+                                    <div contenteditable="true" class="head" placeholder="请在这里输入标题"></div>
+                                    <div contenteditable="true" class="author" placeholder="请输入作者"></div>
+                                    <div class="editorcontent" contenteditable="true">
+                                        <div></div>
+                                    </div>
+                                </div>
+                            </div>
+
+                            <p class="abstract" style="margin-left: 15px;">封面摘要：</p>
+                            <p class="abstract" style="margin-left: 135px;">分享描述：</p>
+                            <div>
+                                <div class="cover_abstract">
+                                    <div class="imgload">
+                                        <input type="file" class="fileImg"
+                                               accept="image/png,image/gif，image/jpg, image/jpeg"
+                                               onchange="uploadOss(this)">
+                                        <img src="" class="avatar" style="display:none"/>
+                                        <i class="addIcon"></i>
+                                    </div>
+                                    <textarea autocomplete="off" placeholder="请输入内容" class="el-textarea__inner"
+                                              style="min-height: 33px;height: 90px; width: 70%"></textarea>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
+                <button type="button" class="btn btn-white" data-dismiss="modal" th:id="modalColse">关闭</button>
+                <button type="button" class="btn btn-primary" th:onclick="createArticleL()">创建文章</button>
+            </div>
+        </div>
+    </div>
+</div>
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: layout-latest-js"/>
 <th:block th:include="include :: ztree-js"/>
 <th:block th:include="include :: datetimepicker-js"/>
+<link th:href="@{/css/bootstrapValidator.min.css}" rel="stylesheet"/>
+<link th:href="@{/css/fileinput.min.css}" rel="stylesheet"/>
+<script th:src="@{/js/bootstrapValidator.min.js}"></script>
+<script th:src="@{/js/fileinput.min.js}"></script>
+<script th:src="@{/js/fileinput_locale_zh.js}"></script>
+<script th:src="@{/js/wangEditor.js}"></script>
 <script th:inline="javascript">
 
-    var path = ctx;
-    var prefix = ctx + "article";
+    let path = ctx;
+    let prefix = ctx + "article";
 
-    var baseDataList = [];
-    var baseDataListSecond = [];
-    var cloumnTree = [];
-    var article;
-    var publish;
-    var number;
+    let baseDataList = [];
+    let baseDataListSecond = [];
+    let cloumnTree = [];
+    let article;
+    let publish;
+    let number;
+    let filePath;
 
     $(function () {
         setFirstQuery();
@@ -450,8 +663,21 @@
             });
 
         });
+
     });
 
+    // 富文本的创建
+    const E = window.wangEditor;
+    const editor = new E('#div1');
+
+    editor.config.onchange = function (newHtml) {
+        console.log('change 之后最新的 html', newHtml)
+        console.log($('.editorcontent').html())
+
+    }
+
+    editor.create();
+
     function queryCnameBySpecialChannel(id, type, num) {
         if (baseDataListSecond == null) {
             articleTypeInit(type, num);
@@ -484,6 +710,142 @@
         return returnValue;
     }
 
+    function uploadOss(obj) {
+        $('#myModal5').modal('hide');
+        $.modal.loading("上传中。。。");
+        let formData = new FormData();
+        formData.append('file', obj.files[0]);
+        $.ajax({
+            type: "post",
+            url: '/oss',
+            data: formData,
+            processData: false,//不需要对数据进行处理
+            contentType: false,
+            cache: false,
+            dataType: "json",
+            success: function (data) {
+                $(".avatar").attr("src", data.object);
+                filePath = data.object;
+                $(".avatar").css('display', 'block');
+                $(".addIcon").css('display', 'none');
+                $.modal.closeLoading();
+                $('#myModal5').modal('show');
+            },
+            error: function () {
+                $.modal.closeLoading();
+                $('#myModal5').modal('show');
+            }
+        });
+    }
+
+    function createArticle() {
+        $('.head').html('');
+        $('.author').html('');
+        $('.el-textarea__inner').text('');
+        $('.editorcontent').html('<div></div>');
+
+
+        filePath = '';
+        $(".avatar").attr('src', '')
+        $(".avatar").css('display', 'none');
+        $(".addIcon").css('display', 'block');
+        $('#myModal5').modal('show');
+    }
+
+    function createArticleL() {
+        let title = $('.head').text();
+        let author = $('.author').text();
+        let body = $('.editorcontent').html();
+        if (title == '') {
+            $.modal.alertWarning("请输入标题");
+            return;
+        }
+        if (author == '') {
+            $.modal.alertWarning("请输入作者");
+            return;
+        }
+        if (body == '') {
+            $.modal.alertWarning("请输入文章内容");
+            return;
+        }
+        if (filePath == '') {
+            $.modal.alertWarning("请上传分享图片");
+            return;
+        }
+
+        body = '<div id="js_article" class="rich_media"><div class="rich_media_inner">' +
+            '<div id="page-content" class="rich_media_area_primary">' +
+            '<div id="img-content" class="rich_media_wrp"><div id="activity-name">' + title + '</div>'
+            + '<div id="meta_content">' + author + '</div>' + body + '</div></div></div></div>';
+
+        body = body + '<style>table{border-top: 1px solid #ccc;border-left: 1px solid #ccc;}' +
+            'table td, table th{border-bottom: 1px solid #ccc; border-right: 1px solid #ccc; padding: 3px 5px;}' +
+            'table th {border-bottom: 2px solid #ccc; text-align: center;}' +
+            'blockquote{display: block;border-left: 8px solid #d0e5f2;padding: 5px 10px;margin: 10px 0;' +
+            'line-height: 1.4;font-size: 100%;background-color: #f1f1f1;}' +
+            'code {display: inline-block;*display: inline;*zoom: 1;background-color: #f1f1f1;' +
+            'border-radius: 3px;padding: 3px 5px;margin: 0 3px;}' +
+            'pre code {display: block;}' +
+            'ul, ol {margin: 10px 0 10px 20px;}</style>'
+
+        $('#myModal5').modal('hide');
+        $.modal.loading("创建文章中请等待。。。");
+        $.ajax({
+            url: path + "article/create",
+            data: {
+                'author': "",
+                'createUser': "",
+                'ids': "",
+                'isAuthorization': "0",
+                'isReserve': "0",
+                'automaticName': "",
+                'introduction': "",
+                'labelIds': "",
+                'isJoinActive': "0",
+                'articleName': title,
+                'shareImgUrl': filePath,
+                'shareDes': $('.el-textarea__inner').text(),
+                'articleContent': body
+            },
+            type: "post",
+            success: function (data) {
+                $.modal.closeLoading();
+                if (data.result) {
+                    $.modal.alertSuccess("创建成功！");
+                    $.table.search();
+                    // localStorage.setItem("nryx_articleContent", data.object.articleContent); // 文章内容
+                    // localStorage.setItem("nryx_originalUrl", data.object.originalUrl); // 文章链接
+                    // // //文章名称
+                    // localStorage.setItem("nryx_articleName", data.object.articleName); // 文章名称
+                    // localStorage.setItem("nryx_shareImgUrl", data.object.shareImgUrl); // 文章分享图片
+                    // // //文章分享标题
+                    // localStorage.setItem("nryx_shareTitle", data.object.shareTitle); // 文章分享标题
+                    // localStorage.setItem("nryx_shareDes", data.object.shareDes); // 文章分享描述
+                    // localStorage.setItem("nryx_listPicUrl", data.object.listPicUrl); // 文章列表展示图片
+                    // localStorage.setItem("nryx_adId", data.object.adId); // 广告id
+                    // localStorage.setItem("nryx_isAuthorization", data.object.isAuthorization); // 是否授权
+                    // localStorage.setItem("nryx_isJoinActive", data.object.isJoinActive); // 是否添加优选活动
+                    // localStorage['nryx_editahref'] = data.object.articleEditUrl;
+                    // $.table.refresh();
+                    // let btn = ['<i class="fa fa-close"></i> 关闭'];
+                    // let options = {
+                    //     title: '创建文章',
+                    //     url: localStorage['nryx_editahref'],
+                    //     btn: btn,
+                    //     callBack: closeFrame
+                    // };
+                    // $.modal.openOptions(options);
+                } else {
+                    $.modal.alertError(data.info)
+                }
+            },
+            error: function () {
+                $.modal.closeLoading();
+            }
+        });
+
+    }
+
     /** **查询公共数据** */
     function articleTypeInit(type, num) {
         $.ajax({
@@ -1017,8 +1379,15 @@
             cache: false,
             success: function (data) {
                 if (data.result) {
-                    $.modal.open('文章预览', data.object.editUrl + '?l=1')
 
+                    let btn = ['<i class="fa fa-close"></i> 关闭'];
+                    let options = {
+                        title: '文章预览',
+                        url: data.object.editUrl + '?l=1',
+                        btn: btn,
+                        callBack: closeFrame
+                    };
+                    $.modal.openOptions(options);
                 } else {
                     $.modal.alertError("预览失败，请稍后重试！");
                 }
@@ -1029,6 +1398,10 @@
         });
     }
 
+    function closeFrame(index, layero) {
+        $.modal.close(index);
+    }
+
     //广告列表初始化
     function advertisementTypeInit() {
         $.ajax({
@@ -1164,7 +1537,6 @@
             success: function (data) {
                 $.modal.closeLoading();
                 if (data.result) {
-                    debugger
                     localStorage.setItem("nryx_articleContent", data.object.articleContent); // 文章内容
                     localStorage.setItem("nryx_originalUrl", data.object.originalUrl); // 文章链接
                     // //文章名称
@@ -1179,7 +1551,14 @@
                     localStorage.setItem("nryx_isJoinActive", data.object.isJoinActive); // 是否添加优选活动
                     localStorage['nryx_editahref'] = data.object.articleEditUrl;
                     $.table.refresh();
-                    $.modal.open('创建文章', localStorage['nryx_editahref'])
+                    let btn = ['<i class="fa fa-close"></i> 关闭'];
+                    let options = {
+                        title: '创建文章',
+                        url: localStorage['nryx_editahref'],
+                        btn: btn,
+                        callBack: closeFrame
+                    };
+                    $.modal.openOptions(options);
                 } else {
                     $.modal.alertError(data.info)
                 }

From c69aef7386fd37f2cd5ab8f67fd04cf015093e16 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Wed, 14 Apr 2021 10:18:52 +0800
Subject: [PATCH 24/30] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/content/article/articleManage.html      | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
index b0272e8bd..3993d4d92 100644
--- a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
+++ b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
@@ -741,7 +741,7 @@
     function createArticle() {
         $('.head').html('');
         $('.author').html('');
-        $('.el-textarea__inner').text('');
+        $('.el-textarea__inner').val('');
         $('.editorcontent').html('<div></div>');
 
 
@@ -776,7 +776,7 @@
         body = '<div id="js_article" class="rich_media"><div class="rich_media_inner">' +
             '<div id="page-content" class="rich_media_area_primary">' +
             '<div id="img-content" class="rich_media_wrp"><div id="activity-name">' + title + '</div>'
-            + '<div id="meta_content">' + author + '</div>' + body + '</div></div></div></div>';
+            + '<div id="meta_content">' + author + '</div><div id="bodycontent">' + body + '</div></div></div></div></div>';
 
         body = body + '<style>table{border-top: 1px solid #ccc;border-left: 1px solid #ccc;}' +
             'table td, table th{border-bottom: 1px solid #ccc; border-right: 1px solid #ccc; padding: 3px 5px;}' +
@@ -786,7 +786,12 @@
             'code {display: inline-block;*display: inline;*zoom: 1;background-color: #f1f1f1;' +
             'border-radius: 3px;padding: 3px 5px;margin: 0 3px;}' +
             'pre code {display: block;}' +
-            'ul, ol {margin: 10px 0 10px 20px;}</style>'
+            'ul, ol {margin: 10px 0 10px 20px;}' +
+            '#activity-name,#meta_content{display: block;width: 100%;font-size: 20px;color: #000;' +
+            'min-height: 30px;margin-bottom: 5px;outline: none;resize: none;border: none;}' +
+            '#activity-name{font-size: 24px;}' +
+            '#bodycontent{font-size: 18px;line-height: 20px;padding-top: 10px;}' +
+            '#bodycontent div{min-height: 27.43px;}</style>';
 
         $('#myModal5').modal('hide');
         $.modal.loading("创建文章中请等待。。。");

From 2940be4e0b1d07a28ba7814937de3f3945eba23d Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Fri, 16 Apr 2021 14:41:54 +0800
Subject: [PATCH 25/30] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8mappe?=
 =?UTF-8?q?r?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/content/service/impl/LibraryServiceImpl.java     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
index d52676a80..eb58c8f19 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/LibraryServiceImpl.java
@@ -57,8 +57,6 @@ public class LibraryServiceImpl implements LibraryService {
     @Autowired
     private ArticlePublishTrackMapper articlePublishTrackMapper;
     @Autowired
-    private ArticleSendUrlMapper articleSendUrlMapper;
-    @Autowired
     private CmsSysUserMapper cmsSysUserMapper;
     @Autowired
     private ArticlePublishSendMapper articlePublishSendMapper;
@@ -692,7 +690,6 @@ public class LibraryServiceImpl implements LibraryService {
             LOGGER.info("请求企业号跳转文章url[{}]", articleUrl);
             Map result = new HashMap();
             String qyhArticleUrl = "";
-            ArticleSendUrl articleSendUrl = this.articleSendUrlMapper.selectByPrimaryKey(publishId);
 
             String sendViewUrl = viewUrl + "?" + "companyId=" + companyId + "&parentClickId=" + newClickId + "&qyhState=1";
             if ("1".equals(sendType)) {

From c7c4aa29be67348cef056e4d7b0ab4a1d62a73c2 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Wed, 21 Apr 2021 14:51:28 +0800
Subject: [PATCH 26/30] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ArticleManageController.java   |   5 +
 .../ruoyi/content/domain/ArticleSendUrl.java  | 291 ------
 .../content/domain/ArticleSendUrlExample.java | 932 -----------------
 .../content/mapper/ArticleSendUrlMapper.java  |  99 --
 .../service/impl/ArticleServiceImpl.java      |  80 +-
 .../com/ruoyi/content/utils/PathUtil.java     | 100 +-
 .../mapper/content/ArticleSendUrlMapper.xml   | 353 -------
 .../main/resources/static/css/Eleditor.css    | 544 ++++++++++
 .../static/css/createArticleBase.css          |   7 +
 .../static/css/createArticleStyle.css         | 343 +++++++
 .../main/resources/static/js/Eleditor.min.js  | 936 ++++++++++++++++++
 .../content/article/articleManage.html        | 136 ++-
 .../content/article/createArticle.html        | 258 +++++
 13 files changed, 2291 insertions(+), 1793 deletions(-)
 delete mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrl.java
 delete mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrlExample.java
 delete mode 100644 ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleSendUrlMapper.java
 delete mode 100644 ruoyi-content/src/main/resources/mapper/content/ArticleSendUrlMapper.xml
 create mode 100644 ruoyi-content/src/main/resources/static/css/Eleditor.css
 create mode 100644 ruoyi-content/src/main/resources/static/css/createArticleBase.css
 create mode 100644 ruoyi-content/src/main/resources/static/css/createArticleStyle.css
 create mode 100644 ruoyi-content/src/main/resources/static/js/Eleditor.min.js
 create mode 100644 ruoyi-content/src/main/resources/templates/content/article/createArticle.html

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
index 227b6e7cf..5f4a2f49c 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/controller/ArticleManageController.java
@@ -46,6 +46,11 @@ public class ArticleManageController extends BaseController {
         return prefix + "/articleList";
     }
 
+    @GetMapping("createPage")
+    public String createPage() {
+        return prefix + "/createArticle";
+    }
+
     /**
      * 查询所有公司发布的文章信息
      *
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrl.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrl.java
deleted file mode 100644
index b62d559dc..000000000
--- a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrl.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package com.ruoyi.content.domain;
-
-public class ArticleSendUrl {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column article_send_url.PUBLISH_ID
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    private String publishId;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column article_send_url.VERSION_NUMBER
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    private String versionNumber;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column article_send_url.QYH_ARTICLE_URL
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    private String qyhArticleUrl;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column article_send_url.CREATE_DATE
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    private String createDate;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column article_send_url.CREATE_TIME
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    private String createTime;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column article_send_url.CREATE_USER
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    private String createUser;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column article_send_url.UPDATE_USER
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    private String updateUser;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column article_send_url.UPDATE_DATE
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    private String updateDate;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column article_send_url.UPDATE_TIME
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    private String updateTime;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column article_send_url.PUBLISH_ID
-     *
-     * @return the value of article_send_url.PUBLISH_ID
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public String getPublishId() {
-        return publishId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column article_send_url.PUBLISH_ID
-     *
-     * @param publishId the value for article_send_url.PUBLISH_ID
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void setPublishId(String publishId) {
-        this.publishId = publishId;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column article_send_url.VERSION_NUMBER
-     *
-     * @return the value of article_send_url.VERSION_NUMBER
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public String getVersionNumber() {
-        return versionNumber;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column article_send_url.VERSION_NUMBER
-     *
-     * @param versionNumber the value for article_send_url.VERSION_NUMBER
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void setVersionNumber(String versionNumber) {
-        this.versionNumber = versionNumber;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column article_send_url.QYH_ARTICLE_URL
-     *
-     * @return the value of article_send_url.QYH_ARTICLE_URL
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public String getQyhArticleUrl() {
-        return qyhArticleUrl;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column article_send_url.QYH_ARTICLE_URL
-     *
-     * @param qyhArticleUrl the value for article_send_url.QYH_ARTICLE_URL
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void setQyhArticleUrl(String qyhArticleUrl) {
-        this.qyhArticleUrl = qyhArticleUrl;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column article_send_url.CREATE_DATE
-     *
-     * @return the value of article_send_url.CREATE_DATE
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public String getCreateDate() {
-        return createDate;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column article_send_url.CREATE_DATE
-     *
-     * @param createDate the value for article_send_url.CREATE_DATE
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void setCreateDate(String createDate) {
-        this.createDate = createDate;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column article_send_url.CREATE_TIME
-     *
-     * @return the value of article_send_url.CREATE_TIME
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column article_send_url.CREATE_TIME
-     *
-     * @param createTime the value for article_send_url.CREATE_TIME
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column article_send_url.CREATE_USER
-     *
-     * @return the value of article_send_url.CREATE_USER
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column article_send_url.CREATE_USER
-     *
-     * @param createUser the value for article_send_url.CREATE_USER
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column article_send_url.UPDATE_USER
-     *
-     * @return the value of article_send_url.UPDATE_USER
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public String getUpdateUser() {
-        return updateUser;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column article_send_url.UPDATE_USER
-     *
-     * @param updateUser the value for article_send_url.UPDATE_USER
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void setUpdateUser(String updateUser) {
-        this.updateUser = updateUser;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column article_send_url.UPDATE_DATE
-     *
-     * @return the value of article_send_url.UPDATE_DATE
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public String getUpdateDate() {
-        return updateDate;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column article_send_url.UPDATE_DATE
-     *
-     * @param updateDate the value for article_send_url.UPDATE_DATE
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void setUpdateDate(String updateDate) {
-        this.updateDate = updateDate;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column article_send_url.UPDATE_TIME
-     *
-     * @return the value of article_send_url.UPDATE_TIME
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public String getUpdateTime() {
-        return updateTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column article_send_url.UPDATE_TIME
-     *
-     * @param updateTime the value for article_send_url.UPDATE_TIME
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
-}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrlExample.java b/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrlExample.java
deleted file mode 100644
index 7c3b5a455..000000000
--- a/ruoyi-content/src/main/java/com/ruoyi/content/domain/ArticleSendUrlExample.java
+++ /dev/null
@@ -1,932 +0,0 @@
-package com.ruoyi.content.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ArticleSendUrlExample {
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    protected String orderByClause;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    protected boolean distinct;
-
-    /**
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    protected List<Criteria> oredCriteria;
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public ArticleSendUrlExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void setOrderByClause(String orderByClause) {
-        this.orderByClause = orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void setDistinct(boolean distinct) {
-        this.distinct = distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public boolean isDistinct() {
-        return distinct;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public List<Criteria> getOredCriteria() {
-        return oredCriteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void or(Criteria criteria) {
-        oredCriteria.add(criteria);
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public Criteria or() {
-        Criteria criteria = createCriteriaInternal();
-        oredCriteria.add(criteria);
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public Criteria createCriteria() {
-        Criteria criteria = createCriteriaInternal();
-        if (oredCriteria.size() == 0) {
-            oredCriteria.add(criteria);
-        }
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    protected Criteria createCriteriaInternal() {
-        Criteria criteria = new Criteria();
-        return criteria;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public void clear() {
-        oredCriteria.clear();
-        orderByClause = null;
-        distinct = false;
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    protected abstract static class GeneratedCriteria {
-        protected List<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> getCriteria() {
-            return criteria;
-        }
-
-        protected void addCriterion(String condition) {
-            if (condition == null) {
-                throw new RuntimeException("Value for condition cannot be null");
-            }
-            criteria.add(new Criterion(condition));
-        }
-
-        protected void addCriterion(String condition, Object value, String property) {
-            if (value == null) {
-                throw new RuntimeException("Value for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value));
-        }
-
-        protected void addCriterion(String condition, Object value1, Object value2, String property) {
-            if (value1 == null || value2 == null) {
-                throw new RuntimeException("Between values for " + property + " cannot be null");
-            }
-            criteria.add(new Criterion(condition, value1, value2));
-        }
-
-        public Criteria andPublishIdIsNull() {
-            addCriterion("PUBLISH_ID is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdIsNotNull() {
-            addCriterion("PUBLISH_ID is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdEqualTo(String value) {
-            addCriterion("PUBLISH_ID =", value, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdNotEqualTo(String value) {
-            addCriterion("PUBLISH_ID <>", value, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdGreaterThan(String value) {
-            addCriterion("PUBLISH_ID >", value, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdGreaterThanOrEqualTo(String value) {
-            addCriterion("PUBLISH_ID >=", value, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdLessThan(String value) {
-            addCriterion("PUBLISH_ID <", value, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdLessThanOrEqualTo(String value) {
-            addCriterion("PUBLISH_ID <=", value, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdLike(String value) {
-            addCriterion("PUBLISH_ID like", value, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdNotLike(String value) {
-            addCriterion("PUBLISH_ID not like", value, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdIn(List<String> values) {
-            addCriterion("PUBLISH_ID in", values, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdNotIn(List<String> values) {
-            addCriterion("PUBLISH_ID not in", values, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdBetween(String value1, String value2) {
-            addCriterion("PUBLISH_ID between", value1, value2, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andPublishIdNotBetween(String value1, String value2) {
-            addCriterion("PUBLISH_ID not between", value1, value2, "publishId");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberIsNull() {
-            addCriterion("VERSION_NUMBER is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberIsNotNull() {
-            addCriterion("VERSION_NUMBER is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberEqualTo(String value) {
-            addCriterion("VERSION_NUMBER =", value, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberNotEqualTo(String value) {
-            addCriterion("VERSION_NUMBER <>", value, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberGreaterThan(String value) {
-            addCriterion("VERSION_NUMBER >", value, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberGreaterThanOrEqualTo(String value) {
-            addCriterion("VERSION_NUMBER >=", value, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberLessThan(String value) {
-            addCriterion("VERSION_NUMBER <", value, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberLessThanOrEqualTo(String value) {
-            addCriterion("VERSION_NUMBER <=", value, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberLike(String value) {
-            addCriterion("VERSION_NUMBER like", value, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberNotLike(String value) {
-            addCriterion("VERSION_NUMBER not like", value, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberIn(List<String> values) {
-            addCriterion("VERSION_NUMBER in", values, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberNotIn(List<String> values) {
-            addCriterion("VERSION_NUMBER not in", values, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberBetween(String value1, String value2) {
-            addCriterion("VERSION_NUMBER between", value1, value2, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andVersionNumberNotBetween(String value1, String value2) {
-            addCriterion("VERSION_NUMBER not between", value1, value2, "versionNumber");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlIsNull() {
-            addCriterion("QYH_ARTICLE_URL is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlIsNotNull() {
-            addCriterion("QYH_ARTICLE_URL is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlEqualTo(String value) {
-            addCriterion("QYH_ARTICLE_URL =", value, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlNotEqualTo(String value) {
-            addCriterion("QYH_ARTICLE_URL <>", value, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlGreaterThan(String value) {
-            addCriterion("QYH_ARTICLE_URL >", value, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlGreaterThanOrEqualTo(String value) {
-            addCriterion("QYH_ARTICLE_URL >=", value, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlLessThan(String value) {
-            addCriterion("QYH_ARTICLE_URL <", value, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlLessThanOrEqualTo(String value) {
-            addCriterion("QYH_ARTICLE_URL <=", value, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlLike(String value) {
-            addCriterion("QYH_ARTICLE_URL like", value, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlNotLike(String value) {
-            addCriterion("QYH_ARTICLE_URL not like", value, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlIn(List<String> values) {
-            addCriterion("QYH_ARTICLE_URL in", values, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlNotIn(List<String> values) {
-            addCriterion("QYH_ARTICLE_URL not in", values, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlBetween(String value1, String value2) {
-            addCriterion("QYH_ARTICLE_URL between", value1, value2, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andQyhArticleUrlNotBetween(String value1, String value2) {
-            addCriterion("QYH_ARTICLE_URL not between", value1, value2, "qyhArticleUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateIsNull() {
-            addCriterion("CREATE_DATE is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateIsNotNull() {
-            addCriterion("CREATE_DATE is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateEqualTo(String value) {
-            addCriterion("CREATE_DATE =", value, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateNotEqualTo(String value) {
-            addCriterion("CREATE_DATE <>", value, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateGreaterThan(String value) {
-            addCriterion("CREATE_DATE >", value, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateGreaterThanOrEqualTo(String value) {
-            addCriterion("CREATE_DATE >=", value, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateLessThan(String value) {
-            addCriterion("CREATE_DATE <", value, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateLessThanOrEqualTo(String value) {
-            addCriterion("CREATE_DATE <=", value, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateLike(String value) {
-            addCriterion("CREATE_DATE like", value, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateNotLike(String value) {
-            addCriterion("CREATE_DATE not like", value, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateIn(List<String> values) {
-            addCriterion("CREATE_DATE in", values, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateNotIn(List<String> values) {
-            addCriterion("CREATE_DATE not in", values, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateBetween(String value1, String value2) {
-            addCriterion("CREATE_DATE between", value1, value2, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateDateNotBetween(String value1, String value2) {
-            addCriterion("CREATE_DATE not between", value1, value2, "createDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNull() {
-            addCriterion("CREATE_TIME is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIsNotNull() {
-            addCriterion("CREATE_TIME is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeEqualTo(String value) {
-            addCriterion("CREATE_TIME =", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotEqualTo(String value) {
-            addCriterion("CREATE_TIME <>", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThan(String value) {
-            addCriterion("CREATE_TIME >", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeGreaterThanOrEqualTo(String value) {
-            addCriterion("CREATE_TIME >=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThan(String value) {
-            addCriterion("CREATE_TIME <", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLessThanOrEqualTo(String value) {
-            addCriterion("CREATE_TIME <=", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeLike(String value) {
-            addCriterion("CREATE_TIME like", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotLike(String value) {
-            addCriterion("CREATE_TIME not like", value, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeIn(List<String> values) {
-            addCriterion("CREATE_TIME in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<String> values) {
-            addCriterion("CREATE_TIME not in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeBetween(String value1, String value2) {
-            addCriterion("CREATE_TIME between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotBetween(String value1, String value2) {
-            addCriterion("CREATE_TIME not between", value1, value2, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIsNull() {
-            addCriterion("CREATE_USER is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIsNotNull() {
-            addCriterion("CREATE_USER is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserEqualTo(String value) {
-            addCriterion("CREATE_USER =", value, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserNotEqualTo(String value) {
-            addCriterion("CREATE_USER <>", value, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserGreaterThan(String value) {
-            addCriterion("CREATE_USER >", value, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserGreaterThanOrEqualTo(String value) {
-            addCriterion("CREATE_USER >=", value, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserLessThan(String value) {
-            addCriterion("CREATE_USER <", value, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserLessThanOrEqualTo(String value) {
-            addCriterion("CREATE_USER <=", value, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserLike(String value) {
-            addCriterion("CREATE_USER like", value, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserNotLike(String value) {
-            addCriterion("CREATE_USER not like", value, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserIn(List<String> values) {
-            addCriterion("CREATE_USER in", values, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserNotIn(List<String> values) {
-            addCriterion("CREATE_USER not in", values, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserBetween(String value1, String value2) {
-            addCriterion("CREATE_USER between", value1, value2, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateUserNotBetween(String value1, String value2) {
-            addCriterion("CREATE_USER not between", value1, value2, "createUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserIsNull() {
-            addCriterion("UPDATE_USER is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserIsNotNull() {
-            addCriterion("UPDATE_USER is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserEqualTo(String value) {
-            addCriterion("UPDATE_USER =", value, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserNotEqualTo(String value) {
-            addCriterion("UPDATE_USER <>", value, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserGreaterThan(String value) {
-            addCriterion("UPDATE_USER >", value, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserGreaterThanOrEqualTo(String value) {
-            addCriterion("UPDATE_USER >=", value, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserLessThan(String value) {
-            addCriterion("UPDATE_USER <", value, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserLessThanOrEqualTo(String value) {
-            addCriterion("UPDATE_USER <=", value, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserLike(String value) {
-            addCriterion("UPDATE_USER like", value, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserNotLike(String value) {
-            addCriterion("UPDATE_USER not like", value, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserIn(List<String> values) {
-            addCriterion("UPDATE_USER in", values, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserNotIn(List<String> values) {
-            addCriterion("UPDATE_USER not in", values, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserBetween(String value1, String value2) {
-            addCriterion("UPDATE_USER between", value1, value2, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateUserNotBetween(String value1, String value2) {
-            addCriterion("UPDATE_USER not between", value1, value2, "updateUser");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateIsNull() {
-            addCriterion("UPDATE_DATE is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateIsNotNull() {
-            addCriterion("UPDATE_DATE is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateEqualTo(String value) {
-            addCriterion("UPDATE_DATE =", value, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateNotEqualTo(String value) {
-            addCriterion("UPDATE_DATE <>", value, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateGreaterThan(String value) {
-            addCriterion("UPDATE_DATE >", value, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateGreaterThanOrEqualTo(String value) {
-            addCriterion("UPDATE_DATE >=", value, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateLessThan(String value) {
-            addCriterion("UPDATE_DATE <", value, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateLessThanOrEqualTo(String value) {
-            addCriterion("UPDATE_DATE <=", value, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateLike(String value) {
-            addCriterion("UPDATE_DATE like", value, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateNotLike(String value) {
-            addCriterion("UPDATE_DATE not like", value, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateIn(List<String> values) {
-            addCriterion("UPDATE_DATE in", values, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateNotIn(List<String> values) {
-            addCriterion("UPDATE_DATE not in", values, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateBetween(String value1, String value2) {
-            addCriterion("UPDATE_DATE between", value1, value2, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateDateNotBetween(String value1, String value2) {
-            addCriterion("UPDATE_DATE not between", value1, value2, "updateDate");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNull() {
-            addCriterion("UPDATE_TIME is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIsNotNull() {
-            addCriterion("UPDATE_TIME is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeEqualTo(String value) {
-            addCriterion("UPDATE_TIME =", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotEqualTo(String value) {
-            addCriterion("UPDATE_TIME <>", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThan(String value) {
-            addCriterion("UPDATE_TIME >", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeGreaterThanOrEqualTo(String value) {
-            addCriterion("UPDATE_TIME >=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThan(String value) {
-            addCriterion("UPDATE_TIME <", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLessThanOrEqualTo(String value) {
-            addCriterion("UPDATE_TIME <=", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeLike(String value) {
-            addCriterion("UPDATE_TIME like", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotLike(String value) {
-            addCriterion("UPDATE_TIME not like", value, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeIn(List<String> values) {
-            addCriterion("UPDATE_TIME in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotIn(List<String> values) {
-            addCriterion("UPDATE_TIME not in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeBetween(String value1, String value2) {
-            addCriterion("UPDATE_TIME between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotBetween(String value1, String value2) {
-            addCriterion("UPDATE_TIME not between", value1, value2, "updateTime");
-            return (Criteria) this;
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table article_send_url
-     *
-     * @mbggenerated do_not_delete_during_merge Tue Sep 04 17:49:40 CST 2018
-     */
-    public static class Criteria extends GeneratedCriteria {
-
-        protected Criteria() {
-            super();
-        }
-    }
-
-    /**
-     * This class was generated by MyBatis Generator.
-     * This class corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    public static class Criterion {
-        private String condition;
-
-        private Object value;
-
-        private Object secondValue;
-
-        private boolean noValue;
-
-        private boolean singleValue;
-
-        private boolean betweenValue;
-
-        private boolean listValue;
-
-        private String typeHandler;
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
-
-        protected Criterion(String condition) {
-            super();
-            this.condition = condition;
-            this.typeHandler = null;
-            this.noValue = true;
-        }
-
-        protected Criterion(String condition, Object value, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.typeHandler = typeHandler;
-            if (value instanceof List<?>) {
-                this.listValue = true;
-            } else {
-                this.singleValue = true;
-            }
-        }
-
-        protected Criterion(String condition, Object value) {
-            this(condition, value, null);
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
-            super();
-            this.condition = condition;
-            this.value = value;
-            this.secondValue = secondValue;
-            this.typeHandler = typeHandler;
-            this.betweenValue = true;
-        }
-
-        protected Criterion(String condition, Object value, Object secondValue) {
-            this(condition, value, secondValue, null);
-        }
-    }
-}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleSendUrlMapper.java b/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleSendUrlMapper.java
deleted file mode 100644
index 0948c2c9b..000000000
--- a/ruoyi-content/src/main/java/com/ruoyi/content/mapper/ArticleSendUrlMapper.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.ruoyi.content.mapper;
-
-import com.ruoyi.content.domain.ArticleSendUrl;
-import com.ruoyi.content.domain.ArticleSendUrlExample;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface ArticleSendUrlMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    int countByExample(ArticleSendUrlExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    int deleteByExample(ArticleSendUrlExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    int deleteByPrimaryKey(String publishId);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    int insert(ArticleSendUrl record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    int insertSelective(ArticleSendUrl record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    List<ArticleSendUrl> selectByExample(ArticleSendUrlExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    ArticleSendUrl selectByPrimaryKey(String publishId);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    int updateByExampleSelective(@Param("record") ArticleSendUrl record, @Param("example") ArticleSendUrlExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    int updateByExample(@Param("record") ArticleSendUrl record, @Param("example") ArticleSendUrlExample example);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    int updateByPrimaryKeySelective(ArticleSendUrl record);
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table article_send_url
-     *
-     * @mbggenerated Tue Sep 04 17:49:40 CST 2018
-     */
-    int updateByPrimaryKey(ArticleSendUrl record);
-}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
index 9d1da35cf..08a62cef7 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
@@ -1179,7 +1179,7 @@ public class ArticleServiceImpl implements ArticleService {
         // 文章的发布id
         String publishId = userId + "a" + articleId;
 
-        msg = this.getHtmlUrl(articleId, articleName, shareImgUrl, shareDes, articleContent, ids, publishId, companyId,
+        msg = this.getHtmlUrl123(articleId, articleName, shareImgUrl, shareDes, articleContent, ids, publishId, companyId,
                 isAuthorization, isReserve, automaticName, introduction, isJoinActive);
         Map<String, String> resultMap1 = new HashMap<String, String>();
         resultMap1 = (Map<String, String>) msg.getObject();
@@ -1212,4 +1212,82 @@ public class ArticleServiceImpl implements ArticleService {
         return msg;
     }
 
+    /**
+     * 生成静态页面路径
+     */
+    public Message getHtmlUrl123(Integer articleId, String shareTitle, String shareImgUrl, String shareDes,
+                              String articleContent, String ids, String publishId, String companyId, String isAuthorization,
+                              String isReserve, String automaticName, String introduction, String isJoinActive) {
+        Message msg = new Message();
+        Map<String, String> resultMap = new HashMap<String, String>();
+        /*************** 根据链接爬文章***********start ****************************/
+        LOGGER.info(
+                "调用生成静态页面参数articleId[{}],shareTitle[{}],shareImgUrl[{}],shareDes[{}],ids[{}],publishId[{}],companyId[{}],isAuthorization[{}],isReserve[{}],automaticName[{}],introduction[{}],isJoinActive[{}]",
+                articleId, shareTitle, shareImgUrl, shareDes, ids, publishId, companyId, isAuthorization, isReserve,
+                automaticName, introduction, isJoinActive);
+        try {
+            /**************************** 生成静态页开始 ************************************/
+            Configuration conf = new Configuration();
+            Map<String, Object> pageData = new HashMap<String, Object>();
+            Map<String, String> articleMap = new HashMap<String, String>();
+            // 时间戳
+            String versionNumber = DateUtil.currentDate(DateUtil.yyyyMMddHHmmssSSS) + RandomUtils.randomNumber(3);
+            // 封装数据
+            articleMap.put("shareTitle", shareTitle);
+            articleMap.put("shareImgUrl", shareImgUrl);
+            articleMap.put("shareDes", shareDes);
+            articleMap.put("articleId", String.valueOf(articleId));
+            articleMap.put("articleContent", articleContent);
+            articleMap.put("companyId", companyId);
+            articleMap.put("versionNumber", versionNumber);
+            articleMap.put("publishId", publishId);
+            articleMap.put("isAuthorization", isAuthorization);// 是否授权
+            articleMap.put("isReserve", isReserve);
+            articleMap.put("isJoinActive", isJoinActive);
+            articleMap.put("automaticName", automaticName);
+            articleMap.put("introduction", introduction);
+            if (ids == null || "".equals(ids)) {
+                articleMap.put("adId", "");
+            } else {
+                articleMap.put("adId", ids);
+            }
+
+            pageData.put("articleInfo", articleMap);
+            // 静态页生成路径
+            String viewPath = PathUtil.getArticleViewUrl(versionNumber, String.valueOf(articleId));
+            String createPath = PathUtil.getArticleCreateUrl(versionNumber, articleId + versionNumber.substring(8, 14));
+            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_VIEW_PATH,
+                    PropertiesConstants.FILE_PATH + viewPath, pageData);
+            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_CREATE_PATH,
+                    PropertiesConstants.FILE_PATH + createPath, pageData);
+            // 把静态页上传到oss
+            OSSUtil.uploadFileHtml(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID,
+                    PropertiesConstants.OSSKEY, PropertiesConstants.BUCKETNAME,
+                    PropertiesConstants.FILE_PATH + viewPath, PropertiesConstants.OSSPATH + viewPath);
+            OSSUtil.uploadFileHtml(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID,
+                    PropertiesConstants.OSSKEY, PropertiesConstants.BUCKETNAME,
+                    PropertiesConstants.FILE_PATH + createPath, PropertiesConstants.OSSPATH + createPath);
+
+            String articleViewUrl = PropertiesConstants.OSS_URL + PropertiesConstants.OSSPATH + viewPath; // cdn路径
+            // 生产
+//			String articleEditUrl = PropertiesConstants.OSS_URL_HTTPS +
+//		    PropertiesConstants.OSSPATH + editPath; // cdn路径
+            // 测试
+            String articleEditUrl = PropertiesConstants.OSS_URL + PropertiesConstants.OSSPATH + createPath;
+            LOGGER.info("articleEditUrl[{}]===============", articleEditUrl);
+
+            /**************************** 生成静态页结束 ************************************/
+            // 保存文章的原始静态页面路径
+            resultMap.put("articleEditUrl", articleEditUrl);
+            resultMap.put("articleViewUrl", articleViewUrl);
+            resultMap.put("versionNumber", versionNumber);
+            LOGGER.info("生成静态页面的versionNumber为{}", versionNumber);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new BusinessException("系统繁忙,请稍后再试");
+        }
+        msg.setObject(resultMap);
+        return msg;
+    }
+
 }
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/utils/PathUtil.java b/ruoyi-content/src/main/java/com/ruoyi/content/utils/PathUtil.java
index 12a7dd8a4..dbd366470 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/utils/PathUtil.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/utils/PathUtil.java
@@ -7,50 +7,66 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 /**
  * 获取路径方法
- * @author Administrator
  *
+ * @author Administrator
  */
 public class PathUtil {
-	
-	/**
-	 * 获取web项目访问路径
-	 * 使用该方法是必须在web.xml中配置了监听  org.springframework.web.context.request.RequestContextListener  
-	 * @return
-	 */
-	public static String getWebPath(){
-		HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
-		String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/";  
-		return basePath;
-	}
-	
-	/**
-	 * 获取web项目classes路径
-	 * @return
-	 */
-	public static String getClassesPath(){
-		return Thread.currentThread().getContextClassLoader().getResource("").getPath();
-	}
-	
-	/**
-	 * 获取已发布文章的浏览静态页
-	*
-	*	liu.hx
-	*	2018年4月24日
-	* @throws
-	 */
-	public static String getArticleViewUrl(String timestamp,String articleId) {
-		return "template/html/view/"+timestamp.substring(0, 8)+"/"+articleId+"b"+timestamp+".html";
-	}
-	
-	/**
-	 * 获取文章编辑静态页
-	*
-	*	liu.hx
-	*	2018年4月24日
-	* @throws
-	 */
-	public static String getArticleEditUrl(String timestamp,String name) {
-		return "template/html/mkt-ms/edit/"+timestamp.substring(0, 8)+"/"+name+".html";
-	}
+
+    /**
+     * 获取web项目访问路径
+     * 使用该方法是必须在web.xml中配置了监听  org.springframework.web.context.request.RequestContextListener
+     *
+     * @return
+     */
+    public static String getWebPath() {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() + "/";
+        return basePath;
+    }
+
+    /**
+     * 获取web项目classes路径
+     *
+     * @return
+     */
+    public static String getClassesPath() {
+        return Thread.currentThread().getContextClassLoader().getResource("").getPath();
+    }
+
+    /**
+     * 获取已发布文章的浏览静态页
+     * <p>
+     * liu.hx
+     * 2018年4月24日
+     *
+     * @throws
+     */
+    public static String getArticleViewUrl(String timestamp, String articleId) {
+        return "template/html/view/" + timestamp.substring(0, 8) + "/" + articleId + "b" + timestamp + ".html";
+    }
+
+    /**
+     * 获取文章编辑静态页
+     * <p>
+     * liu.hx
+     * 2018年4月24日
+     *
+     * @throws
+     */
+    public static String getArticleEditUrl(String timestamp, String name) {
+        return "template/html/edit/" + timestamp.substring(0, 8) + "/" + name + ".html";
+    }
+
+    /**
+     * 获取文章编辑静态页
+     * <p>
+     * liu.hx
+     * 2018年4月24日
+     *
+     * @throws
+     */
+    public static String getArticleCreateUrl(String timestamp, String name) {
+        return "template/html/create/" + timestamp.substring(0, 8) + "/" + name + ".html";
+    }
 
 }
diff --git a/ruoyi-content/src/main/resources/mapper/content/ArticleSendUrlMapper.xml b/ruoyi-content/src/main/resources/mapper/content/ArticleSendUrlMapper.xml
deleted file mode 100644
index 8e3dd8f5d..000000000
--- a/ruoyi-content/src/main/resources/mapper/content/ArticleSendUrlMapper.xml
+++ /dev/null
@@ -1,353 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.content.mapper.ArticleSendUrlMapper" >
-  <resultMap id="BaseResultMap" type="com.ruoyi.content.domain.ArticleSendUrl" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    <id column="PUBLISH_ID" property="publishId" jdbcType="VARCHAR" />
-    <result column="VERSION_NUMBER" property="versionNumber" jdbcType="VARCHAR" />
-    <result column="QYH_ARTICLE_URL" property="qyhArticleUrl" jdbcType="VARCHAR" />
-    <result column="CREATE_DATE" property="createDate" jdbcType="VARCHAR" />
-    <result column="CREATE_TIME" property="createTime" jdbcType="VARCHAR" />
-    <result column="CREATE_USER" property="createUser" jdbcType="VARCHAR" />
-    <result column="UPDATE_USER" property="updateUser" jdbcType="VARCHAR" />
-    <result column="UPDATE_DATE" property="updateDate" jdbcType="VARCHAR" />
-    <result column="UPDATE_TIME" property="updateTime" jdbcType="VARCHAR" />
-  </resultMap>
-  <sql id="Example_Where_Clause" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    <where >
-      <foreach collection="oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    <where >
-      <foreach collection="example.oredCriteria" item="criteria" separator="or" >
-        <if test="criteria.valid" >
-          <trim prefix="(" suffix=")" prefixOverrides="and" >
-            <foreach collection="criteria.criteria" item="criterion" >
-              <choose >
-                <when test="criterion.noValue" >
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue" >
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue" >
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue" >
-                  and ${criterion.condition}
-                  <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    PUBLISH_ID, VERSION_NUMBER, QYH_ARTICLE_URL, CREATE_DATE, CREATE_TIME, CREATE_USER, 
-    UPDATE_USER, UPDATE_DATE, UPDATE_TIME
-  </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.ruoyi.content.domain.ArticleSendUrlExample" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    select
-    <if test="distinct" >
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from article_send_url
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null" >
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    select 
-    <include refid="Base_Column_List" />
-    from article_send_url
-    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    delete from article_send_url
-    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="com.ruoyi.content.domain.ArticleSendUrlExample" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    delete from article_send_url
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.ruoyi.content.domain.ArticleSendUrl" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    <!-- <selectKey resultType="java.lang.String" keyProperty="publishId" order="BEFORE" >
-       SELECT LAST_INSERT_ID() 
-    </selectKey> -->
-    insert into article_send_url (PUBLISH_ID, VERSION_NUMBER, QYH_ARTICLE_URL, 
-      CREATE_DATE, CREATE_TIME, CREATE_USER, 
-      UPDATE_USER, UPDATE_DATE, UPDATE_TIME
-      )
-    values (#{publishId,jdbcType=VARCHAR}, #{versionNumber,jdbcType=VARCHAR}, #{qyhArticleUrl,jdbcType=VARCHAR}, 
-      #{createDate,jdbcType=VARCHAR}, #{createTime,jdbcType=VARCHAR}, #{createUser,jdbcType=VARCHAR}, 
-      #{updateUser,jdbcType=VARCHAR}, #{updateDate,jdbcType=VARCHAR}, #{updateTime,jdbcType=VARCHAR}
-      )
-  </insert>
-  <insert id="insertSelective" parameterType="com.ruoyi.content.domain.ArticleSendUrl" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    <!-- <selectKey resultType="java.lang.String" keyProperty="publishId" order="BEFORE" >
-       SELECT LAST_INSERT_ID() 
-    </selectKey> -->
-    insert into article_send_url
-    <trim prefix="(" suffix=")" suffixOverrides="," >
-      PUBLISH_ID,
-      <if test="versionNumber != null" >
-        VERSION_NUMBER,
-      </if>
-      <if test="qyhArticleUrl != null" >
-        QYH_ARTICLE_URL,
-      </if>
-      <if test="createDate != null" >
-        CREATE_DATE,
-      </if>
-      <if test="createTime != null" >
-        CREATE_TIME,
-      </if>
-      <if test="createUser != null" >
-        CREATE_USER,
-      </if>
-      <if test="updateUser != null" >
-        UPDATE_USER,
-      </if>
-      <if test="updateDate != null" >
-        UPDATE_DATE,
-      </if>
-      <if test="updateTime != null" >
-        UPDATE_TIME,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides="," >
-      #{publishId,jdbcType=VARCHAR},
-      <if test="versionNumber != null" >
-        #{versionNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="qyhArticleUrl != null" >
-        #{qyhArticleUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="createDate != null" >
-        #{createDate,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null" >
-        #{createTime,jdbcType=VARCHAR},
-      </if>
-      <if test="createUser != null" >
-        #{createUser,jdbcType=VARCHAR},
-      </if>
-      <if test="updateUser != null" >
-        #{updateUser,jdbcType=VARCHAR},
-      </if>
-      <if test="updateDate != null" >
-        #{updateDate,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null" >
-        #{updateTime,jdbcType=VARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="com.ruoyi.content.domain.ArticleSendUrlExample" resultType="java.lang.Integer" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    select count(*) from article_send_url
-    <if test="_parameter != null" >
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    update article_send_url
-    <set >
-      <if test="record.publishId != null" >
-        PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.versionNumber != null" >
-        VERSION_NUMBER = #{record.versionNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="record.qyhArticleUrl != null" >
-        QYH_ARTICLE_URL = #{record.qyhArticleUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createDate != null" >
-        CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null" >
-        CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createUser != null" >
-        CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
-      </if>
-      <if test="record.updateUser != null" >
-        UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
-      </if>
-      <if test="record.updateDate != null" >
-        UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
-      </if>
-      <if test="record.updateTime != null" >
-        UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    update article_send_url
-    set PUBLISH_ID = #{record.publishId,jdbcType=VARCHAR},
-      VERSION_NUMBER = #{record.versionNumber,jdbcType=VARCHAR},
-      QYH_ARTICLE_URL = #{record.qyhArticleUrl,jdbcType=VARCHAR},
-      CREATE_DATE = #{record.createDate,jdbcType=VARCHAR},
-      CREATE_TIME = #{record.createTime,jdbcType=VARCHAR},
-      CREATE_USER = #{record.createUser,jdbcType=VARCHAR},
-      UPDATE_USER = #{record.updateUser,jdbcType=VARCHAR},
-      UPDATE_DATE = #{record.updateDate,jdbcType=VARCHAR},
-      UPDATE_TIME = #{record.updateTime,jdbcType=VARCHAR}
-    <if test="_parameter != null" >
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.ruoyi.content.domain.ArticleSendUrl" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    update article_send_url
-    <set >
-      <if test="versionNumber != null" >
-        VERSION_NUMBER = #{versionNumber,jdbcType=VARCHAR},
-      </if>
-      <if test="qyhArticleUrl != null" >
-        QYH_ARTICLE_URL = #{qyhArticleUrl,jdbcType=VARCHAR},
-      </if>
-      <if test="createDate != null" >
-        CREATE_DATE = #{createDate,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null" >
-        CREATE_TIME = #{createTime,jdbcType=VARCHAR},
-      </if>
-      <if test="createUser != null" >
-        CREATE_USER = #{createUser,jdbcType=VARCHAR},
-      </if>
-      <if test="updateUser != null" >
-        UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
-      </if>
-      <if test="updateDate != null" >
-        UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
-      </if>
-      <if test="updateTime != null" >
-        UPDATE_TIME = #{updateTime,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.ruoyi.content.domain.ArticleSendUrl" >
-    <!--
-      WARNING - @mbggenerated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 04 17:49:40 CST 2018.
-    -->
-    update article_send_url
-    set VERSION_NUMBER = #{versionNumber,jdbcType=VARCHAR},
-      QYH_ARTICLE_URL = #{qyhArticleUrl,jdbcType=VARCHAR},
-      CREATE_DATE = #{createDate,jdbcType=VARCHAR},
-      CREATE_TIME = #{createTime,jdbcType=VARCHAR},
-      CREATE_USER = #{createUser,jdbcType=VARCHAR},
-      UPDATE_USER = #{updateUser,jdbcType=VARCHAR},
-      UPDATE_DATE = #{updateDate,jdbcType=VARCHAR},
-      UPDATE_TIME = #{updateTime,jdbcType=VARCHAR}
-    where PUBLISH_ID = #{publishId,jdbcType=VARCHAR}
-  </update>
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/static/css/Eleditor.css b/ruoyi-content/src/main/resources/static/css/Eleditor.css
new file mode 100644
index 000000000..82d38b5ad
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/css/Eleditor.css
@@ -0,0 +1,544 @@
+/**
+* Version: 1.6
+* Title: Eleditor 移动端富文本编辑器
+* Site: https://eleditor.fixel.cn
+* Author: Try
+*/
+
+.Eleditor-scrollLocked {
+    height: 100%;
+    overflow: hidden
+}
+
+.Eleditor-wrap.Eleditor-mask {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, .5)
+}
+
+.Eleditor-loading {
+    display: none;
+    position: absolute;
+    padding: 15px;
+    background: rgba(255, 255, 255, .9);
+    z-index: 999;
+    width: 100%;
+    height: 100%
+}
+
+.Eleditor-loading p {
+    font-size: 12px;
+    color: #666;
+    text-align: center;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    -webkit-transform: translate(-50%, -50%)
+}
+
+.Eleditor-loading p:before {
+    content: '';
+    width: 25px;
+    height: 25px;
+    margin: 0 auto;
+    background: url(data:image/gif;base64,R0lGODlhIAAgALMAAP///7Ozs/v7+9bW1uHh4fLy8rq6uoGBgTQ0NAEBARsbG8TExJeXl/39/VRUVAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBQAAACwAAAAAIAAgAAAE5xDISSlLrOrNp0pKNRCdFhxVolJLEJQUoSgOpSYT4RowNSsvyW1icA16k8MMMRkCBjskBTFDAZyuAEkqCfxIQ2hgQRFvAQEEIjNxVDW6XNE4YagRjuBCwe60smQUDnd4Rz1ZAQZnFAGDd0hihh12CEE9kjAEVlycXIg7BAsMB6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YEvpJivxNaGmLHT0VnOgGYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHQjYKhKP1oZmADdEAAAh+QQFBQAAACwAAAAAGAAXAAAEchDISasKNeuJFKoHs4mUYlJIkmjIV54Soypsa0wmLSnqoTEtBw52mG0AjhYpBxioEqRNy8V0qFzNw+GGwlJki4lBqx1IBgjMkRIghwjrzcDti2/Gh7D9qN774wQGAYOEfwCChIV/gYmDho+QkZKTR3p7EQAh+QQFBQAAACwBAAAAHQAOAAAEchDISWdANesNHHJZwE2DUSEo5SjKKB2HOKGYFLD1CB/DnEoIlkti2PlyuKGEATMBaAACSyGbEDYD4zN1YIEmh0SCQQgYehNmTNNaKsQJXmBuuEYPi9ECAU/UFnNzeUp9VBQEBoFOLmFxWHNoQw6RWEocEQAh+QQFBQAAACwHAAAAGQARAAAEaRDICdZZNOvNDsvfBhBDdpwZgohBgE3nQaki0AYEjEqOGmqDlkEnAzBUjhrA0CoBYhLVSkm4SaAAWkahCFAWTU0A4RxzFWJnzXFWJJWb9pTihRu5dvghl+/7NQmBggo/fYKHCX8AiAmEEQAh+QQFBQAAACwOAAAAEgAYAAAEZXCwAaq9ODAMDOUAI17McYDhWA3mCYpb1RooXBktmsbt944BU6zCQCBQiwPB4jAihiCK86irTB20qvWp7Xq/FYV4TNWNz4oqWoEIgL0HX/eQSLi69boCikTkE2VVDAp5d1p0CW4RACH5BAUFAAAALA4AAAASAB4AAASAkBgCqr3YBIMXvkEIMsxXhcFFpiZqBaTXisBClibgAnd+ijYGq2I4HAamwXBgNHJ8BEbzgPNNjz7LwpnFDLvgLGJMdnw/5DRCrHaE3xbKm6FQwOt1xDnpwCvcJgcJMgEIeCYOCQlrF4YmBIoJVV2CCXZvCooHbwGRcAiKcmFUJhEAIfkEBQUAAAAsDwABABEAHwAABHsQyAkGoRivELInnOFlBjeM1BCiFBdcbMUtKQdTN0CUJru5NJQrYMh5VIFTTKJcOj2HqJQRhEqvqGuU+uw6AwgEwxkOO55lxIihoDjKY8pBoThPxmpAYi+hKzoeewkTdHkZghMIdCOIhIuHfBMOjxiNLR4KCW1ODAlxSxEAIfkEBQUAAAAsCAAOABgAEgAABGwQyEkrCDgbYvvMoOF5ILaNaIoGKroch9hacD3MFMHUBzMHiBtgwJMBFolDB4GoGGBCACKRcAAUWAmzOWJQExysQsJgWj0KqvKalTiYPhp1LBFTtp10Is6mT5gdVFx1bRN8FTsVCAqDOB9+KhEAIfkEBQUAAAAsAgASAB0ADgAABHgQyEmrBePS4bQdQZBdR5IcHmWEgUFQgWKaKbWwwSIhc4LonsXhBSCsQoOSScGQDJiWwOHQnAxWBIYJNXEoFCiEWDI9jCzESey7GwMM5doEwW4jJoypQQ743u1WcTV0CgFzbhJ5XClfHYd/EwZnHoYVDgiOfHKQNREAIfkEBQUAAAAsAAAPABkAEQAABGeQqUQruDjrW3vaYCZ5X2ie6EkcKaooTAsi7ytnTq046BBsNcTvItz4AotMwKZBIC6H6CVAJaCcT0CUBTgaTg5nTCu9GKiDEMPJg5YBBOpwlnVzLwtqyKnZagZWahoMB2M3GgsHSRsRACH5BAUFAAAALAEACAARABgAAARcMKR0gL34npkUyyCAcAmyhBijkGi2UW02VHFt33iu7yiDIDaD4/erEYGDlu/nuBAOJ9Dvc2EcDgFAYIuaXS3bbOh6MIC5IAP5Eh5fk2exC4tpgwZyiyFgvhEMBBEAIfkEBQUAAAAsAAACAA4AHQAABHMQyAnYoViSlFDGXBJ808Ep5KRwV8qEg+pRCOeoioKMwJK0Ekcu54h9AoghKgXIMZgAApQZcCCu2Ax2O6NUud2pmJcyHA4L0uDM/ljYDCnGfGakJQE5YH0wUBYBAUYfBIFkHwaBgxkDgX5lgXpHAXcpBIsRADs=) no-repeat center top;
+    background-size: 100%;
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 10px
+}
+
+.Eleditor-wrap ul {
+    list-style: none
+}
+
+.Eleditor-area,
+.Eleditor-area *,
+.Eleditor-wrap,
+.Eleditor-wrap * {
+    cursor: pointer;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+    tap-highlight-color: rgba(0, 0, 0, 0)
+}
+
+.Eleditor-area .Eleditor-active {
+    background: #cce0f2 !important;
+    padding: 2% !important
+}
+
+.Eleditor-controller {
+    background: #fafafa;
+    position: absolute;
+    box-sizing: border-box;
+    transform: translate(-50%, 0);
+    -webkit-transform: translate(-50%, 0);
+    left: 50%;
+    display: none;
+    margin-top: 5px;
+    box-shadow: 0 0 20px rgba(0, 0, 0, .2);
+    -webkit-box-shadow: 0 0 20px rgba(0, 0, 0, .2);
+    border-bottom: 1px solid #e1e1e1;
+    border-radius: 3px;
+    -webkit-border-radius: 3px
+}
+
+.Eleditor-controller ul {
+    margin-bottom: 2.5%;
+    /* hrjlhy */
+    margin: 0;
+    margin-bottom: 2.5%;
+}
+
+.Eleditor-controller ul:after {
+    content: '';
+    display: block;
+    height: 0;
+    clear: both
+}
+
+.Eleditor-controller ul li {
+    float: left;
+    display: inline-block;
+    width: 30%;
+    margin: 2% 0 0 2.5%;
+    height: 42px;
+    border-radius: 3px;
+    -webkit-border-radius: 3px;
+    line-height: 42px;
+    padding-left: 10%;
+    box-sizing: border-box;
+    font-size: 14px;
+    border-right: 1px solid #ddd;
+    border-bottom: 1px solid #ddd;
+    border-top: 1px solid #eee;
+    border-left: 1px solid #eee;
+    white-space: nowrap;
+    position: relative
+}
+
+.Eleditor-controller ul li.Eleditor-undo {
+    display: none
+}
+
+.Eleditor-controller ul li:before {
+    background-size: 100%;
+    background-repeat: no-repeat
+}
+
+.Eleditor-controller ul li:before {
+    content: '';
+    position: absolute;
+    left: 8px;
+    top: 12px;
+    width: 15px;
+    height: 15px;
+    display: block;
+    /* background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAANlBMVEUAAABIotJIodFIo9NIo9NHotJAn89IotFHotJHodFIn9dHotJIodJHotFHodFHodFHodFIotIElcMpAAAAEXRSTlMAwIBAf7AQ4HDvINCg8M+Qb3nwl3EAAAC/SURBVDjL7dPRasQgEEbhf3THqEm2Pe//sl3Ixc5GF3JRaAv97tQDwojiVfOsh+yNV2LQpc5AYCnYIEkJPAUGgqRowSRjVZQmoR2h/Yd/KNwUNVxymqIN5LDY0wJVqtDC5h1MmZO9SGXnJEs9WeC16KFUt+Cj65usS3ku+s0C/wxHGXJYnLQyDw3WYTyTcBj4jk/D2RP+aJgPFWo+lGl4Z7BMw/VqWCZX/7rxXAmX96Hdgg3Sm3DQL4W75/lX+ALtiBv2wt/cBwAAAABJRU5ErkJggg==) */
+}
+
+.Eleditor-controller ul li.Eleditor-insertText:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjBAMAAADs965qAAAAHlBMVEUAAAAmk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk//nRnVBAAAACXRSTlMAQBCAcMAgMKCd1QxoAAAAf0lEQVQoz2NwlJyJCiYwCHASIzRziiAyEAEJTWRABoxECiHMEmNgKBQUAgohbJzMwBAJ1AESaracOTM0EkUIpIKBE0UI7JYpyGaBbUHYSroQE8htKGYBMQhMJEUI0yxjMwwbgVwihRBmwYUQNpImxCQohDCL8nhEpAmciYmwEAAsoK4MjVmkgQAAAABJRU5ErkJggg==)
+}
+
+/* .Eleditor-controller ul li.Eleditor-insertImage:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAMAAAApB0NrAAAAM1BMVEUAAAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gABSMWeoAAAAEHRSTlMAwKDiQBBQ8CCwkIBg0HAwYTpfggAAAMVJREFUOMvN1EsOgzAMBFA7H/6lvv9pa1DK1IlwWHYWQRo9RmJBiIYoXuKgRHoZSFdGvs+xREoy3ScrUsPkhX9N3pmX7Jr8Es349kwon+qZUWTf9KiHIow+5XwpWRLE7syLFlNDYFY5wy2BoVk0r1yTCKNJ67o1K4FhEEuoGI8YM6WUW2LMIkc3VQSmVFAgMGfFfCkQmFKlotJFYFAVBfI1ERW2yBhURQWeN6oMCGINiGci9Q3/mZHu/x716NwbT+6fJ/fYB/HBGdUQKWkCAAAAAElFTkSuQmCC)
+} */
+
+.Eleditor-controller ul li.Eleditor-undo:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAMAAAApB0NrAAAATlBMVEUAAABubm5wcHBpaWpwcHBwcHBsbG5nZ2lwcHBwcHBwcHBwcHBwcHBubnBpaWlwcHBwcHBwcHBwcHBwcHBwcHBpaWlwcHBwcHBoaGhwcHCaDFyHAAAAGXRSTlMAPsUR69IhMvZKpZJ9Vgfg2a5kmnQruYYXgiMi7QAAAM1JREFUOMvlklmSwyAMRI0QiwGvGSd597/oDJWqzGIH/0/6D9UDpFZ376Hr9RS5QGgTVgDTRPzMGWMUpM0MwBqa/XwAQ2eghPsLJIN+/dIDxDkNdkeMC8y+tj3xUExmP7PYB333Zr04gGX7gfQO0u9b200hrt8FwO39LBFy652qzcHtsB9rx2fZQX80V4w6yVIGXyFFxwN/npLi63E98jmXvDilKnlBXu7LmiJAdGho7T0kqnI7P2YC3EkO6/TxLM92QnfmivyJlfbdv9Unig4RkspeaqcAAAAASUVORK5CYII=)
+}
+
+/* .Eleditor-controller ul li.Eleditor-insertImage div[id^='rt_rt_'] {
+    left: 0 !important;
+    width: 100% !important;
+    opacity: 0;
+    -webkit-tap-highlight-color: rgba(0, 0, 0, 0)
+} */
+
+.Eleditor-controller ul li.Eleditor-insertLink:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAMAAAApB0NrAAAAM1BMVEUAAAAmk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/+67wOaAAAAEHRSTlMA8NAwEIBAwCCwoHBgUOCQaFFl2wAAAPlJREFUOMuFlN0ShSAIhP0DMU/l+z/tkZxsm2LaK2M+BDcG9ypefGvNL+wsxdxO5WRc4tslH9+QX1OVylQOSAwkyCgatNw7spxdJIX4FYH2xyeKBwIqvaPHo9bqUNST3IfYYux7eM+9eK5i9iN5WksXImrnfCT+gHDzZ70hgWjfjgMgAZEwDK16pon4iEiChM1EhEiLr0Ri3rLNoF2INFyHWYi4MJB5bttOFBoiv4cfzzHVgQT3aXqZr6hXs0FSs+/AjtPXM6r70DGw3wzhd6IVcp79oHWopceiiQwx+oMIKis0woIISg7XCnEt9hKI1p5AJdg3BvK5t/7GyxRFV0zN3AAAAABJRU5ErkJggg==)
+}
+
+.Eleditor-controller ul li.Eleditor-insertHr:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjBAMAAADs965qAAAAG1BMVEUAAAAmk/8mk/8mk/8mk/8mk/8mk/8mk/8mk//SKiEGAAAACHRSTlMAgEAQ0CCgwHszpJ0AAABeSURBVCjPYwABiQ4k0IBTqE0QDiqgQk1gCsKmuZABppAzplCLAYZQhzOmEFBZkDJCKEiBoQOoDA10gJQxIgJCACTUkYAuhKkK0yysNjoT43pnokKCYTALYaQcwkkOAOuLWyAmEX4YAAAAAElFTkSuQmCC)
+}
+
+.Eleditor-controller ul li.Eleditor-deleteThis:before,
+.Eleditor-controller ul li.Eleditor-deleteBefore:before,
+.Eleditor-controller ul li.Eleditor-deleteAfter:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjBAMAAADs965qAAAALVBMVEUAAAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAB21glVAAAADnRSTlMAwEDQMBDgUPCgYCCQgBYit2kAAACsSURBVCjP5czBCcIwFMbxr6UgejI3T0UygFQHCIILBDzosRMED87TGZxAOoJukLaCVeHNYBpCEnrz7P/wDj/4HmwzGnoj6miplxFVPWNsQXWQlFq7/gRKaA5T3sB2NxNBa2ZSNNwbaJyGGFOBlNOG+0TLYTK/fbmGozNwkMhOgaZ0gSpxfQVKaAnSWDV/T5NOoqqxfwaC7zcqAglHDy8ZOYpypGIqLe0i6bbAFx3L0mvjGhXnAAAAAElFTkSuQmCC)
+}
+
+.Eleditor-controller ul li.Eleditor-cancel:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjBAMAAADs965qAAAAJ1BMVEUAAACIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgln7UqAAAADHRSTlMAYLAgMfKf4EGAclBp3/IGAAAA9UlEQVQoz2MAA+ZFNWfOFC1mQAAOnTNgoAEXYdY5czxTQjL9zBllmNDWM8ccQLTbmaMbICKMZw4ZQFhGZw5CGDJHBWDqRc+AmdxnQuCmssScBlGmRx0QdrseBZmhA9EPM1cB6CYQ4QxxjANQwQkGBqYzBgwsEFNljjAw2BwC4mNAaaDlIE2HGRjYgCrWHAHJA5WBCaCGBQw6BWAFB8EYCGoUGGoSGCDKZCAG5hQwnJkAsfwY1DNzDjAA5SDKYAygUAOQBtl0DOLYHuyqMM3CtBGbuzBdj82PmCGBGV5YQxUz7DFjCDMeMWMbZ5rATDmY6QszFQIAly6EERaFwtIAAAAASUVORK5CYII=)
+}
+
+.Eleditor-controller ul li.Eleditor-editText:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjBAMAAADs965qAAAAJ1BMVEUAAAAmk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk//34ERwAAAADHRSTlMAgEAQ0KBgMMDwcOAe1XweAAAA3UlEQVQoz4XRrcoCQRjF8fPiOwomRRARg3gFghttYjMs5g02i8FL8ALsGgxegs2q4ieci3J2d2aPA4In/vjDAzMIVlofAVR6fl0g4msJJPSLgQm5AQq5AVgwzaiotC+TPIDPerY2EN3S7ASei3MTxjZbQRSRNrv2LSmizUYQRe5sRorIfU6KeO07UjSCJ0UiRVNHiszFkaLEkaIqPXV89FeQcZGoiSSPROuZySPR7o4kjUQVcmbSSFQm72jgkwxthoD+yW0tpOF4DoQ08CDCT8p+W2tlFO4bPfxTaTHeolbpPP71OVwAAAAASUVORK5CYII=)
+}
+
+@media screen and (max-width:300px) {
+    .Eleditor-controller ul li {
+        width: 30%;
+        text-align: center;
+        padding-left: 0;
+        font-size: 12px
+    }
+    .Eleditor-controller ul li:before {
+        display: none
+    }
+}
+
+.Eleditor-textEditor {
+    display: none;
+    width: 100%;
+    height: 100%;
+    background: #fff;
+    position: fixed;
+    left: 0;
+    top: 0;
+    /* hrjlhy */
+    margin: 15% 0 0 15%;
+    width: 70%;
+    height: 40%;
+}
+
+.Eleditor-textEditor-colors,
+.Eleditor-textEditor-fontsizes,
+.Eleditor-textEditor-lineheight,
+.Eleditor-textEditor-linedecorations {
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: #fff;
+    z-index: 1
+}
+
+.Eleditor-textEditor-modulePane {
+    margin: 10px 8px;
+    border-bottom: 1px solid #ccc;
+    padding-bottom: 10px
+}
+
+.Eleditor-textEditor-linedecorations .Eleditor-textEditor-modulePane {
+    margin-bottom: 0
+}
+
+.Eleditor-textEditor-linedecorations ul li {
+    text-align: center;
+    display: block;
+    color: #555;
+    font-size: 14px;
+    letter-spacing: 2px;
+    padding: 20px 0;
+    border-bottom: 1px solid #eee
+}
+
+.Eleditor-textEditor-colors ul:after {
+    content: '';
+    display: block;
+    clear: both;
+    height: 0
+}
+
+.Eleditor-textEditor-colors ul li {
+    float: left;
+    text-align: center;
+    width: 20%;
+    margin-bottom: 10px
+}
+
+.Eleditor-textEditor-colors ul li span {
+    width: 40px;
+    height: 40px;
+    display: inline-block;
+    border-radius: 3px;
+    cursor: pointer;
+    position: relative
+}
+
+.Eleditor-textEditor-colors ul li span.transparent:after,
+.Eleditor-textEditor-colors ul li span.transparent:before {
+    position: absolute;
+    background: #dedede;
+    content: '';
+    transform: rotate(45deg);
+    -webkit-transform: rotate(45deg)
+}
+
+.Eleditor-textEditor-colors ul li span.transparent:after {
+    width: 1px;
+    height: 100%;
+    left: 50%;
+    top: 0
+}
+
+.Eleditor-textEditor-colors ul li span.transparent:before {
+    width: 100%;
+    height: 1px;
+    left: 0;
+    top: 50%
+}
+
+.Eleditor-textEditor-fontsizes ul li,
+.Eleditor-textEditor-lineheight ul li {
+    text-align: center;
+    color: #333;
+    font-size: 14px;
+    line-height: 30px
+}
+
+.Eleditor-textStyle {
+    display: flex;
+    display: -webkit-flex;
+    position: relative;
+    border-bottom: 1px solid #eee;
+    overflow-x: auto;
+    overflow-y: hidden;
+    box-shadow: 0 0 10px rgba(0, 0, 0, .1);
+    -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1)
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item {
+    flex: 1;
+    -webkit-flex: 1;
+    padding: 10px 0
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item div {
+    width: 24px;
+    height: 24px;
+    position: relative;
+    margin: auto
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item div:before {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    display: block;
+    background-size: 20px;
+    background-position: center;
+    background-repeat: no-repeat
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-active {
+    background-color: #FFE69F !important;
+    padding: 0;
+    border: 1px solid #DCAC6C;
+    border-radius: 2px
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-bold:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAACgUlEQVRYR82Y0XEaQQyGpWWO19BB7AqCKwipIHYFcQeBh9MOT8FPzC4PmApyVBB3ENOBU0FIBbGf4U4ZkSVzM8GsbjycV08wo+O+ldC//y5C4oGJ80EU0Dk3McawZiHM/AgAD5JLRCvNM7GcKKD3XgX3zIsEtsiybDkajQS+cagAmfkJEXeV0QQz9xHxTS33ERFv8zy/0Txfz1EBAsCKiAZNfnw+n/c2m80lAEwA4G149j7Lsqsm1TwZYH0xzrkhIs73kET0QbvYVgAFxnt/DQBf5TMzj6y1txrI1gAD5B0AfGTmtbX2PDnA6XR61ul0fgawCyKKDl6rFRQw59wDIr5j5htrrQzQ0Wgd0Ht/DwDvkwVMuoJBG3+HSb6y1srQpNPiuh6WZXk+Ho/XyQB67/sA8B0Aesy8tNaKLkajlSERR4SInwPcU1VVfU31hP5kgEHzRJRlmzsL/zsxHQON/u1LqwX85/OiPfmbcMhYrMqyvNZWrimgkutwGiJOttvtsimcusVN/aAI8SFUZr4zxizyPBexVoW2xY39oLxd/ofGGJle8YWXNRM7JKKFhvCkgHWAINKFuJkwMCrL1RrgHtY5VyDiJ/muEevWAQXMey87iBwDFkQ0PNbqVwEMwv1FjqhEdJEc4Gw2GzCzbHtyfj5apFepYPKAzjmRnG/JVrA2yVF9bb3FQQ/l4CS2K6qFrQN673dHzyR1sC7SSR2agjeUW4WdDWPmH9Za2aOjcdIWh2mVdopZ6O3hut3uQHuBpAKUqwpjjGz0zwYz102qwPxXIW1b6y9RAUb7cDzhFzMXVVUVpzKsanMZWrjPlyuOdZPzx6F1Riv4wuq9+PHkAf8AXHXCODnTUHYAAAAASUVORK5CYII=)
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-color:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAC6klEQVRYR82YTW4TMRSA3xspWSGRLliTnIB2yYr0BMAJCNLYqsQCOAFwAsoGRX6JmJ6AcgLCCVpO0HACWokFmjDzkKNM5Px4xj+DindRPJ7Pb+zP7xmhxZam6QUi/iaih20Ni20NJKV8AgCf9XhJkgzG4/G8jbFbAxRCzBDx0QrqTCk1+m8AT05O+mVZXgHALwC4w8zXi8VikGXZdSxkKxGUUmYA8AwAzpi5v4rka6XU6a0DjkajXqfTuULEnl57RVEMEfETAMyVUoNbB5RSvgWAN8z8jYiGGkgIMUfE+8z8nIh0dINb9CeuYADgqVLqXJMY0DMiOg6mA4AoQCHESH9OZv5BRP0KRH/2brf7U/9m5iMiugyFjAWs1LKzIcyNE6OcYEAhxCEiXgDATZ7n/W2lGOqBPM8PQpUTDOgSIUPe75RSejN5tyBAc43VHWvG8ResnCBAY5d+ISJ9BltbrHKCAKuXlmV5PJlMZnWAUspXAPCemYOU4w1oU4sNcrUcdGZz12VC2+OEAC7V4nNKCCFOEfGlPqt9leMFmKbpMEmSrza12KJoKsc3V/QCrNTCzB+ISK8t5yaEOEfExwDgpRxnwJgo6FlU0de5IhEduM7MGdBHLbaXhyjHB1Bnx0E7sQI2DHBJREcuUXQCrAYGgO9KqUOXgff1CVGOE6CUUqdLD3zUYpuE71JpBDTVopTqhUaves53szUCGlmLlx4ajr9lkeWiq1pAc7axkbM8/yfP83t1uWItoHFE6fTd2V0+kymK4sV0Ov1oe8YKaJaTIYd8E6Rhhtpc0QrYlloa1mKjW+sAW6ttY5SzF7BttTTkisvy1Jbl7AUMzTya1t2+/5uKrx3AtspFV9iqfLXdiO0AxmS/rlDb/YzydOcCYAPQVEvslYUPbJ1yNgCNdGh9U+Xzopi++y6h9HjbgP9cLQ7K2ShP14BGSr5xUxUTFZ9nzVzRVM4acLX+MkTMqns+nxe00Xe1xIZmafoXDcwGR/w9qZwAAAAASUVORK5CYII=);
+    background-size: 16px
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-color:before {
+    background-position: center 3px;
+    background-size: 15px
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-color span {
+    display: block;
+    width: 18px;
+    height: 1px;
+    background: #333;
+    position: absolute;
+    bottom: 2px;
+    left: 4px
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-linedecoration:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAACd0lEQVRYR+2YS3LaQBCGuwVoa98g9glCThByA3wCkxMEFswUqzgrqoeFyAlCTmBuEPsEISewfQO85aFOtWpGRWE9kShvNCsYaVqf/n7NCCFhENE9IvYQ8WY8Hj8k3VPX3Gw26zHzPTM/aK1vju1i0oOMMSzzzPxDa31XF0yKGHeI+F2uKaXe8DSAeeoTUaNgnkiZ1xsFK8kHAI2CjYJNJ8mJgSZJmiRpkuScSQIAP5VSw6pxlrXeGDMHgG+lNqxEtELEjwDwqJTqnRlQjhSfmfmf1rpbdMvvFj1rra/PCUhET4h4lSZG2pY/lh0APimlVueANMaIYn+t7cRwSgPMXVgHMBEtEPHW2koUIhFQFhhjngHgg/ze7/fXk8lE/tc2ptPpVavVerIGX5RS4uY3IwtwAAC/ZAUzL5POrFVo7dm7b218VUotSgFaFaNksZAjrbXEZuVBRENEDKyhzEqRqqAF7MqJHxEv8t60KLUx5tAzr/IFIysJMwHlofbTxB8HwMxzrfWoKNDhfUQUIGJc+BHxS96nlVxAq+RAwJySzCwJIy5fFgElIslUOaBHicDMotwwLe4ObRYCdO4GAAGKMts+SECXiCjzr85Vtr5dMLMkQd+B2WUvMle0thYGFONBEFxuNhtxkQS5i8siIkaqAcDc9/35aDRaF1oEAKUAnVELOkBEUSjK8ozxKGXK9/1FGTBn7yTAQxiB3e123TAMLwHANfuV53nrdru9OgXqpBgs6pK676usYN1Ax/YawKoKxwpKsG+321tElGB/t8HM606n89slVwx41MDfDdA2gHhjEgNKzw3DULpCqQJc95tIQfc8r+969H9Yv8s4C539kQAAAABJRU5ErkJggg==);
+    background-size: 18px;
+    background-position: center 3px
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-bgColor:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAC5ElEQVRYR82YTXLTQBCFuy3JW5ITYJ8AcgKSExBOAJyAeOGe8oqwcs14YTgB4QTACRJOgDlBkhNg1i5Xp1olqcZj/cxIqkKzk0oafeqZ9/pJCAMf2IVPa305Go1eyBzM/EhEN13mK7u3NeB6vT7Z7Xb3AHCST5wkyelsNtv2Cdka0BjzDgC+2jDMPFNKfR4K4G8AeAkAjwDwPFvmB6XU9L8DGmMETABl731CRDl+nYGdEdGmL8hWS6y1vkHEtwKx3++nURSd58vNzN+UUrL8vYxgQEccv4hI4EBrvUXEZwCwTZJk2pdYggEdcbzPrcWuKgAU57uWsQ1gKg5m/qeUKizG3pcAsCGis65wcn8QoAPxhYiubAit9QYRU+MGgF7EEgToimOxWDw4gFeIuM7OHb1Am4p6A9riYOY/SimxloORXfM3O7klotM2UPY93oBV4nABjDE/LE/sLJYQwEIc4/F4UmUjEiAQ8XsGfkdEF12q6AXodI5GI7Y8MTVyd6+GAHsBOh7XqE5jjASGD32IpRHQRxwl+7Do1dJZuoilEVBrXVhHSJyyPZGZ3yilRDzBwwfwHhEnMnNIILVfDAB+EtFlMF1TJ1mtVufMfJv7mrSwgIdIGyy8sq1YaivoiCOA7fhSyY1KqevQSSoB7a4gwQARQ6pnc7ySA2ZulbYrAZ091LqvGmOkX+efBMFiqQMsxNF2/0jlHBdoNHl3C5QC2uKoCga+e2m5XE6iKJLP03SEOIFcXwrYdzq2A0SIl5YCuuKoCwa+VbQDRKhYjirYdc9UQdtiQcSL+Xx+5/OCZYCFOEImanqY1voaET9mluMtlgNAp3PIz6C0xfUxfMUi0c7+8D8AtMURupl9XqIpbWe589ZOP0cVzB8Ux/Gmr4/vfE6pYhzH6aows8SwojvlcPK3jIgKrsY041OZrtfYcDLXoABduEEBlsENBrAKbhCAdXCDAJRuZf/bdkVmB9tBqLjOBZ4AEfu5OCh98OAAAAAASUVORK5CYII=);
+    background-position: center 3px
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-fontSize:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADUAAAAoCAYAAABerrI1AAAD/0lEQVRoQ8VZ0VEbMRDVwvh+QyoIVJCkgpgKQipIqCD4w9LwBXwxkj+cVBBTQUgFIRUEKsBUEPxrA8rszelmvae7k+5k0A8zWNLuO63evl2B6DEmk8nQWntSbHEjpTzqsV2ypdBnJ631DAA+uz0eHx/3jo+P5332TLG2M6jpdLqzWq3+USestWdKqdMUjvXZozMorfURAEwL43dCiDfW2rlSaq+PQynW9gF1CwC71tobAPgmhPiBDllrPymlLlM413WPTqAKgvhdgBhlWTZbLpdzAHglhPglpTzo6lCKdZ1AUYIYDAavR6PRPf3fSxNGNChKENbaC6XUF/y67PRelDCiQVGC4PfHGIN0vjHCmEwmJ09PT/lH3Nramo3H4zNfuHYBlROEEOJOSol/y9EEuO9dMcYgmJyMyJhJKQ/53lGgaIgJIb5zBXF+fr67vb19WxhJRhgckLV2UZASmjqUUs4osChQIWRgjEE6/4hGUhCG54QOrbX3APCTAFkDFgyKKYg/UsqhL6SoE30VhjHmnRDir895H1h3YsGgmIKoHDm7W/glX/VRGAUgzIU7Lh8qpTDJl4MBuxdC7Espr2NAOQWxyLJsF3NT3eU3xqDxr4Uz0QrDA6hMHdym1voUAFylkAMLAsVyUK0BZ5CFTTRhGGPwhPLwprmw7iPSu47REQSKlRjv8YjbKFprfQ0Ab7sQhjHmSgjxIUZyER/vWkExgqjkpoYQLPNKLGGgzeVyOYwVxhhRDw8P7SfFEuqIX9Y6UExOPWtJ0npSWmunIKLzDov1aMJoC/G63xtBMQURfeG11gckSUav3wioFF/aidwuhJEcFLsTC6VUngRjB80jsYQRa8vNrw0/piAq4jXUIBW5fRRGqD2c1wSqJIiYDdvmPkcPwwuKEUSbn7G/b5wwvKAYQVwIIVI0KLGlho2Z6NQQ+9UqoHiT0jVWYjf2CM+ym7tpwqiAYgqiVbyGgqUit40wiMpvLHGobVeGWGsvfaBKggCA/fF4jOIyyaA5q4kw6Dxfuc6dYYXpYg0UI4hg8RqKmKWJWsJoqmo9gCrV8RooRhDJe3f8vjb1MOqqWhZyCKhSHZegYgyGnoxvHm3MtBGGr6p1tVxTdVyCYqFR21jpAwjXUpHbRhjFfPoGlpfrg8FgvlqtsBXn+hdrhEZBUQURzDpdQGqt88YMrg1RGKzydlU3hh6Oyt3MQbEeRGfxGgqQNmZCS3Yats4OPiNlWTbkTaAcFFcQrukf6mTsPNbJDVIYRYl/5foedYDQF/A8cwY1VmKBeBRG2ZhpIwwP44mm5g8wBXGjlHKx2tfvxvUsYSbtYSAoZBf3eoGvCGvN9k0hKyKEPqMehbTeQvz5D/g1DKSBanO4AAAAAElFTkSuQmCC);
+    background-size: 22px
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-lineHeight:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAABl0lEQVRYR+2Xy03EMBCG7Y1yhhLoANIBJSyVQC5j5cRyipxcoAM6ACpAVEBKWDpIA8kgr3Ylk9ckmdhaieTqeXz+57cVS3HmnzxzPrECcic0SkGt9bau6yJJkj234dR8EjBN06sgCL6FEHsAiKY24MaTgFrrQkp5fWz0AgAP3KZT8gcBsyx7FkLc2wUR8U4p9T6lCSe2F9D4Tkr51lG8rKoq8uXHTkDLd5c9uy98+bETsOG7vgm1/Ki13kkpH+eOFBGflFI7O78F2OW7voZNP3oBzPP8dqwCiFgCQDE2fk4cec3MKbpkzgrIVXNRBY1/EfGTAfUFAH/OwP8CZCjXm7qogiugCwW4NRcd8XqKueNwkb/oiFdAFwpwa7ZGPPJv+tAXEWOllHlYHT4vp9i8RzabjXlqXhC7/wCArR3jBdA0HHjRnXh+wjC8ieO45I6Qyu89xcTbJHL9q38CH7xmuvzY9B2lAHd9ELDDjy3fcQGofPKitvzozXc2NAlogo9+fPXlu8mA1Bhcro9S0CUAVXsFpBSi1n8Brg2tKfeVeOYAAAAASUVORK5CYII=)
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-alignLeft:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAABJElEQVRYR+2WQQ6CMBBFO4Gu9QZ6BLiBV/AG3kDZ0LBzR1IWxBOoJ9EjeASOgFsCHUOCiQvbRIYmkkzX/X9+XmcmBfHnB/48n+CA1BdigkyQSoCqn28P5nm+DoLgTCUgpdwmSVKP9bESHAJexhoPulpKufMSkBhsMvl8e3AyBESjeRPUWu8AYEWEYJUbYyql1NXlbyVYFMUGEW++wn34xmmaPmx1nE+stY4AYOkrJCLWrnB93Xn3oC9yv/gywV9ofbtrJdgPiBCin2LKkNRd18VZllVjg1oDlmW5bJrmMNb4rVNKHSke3IMUerwHqfScBPshadt2P0URl0cYhifXj9u5ZhDxDgALXyER8WmMiVxriKeYSp8JMkEqAaqee5AJUglQ9S80f0opswUQfwAAAABJRU5ErkJggg==);
+    background-size: 25px
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-alignCenter:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAABGUlEQVRYR+2Xuw2DMBCGbU+QTZINwgbJBskIaThEl9amQNnAbJARYJPsgWQi2ijgx48liqO+x8d3Piyk2Pkjd84nGBCdEBtkg6gBNJ/PYHaDxpi3EOKCNvLkv4jo8S/GO2Kt9VUIccoJqJTqy7LskwBzgoXU9hoMKZIzhgFRu9EG56VRSh3BxsPSUvzWTQG0UsobCLj4WYEBQbDo9GiD0R3ABAYEBfr/Sdq2PYzjiG7tKicRDUsB3hEbY+Y78oyaWMufpqmrquqedBc3TVM454qcgM45W9f1JwkwJ1hIbe+IQ4rkjGFA1G60Qa31U0qJbnVHRDYEPhUQ3WqbDTDkrbeMiTa4ZfOQWgwYYmkthg2yQdQAmr/7M/gFx6c4KVrJFfgAAAAASUVORK5CYII=);
+    background-size: 25px
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-alignRight:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAQAAAAm93DmAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAHdElNRQfhCQ8REBuZ/AJaAAAAoklEQVRIx2NgGAWjYBgCRvzS/QK/1xMy4m9i5QMEj4mglR8ZGAnAUUBlgBGknfFMCqQY8P9h2QI8BnYZMJwn2U2OpQfwuLDLgFGAJBd+KLtAcTiNAhRAICe2KzCfZxDAq+QDgyNytLDgN7DyQedEQm5iezDQoTLcAFos9wv8ySfVCJaJhR+QeKiSPwSYChn5STHu/8ffGxkuDHS4jIJRMNQAAJ5SImJVnuoKAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTA5LTE1VDE3OjE2OjI3KzA4OjAwUsazsgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0wOS0xNVQxNzoxNjoyNyswODowMCObCw4AAAAASUVORK5CYII=);
+    background-size: 25px
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-upImg:before {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAARVBMVEUAAACKioqJiYmLi4uKioqLi4uIiIiKioqKioqJiYmJiYmJiYmKioqKioqPj4+KioqKioqLi4uKioqJiYmKioqJiYmKiopHpOm/AAAAFnRSTlMAwIB/XkAf79Dyn1DgMBBvkHA/r8SPuxOfgwAAANRJREFUOMvl0MtygzAMheEjI98wGELa8/6PWsxAsik2M22yyb/VN2NL+NRsV8muU92hoZxGoxLlAXEaDSDvhbbTS1BJzlegcO1foY3kdAXCpfHv5xkHSr4A1ZMMbajcMi04c8/WYc8jn2tQ+ExQct/39Avce35z9CT7BqTdXJEayKH7OoM+ee7NN50Ghgc8KTqUAl0dlrnTFQxSh3cAthilq8Ib3DKFZQFoG1AlRJEmNMfTjmMV+gP2sbF1j61ERTVll4E8+R6N0sAgjAbtrDEp40X9AEsWInSQgk2QAAAAAElFTkSuQmCC);
+    background-size: 22px
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item-upImg {
+    display: none;
+    position: relative
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item-upImg>:not(.webuploader-pick) {
+    transform: translate(-50%, -50%);
+    -webkit-transform: translate(-50%, -50%);
+    top: 50% !important;
+    left: 50% !important;
+    opacity: 0
+}
+
+.Eleditor-textStyle .Eleditor-textStyle-item-upImg>:not(.webuploader-pick) label {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%
+}
+
+.Eleditor-textEditor-formats {
+    display: none;
+    position: absolute;
+    right: -60px;
+    bottom: 20%;
+    border-radius: 50%;
+    -webkit-border-radius: 50%;
+    width: 100px;
+    height: 100px;
+    box-shadow: 0 0 5px rgba(0, 0, 0, .1);
+    background: #fff;
+    z-index: 1
+}
+
+.Eleditor-textEditor-formats div {
+    background-repeat: no-repeat;
+    width: 100%;
+    height: 32px;
+    background-position-x: 12px;
+    background-position-y: center;
+    position: absolute
+}
+
+.Eleditor-textEditor-formats .Eleditor-textEditor-format {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAAPFBMVEUAAACPj4+Li4uKioqKioqKioqKioqKioqHh4eJiYmJiYmJiYmKioqKioqJiYmKioqJiYmJiYmJiYmKiooOOgKOAAAAE3RSTlMAEEBggO/AoCDQ8N8w4LCQUHCP4ZsY5wAAAUlJREFUOMvFk92WgyAMhAUJ4U9E5/3fdStCaYtlvdmzuVGPH5kkE6Z/iD3d4xTmW5wgey8hI4zk2JQ3CTXgEkBKZGG/jMuS+kRXyFFZx9+MSqwDToLP5wLADIQtdNGbF/j5O2eVgza/ouzCJFaAxQsq+nwH9wjDINVQMp2uC7Ul3URnbB/9+sLVrm3p6t0esUO3YopoPETlW0Zpe1uFctjFA2z+GA0drqZ1dLXhuSOM5dtkTQRcOaVhK8bUozN0feFWAF+BW3M35NLJpSuzniWKFbTJnRBFyWy6W9N8gOM6hETcKbdPByXq4O3rpLwrOk3fp+OEf1/r1PsgLSL7trb+THi15Qog+bTEZrxLWAfpMznTCQh6rfCzKal8dT7i+6VhoNWJOLqveQ2PCJ1w1xSlXCDSNI5gEY2wZaLjpA4EPd0Is+q8I38XPwbTDcl2Nko+AAAAAElFTkSuQmCC);
+    background-size: 20px;
+    border-bottom: 1px solid #F5F5F5;
+    top: 15px
+}
+
+.Eleditor-textEditor-formats .Eleditor-textEditor-clean {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAABkUlEQVRYR+3XvU3DQBQA4PdsUUBSMAIjpKLOCIwQK9QEb8AGRrgE5EyAYIKkoWcERqAIpME+ZISlyPL53p+lCMX13b3P7/z87hD2/ME998EBqN0hbwa3RXZ2nKTv2gCU+X2xOoHb+3xaonuGuJyOk/SNEkQ6ZlNkE6iiFQCm4/nVsr2ON4Obx7sZOLgdEtng0MHL6HIx63rJ3iIZEknB1eBgFQ+BpOJIwHqQJZKDIwOtkFwcC6hFSnBsoBQpxYmAXKQGJwZSkVqcChhCWuDUQB/SCmcCbCN/21UVrfraF6dvBzsJdbH6Z+6cyxGcQ8AnX2+lrteMswMW2QTL6BUAjlxcnVudgkyAu9+cQ1xbnoLUwK6CsOzdKmBftVohxUDKr8QCKQJScE0VapFsIAdngWQBJTgtkgzU4DRIEtACJ0UGgZY4CbL/2vl3qbZq/Lt9mFrd/ov7gDhOJjuBQ2yr7xQTymQn0BXZ6VcVXY/mixvu8Ugy/vMhvziJv9eYpB/t+cEikQS0nHMAarN5yOC/z+APDA6MODgVGhsAAAAASUVORK5CYII=);
+    background-size: 20px;
+    bottom: 15px
+}
+
+.Eleditor-inputarea {
+    position: absolute;
+    top: 45px;
+    bottom: 40px;
+    width: 100%
+}
+
+.Eleditor-textEditor[type=link] .Eleditor-inputarea {
+    bottom: 95px
+}
+
+.Eleditor-inputarea .textarea {
+    -webkit-user-select: auto;
+    overflow-y: auto;
+    overflow-x: hidden;
+    height: 100%;
+    width: 100%;
+    padding: 10px;
+    box-sizing: border-box;
+    font-size: 14px;
+    color: #555;
+    border: none;
+    word-wrap: break-word;
+    word-break: normal
+}
+
+.Eleditor-inputarea input {
+    display: none
+}
+
+.Eleditor-inputarea .textarea img {
+    width: 100%;
+    height: auto;
+    box-sizing: border-box
+}
+
+.Eleditor-textEditor[type=link] .Eleditor-inputarea input {
+    height: 33px;
+    display: block;
+    border: none;
+    border-bottom: 1px solid #ddd;
+    width: 100%;
+    margin: 10px;
+    color: #333;
+    outline: none
+}
+
+.Eleditor-method {
+    border-top: 1px solid #eee;
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    box-shadow: 0 0 10px rgba(0, 0, 0, .1);
+    -webkit-box-shadow: 0 0 10px rgba(0, 0, 0, .1)
+}
+
+.Eleditor-method:after {
+    content: '';
+    clear: both;
+    display: block;
+    height: 0
+}
+
+.Eleditor-method button {
+    width: 50%;
+    border: none;
+    padding: 0;
+    margin: 0;
+    box-sizing: border-box;
+    float: left;
+    background: #fff;
+    height: 40px;
+    color: #333
+}
+
+.Eleditor-method .Eleditor-commit {
+    border-right: 1px solid #ddd
+}
+
+.Eleditor-placeholder {
+    color: #999
+}
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/static/css/createArticleBase.css b/ruoyi-content/src/main/resources/static/css/createArticleBase.css
new file mode 100644
index 000000000..6d12ba997
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/css/createArticleBase.css
@@ -0,0 +1,7 @@
+/**
+* Title: Eleditor 移动端富文本编辑器
+* Site: https://eleditor.fixel.cn
+* Author: Try
+*/
+.Eleditor-scrollLocked{height:100%}.Eleditor-wrap.Eleditor-mask{position:absolute;left:0;top:0;width:100%;height:100%;background:rgba(0,0,0,.5)}.Eleditor-loading{display:none;position:absolute;padding:15px;background:rgba(255,255,255,.9);z-index:999;width:100%;height:100%}.Eleditor-loading p{font-size:12px;color:#666;text-align:center;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);-webkit-transform:translate(-50%,-50%)}.Eleditor-loading p:before{content:'';width:25px;height:25px;margin:0 auto;background:url(data:image/gif;base64,R0lGODlhIAAgALMAAP///7Ozs/v7+9bW1uHh4fLy8rq6uoGBgTQ0NAEBARsbG8TExJeXl/39/VRUVAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQFBQAAACwAAAAAIAAgAAAE5xDISSlLrOrNp0pKNRCdFhxVolJLEJQUoSgOpSYT4RowNSsvyW1icA16k8MMMRkCBjskBTFDAZyuAEkqCfxIQ2hgQRFvAQEEIjNxVDW6XNE4YagRjuBCwe60smQUDnd4Rz1ZAQZnFAGDd0hihh12CEE9kjAEVlycXIg7BAsMB6SlnJ87paqbSKiKoqusnbMdmDC2tXQlkUhziYtyWTxIfy6BE8WJt5YEvpJivxNaGmLHT0VnOgGYf0dZXS7APdpB309RnHOG5gDqXGLDaC457D1zZ/V/nmOM82XiHQjYKhKP1oZmADdEAAAh+QQFBQAAACwAAAAAGAAXAAAEchDISasKNeuJFKoHs4mUYlJIkmjIV54Soypsa0wmLSnqoTEtBw52mG0AjhYpBxioEqRNy8V0qFzNw+GGwlJki4lBqx1IBgjMkRIghwjrzcDti2/Gh7D9qN774wQGAYOEfwCChIV/gYmDho+QkZKTR3p7EQAh+QQFBQAAACwBAAAAHQAOAAAEchDISWdANesNHHJZwE2DUSEo5SjKKB2HOKGYFLD1CB/DnEoIlkti2PlyuKGEATMBaAACSyGbEDYD4zN1YIEmh0SCQQgYehNmTNNaKsQJXmBuuEYPi9ECAU/UFnNzeUp9VBQEBoFOLmFxWHNoQw6RWEocEQAh+QQFBQAAACwHAAAAGQARAAAEaRDICdZZNOvNDsvfBhBDdpwZgohBgE3nQaki0AYEjEqOGmqDlkEnAzBUjhrA0CoBYhLVSkm4SaAAWkahCFAWTU0A4RxzFWJnzXFWJJWb9pTihRu5dvghl+/7NQmBggo/fYKHCX8AiAmEEQAh+QQFBQAAACwOAAAAEgAYAAAEZXCwAaq9ODAMDOUAI17McYDhWA3mCYpb1RooXBktmsbt944BU6zCQCBQiwPB4jAihiCK86irTB20qvWp7Xq/FYV4TNWNz4oqWoEIgL0HX/eQSLi69boCikTkE2VVDAp5d1p0CW4RACH5BAUFAAAALA4AAAASAB4AAASAkBgCqr3YBIMXvkEIMsxXhcFFpiZqBaTXisBClibgAnd+ijYGq2I4HAamwXBgNHJ8BEbzgPNNjz7LwpnFDLvgLGJMdnw/5DRCrHaE3xbKm6FQwOt1xDnpwCvcJgcJMgEIeCYOCQlrF4YmBIoJVV2CCXZvCooHbwGRcAiKcmFUJhEAIfkEBQUAAAAsDwABABEAHwAABHsQyAkGoRivELInnOFlBjeM1BCiFBdcbMUtKQdTN0CUJru5NJQrYMh5VIFTTKJcOj2HqJQRhEqvqGuU+uw6AwgEwxkOO55lxIihoDjKY8pBoThPxmpAYi+hKzoeewkTdHkZghMIdCOIhIuHfBMOjxiNLR4KCW1ODAlxSxEAIfkEBQUAAAAsCAAOABgAEgAABGwQyEkrCDgbYvvMoOF5ILaNaIoGKroch9hacD3MFMHUBzMHiBtgwJMBFolDB4GoGGBCACKRcAAUWAmzOWJQExysQsJgWj0KqvKalTiYPhp1LBFTtp10Is6mT5gdVFx1bRN8FTsVCAqDOB9+KhEAIfkEBQUAAAAsAgASAB0ADgAABHgQyEmrBePS4bQdQZBdR5IcHmWEgUFQgWKaKbWwwSIhc4LonsXhBSCsQoOSScGQDJiWwOHQnAxWBIYJNXEoFCiEWDI9jCzESey7GwMM5doEwW4jJoypQQ743u1WcTV0CgFzbhJ5XClfHYd/EwZnHoYVDgiOfHKQNREAIfkEBQUAAAAsAAAPABkAEQAABGeQqUQruDjrW3vaYCZ5X2ie6EkcKaooTAsi7ytnTq046BBsNcTvItz4AotMwKZBIC6H6CVAJaCcT0CUBTgaTg5nTCu9GKiDEMPJg5YBBOpwlnVzLwtqyKnZagZWahoMB2M3GgsHSRsRACH5BAUFAAAALAEACAARABgAAARcMKR0gL34npkUyyCAcAmyhBijkGi2UW02VHFt33iu7yiDIDaD4/erEYGDlu/nuBAOJ9Dvc2EcDgFAYIuaXS3bbOh6MIC5IAP5Eh5fk2exC4tpgwZyiyFgvhEMBBEAIfkEBQUAAAAsAAACAA4AHQAABHMQyAnYoViSlFDGXBJ808Ep5KRwV8qEg+pRCOeoioKMwJK0Ekcu54h9AoghKgXIMZgAApQZcCCu2Ax2O6NUud2pmJcyHA4L0uDM/ljYDCnGfGakJQE5YH0wUBYBAUYfBIFkHwaBgxkDgX5lgXpHAXcpBIsRADs=) no-repeat center top;background-size:100%;display:inline-block;vertical-align:middle;margin-right:10px}.Eleditor-wrap ul{list-style:none}.Eleditor-area,.Eleditor-area *,.Eleditor-wrap,.Eleditor-wrap *{cursor:pointer;-webkit-tap-highlight-color:rgba(0,0,0,0);tap-highlight-color:rgba(0,0,0,0)}.Eleditor-area .Eleditor-active{background:#cce0f2!important;padding:2%!important}.Eleditor-video-area video{width: 100%;}.Eleditor-iframe-area,.Eleditor-video-area,.Eleditor-audio-area{position:relative;width:100%;box-sizing:border-box}.Eleditor-iframe-area iframe{width:100%}.Eleditor-iframe-area:before,.Eleditor-video-area:before,.Eleditor-audio-area:before{position:absolute;content:'';width:100%;opacity:0;height:100%;top:0;left:0;display:block;z-index:1}.Eleditor-controller{background:#fff;position:absolute;box-sizing:border-box;transform:translate(-50%,0);-webkit-transform:translate(-50%,0);left:50%;display:none;margin-top:5px;box-shadow:0 0 20px rgba(0,0,0,.2);-webkit-box-shadow:0 0 20px rgba(0,0,0,.2);border-bottom:1px solid #e1e1e1;border-radius:3px;-webkit-border-radius:3px
+    background:linear-gradient(top,rgb(255,255,255) 29%,rgb(248,248,248) 74%);background:-o-linear-gradient(top,rgb(255,255,255) 29%,rgb(248,248,248) 74%);background:-moz-linear-gradient(top,rgb(255,255,255) 29%,rgb(248,248,248) 74%);background:-webkit-linear-gradient(top,rgb(255,255,255) 29%,rgb(248,248,248) 74%)}.Eleditor-controller ul{margin-bottom:2.5%}.Eleditor-controller ul:after{content:'';display:block;height:0;clear:both}.Eleditor-controller ul li{float:left;display:inline-block;width:30%;margin:2% 0 0 2.5%;height:42px;border-radius:3px;-webkit-border-radius:3px;line-height:42px;padding-left:10%;box-sizing:border-box;font-size:14px;border-right:1px solid #ddd;border-bottom:1px solid #ddd;white-space:nowrap;position:relative}.Eleditor-controller ul li.Eleditor-undo{display:none}.Eleditor-controller ul li:before{background-size:100%;background-repeat:no-repeat}.Eleditor-controller ul li:before{content:'';position:absolute;left:8px;top:12px;width:15px;height:15px;display:block;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAANlBMVEUAAABIotJIodFIo9NIo9NHotJAn89IotFHotJHodFIn9dHotJIodJHotFHodFHodFHodFIotIElcMpAAAAEXRSTlMAwIBAf7AQ4HDvINCg8M+Qb3nwl3EAAAC/SURBVDjL7dPRasQgEEbhf3THqEm2Pe//sl3Ixc5GF3JRaAv97tQDwojiVfOsh+yNV2LQpc5AYCnYIEkJPAUGgqRowSRjVZQmoR2h/Yd/KNwUNVxymqIN5LDY0wJVqtDC5h1MmZO9SGXnJEs9WeC16KFUt+Cj65usS3ku+s0C/wxHGXJYnLQyDw3WYTyTcBj4jk/D2RP+aJgPFWo+lGl4Z7BMw/VqWCZX/7rxXAmX96Hdgg3Sm3DQL4W75/lX+ALtiBv2wt/cBwAAAABJRU5ErkJggg==)}.Eleditor-controller ul li.Eleditor-insertText:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjBAMAAADs965qAAAAHlBMVEUAAAAmk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk//nRnVBAAAACXRSTlMAQBCAcMAgMKCd1QxoAAAAf0lEQVQoz2NwlJyJCiYwCHASIzRziiAyEAEJTWRABoxECiHMEmNgKBQUAgohbJzMwBAJ1AESaracOTM0EkUIpIKBE0UI7JYpyGaBbUHYSroQE8htKGYBMQhMJEUI0yxjMwwbgVwihRBmwYUQNpImxCQohDCL8nhEpAmciYmwEAAsoK4MjVmkgQAAAABJRU5ErkJggg==)}.Eleditor-controller ul li.Eleditor-insertImage:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAMAAAApB0NrAAAAM1BMVEUAAAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gAD/gABSMWeoAAAAEHRSTlMAwKDiQBBQ8CCwkIBg0HAwYTpfggAAAMVJREFUOMvN1EsOgzAMBFA7H/6lvv9pa1DK1IlwWHYWQRo9RmJBiIYoXuKgRHoZSFdGvs+xREoy3ScrUsPkhX9N3pmX7Jr8Es349kwon+qZUWTf9KiHIow+5XwpWRLE7syLFlNDYFY5wy2BoVk0r1yTCKNJ67o1K4FhEEuoGI8YM6WUW2LMIkc3VQSmVFAgMGfFfCkQmFKlotJFYFAVBfI1ERW2yBhURQWeN6oMCGINiGci9Q3/mZHu/x716NwbT+6fJ/fYB/HBGdUQKWkCAAAAAElFTkSuQmCC)}.Eleditor-controller ul li.Eleditor-undo:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAMAAAApB0NrAAAATlBMVEUAAABubm5wcHBpaWpwcHBwcHBsbG5nZ2lwcHBwcHBwcHBwcHBwcHBubnBpaWlwcHBwcHBwcHBwcHBwcHBwcHBpaWlwcHBwcHBoaGhwcHCaDFyHAAAAGXRSTlMAPsUR69IhMvZKpZJ9Vgfg2a5kmnQruYYXgiMi7QAAAM1JREFUOMvlklmSwyAMRI0QiwGvGSd597/oDJWqzGIH/0/6D9UDpFZ376Hr9RS5QGgTVgDTRPzMGWMUpM0MwBqa/XwAQ2eghPsLJIN+/dIDxDkNdkeMC8y+tj3xUExmP7PYB333Zr04gGX7gfQO0u9b200hrt8FwO39LBFy652qzcHtsB9rx2fZQX80V4w6yVIGXyFFxwN/npLi63E98jmXvDilKnlBXu7LmiJAdGho7T0kqnI7P2YC3EkO6/TxLM92QnfmivyJlfbdv9Unig4RkspeaqcAAAAASUVORK5CYII=)}.Eleditor-controller ul li div[id^='rt_rt_']{top:0!important;left:0!important;width:100%!important;height:100%!important;opacity:0;-webkit-tap-highlight-color:rgba(0,0,0,0)}.Eleditor-controller ul li.Eleditor-insertLink:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjCAMAAAApB0NrAAAAM1BMVEUAAAAmk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/+67wOaAAAAEHRSTlMA8NAwEIBAwCCwoHBgUOCQaFFl2wAAAPlJREFUOMuFlN0ShSAIhP0DMU/l+z/tkZxsm2LaK2M+BDcG9ypefGvNL+wsxdxO5WRc4tslH9+QX1OVylQOSAwkyCgatNw7spxdJIX4FYH2xyeKBwIqvaPHo9bqUNST3IfYYux7eM+9eK5i9iN5WksXImrnfCT+gHDzZ70hgWjfjgMgAZEwDK16pon4iEiChM1EhEiLr0Ri3rLNoF2INFyHWYi4MJB5bttOFBoiv4cfzzHVgQT3aXqZr6hXs0FSs+/AjtPXM6r70DGw3wzhd6IVcp79oHWopceiiQwx+oMIKis0woIISg7XCnEt9hKI1p5AJdg3BvK5t/7GyxRFV0zN3AAAAABJRU5ErkJggg==)}.Eleditor-controller ul li.Eleditor-insertHr:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjBAMAAADs965qAAAAG1BMVEUAAAAmk/8mk/8mk/8mk/8mk/8mk/8mk/8mk//SKiEGAAAACHRSTlMAgEAQ0CCgwHszpJ0AAABeSURBVCjPYwABiQ4k0IBTqE0QDiqgQk1gCsKmuZABppAzplCLAYZQhzOmEFBZkDJCKEiBoQOoDA10gJQxIgJCACTUkYAuhKkK0yysNjoT43pnokKCYTALYaQcwkkOAOuLWyAmEX4YAAAAAElFTkSuQmCC)}.Eleditor-controller ul li.Eleditor-delete:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjBAMAAADs965qAAAALVBMVEUAAAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAD/AAB21glVAAAADnRSTlMAwEDQMBDgUPCgYCCQgBYit2kAAACsSURBVCjP5czBCcIwFMbxr6UgejI3T0UygFQHCIILBDzosRMED87TGZxAOoJukLaCVeHNYBpCEnrz7P/wDj/4HmwzGnoj6miplxFVPWNsQXWQlFq7/gRKaA5T3sB2NxNBa2ZSNNwbaJyGGFOBlNOG+0TLYTK/fbmGozNwkMhOgaZ0gSpxfQVKaAnSWDV/T5NOoqqxfwaC7zcqAglHDy8ZOYpypGIqLe0i6bbAFx3L0mvjGhXnAAAAAElFTkSuQmCC)}.Eleditor-controller ul li.Eleditor-cancel:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjBAMAAADs965qAAAAJ1BMVEUAAACIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgln7UqAAAADHRSTlMAYLAgMfKf4EGAclBp3/IGAAAA9UlEQVQoz2MAA+ZFNWfOFC1mQAAOnTNgoAEXYdY5czxTQjL9zBllmNDWM8ccQLTbmaMbICKMZw4ZQFhGZw5CGDJHBWDqRc+AmdxnQuCmssScBlGmRx0QdrseBZmhA9EPM1cB6CYQ4QxxjANQwQkGBqYzBgwsEFNljjAw2BwC4mNAaaDlIE2HGRjYgCrWHAHJA5WBCaCGBQw6BWAFB8EYCGoUGGoSGCDKZCAG5hQwnJkAsfwY1DNzDjAA5SDKYAygUAOQBtl0DOLYHuyqMM3CtBGbuzBdj82PmCGBGV5YQxUz7DFjCDMeMWMbZ5rATDmY6QszFQIAly6EERaFwtIAAAAASUVORK5CYII=)}.Eleditor-controller ul li.Eleditor-editText:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAjBAMAAADs965qAAAAJ1BMVEUAAAAmk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk/8mk//34ERwAAAADHRSTlMAgEAQ0KBgMMDwcOAe1XweAAAA3UlEQVQoz4XRrcoCQRjF8fPiOwomRRARg3gFghttYjMs5g02i8FL8ALsGgxegs2q4ieci3J2d2aPA4In/vjDAzMIVlofAVR6fl0g4msJJPSLgQm5AQq5AVgwzaiotC+TPIDPerY2EN3S7ASei3MTxjZbQRSRNrv2LSmizUYQRe5sRorIfU6KeO07UjSCJ0UiRVNHiszFkaLEkaIqPXV89FeQcZGoiSSPROuZySPR7o4kjUQVcmbSSFQm72jgkwxthoD+yW0tpOF4DoQ08CDCT8p+W2tlFO4bPfxTaTHeolbpPP71OVwAAAAASUVORK5CYII=)}@media screen and (max-width:300px){.Eleditor-controller ul li{width:30%;text-align:center;padding-left:0;font-size:12px}.Eleditor-controller ul li:before{display:none}}.Eleditor-textEditor{display:none;width:100%;height:100%;background:#fff;position:fixed;left:0;top:0}.Eleditor-textEditor-colors,.Eleditor-textEditor-fontsizes,.Eleditor-textEditor-lineheight,.Eleditor-textEditor-linedecorations{display:none;position:absolute;top:0;left:0;width:100%;height:100%;background:#fff;z-index:1}.Eleditor-textEditor-modulePane{margin:10px 8px;border-bottom:1px solid #ccc;padding-bottom:10px}.Eleditor-textEditor-linedecorations .Eleditor-textEditor-modulePane{margin-bottom:0}.Eleditor-textEditor-linedecorations ul li{text-align:center;display:block;color:#555;font-size:14px;letter-spacing:2px;padding:20px 0;border-bottom:1px solid #eee}.Eleditor-textEditor-colors ul:after{content:'';display:block;clear:both;height:0}.Eleditor-textEditor-colors ul li{float:left;text-align:center;width:20%;margin-bottom:10px}.Eleditor-textEditor-colors ul li span{width:40px;height:40px;display:inline-block;border-radius:3px;cursor:pointer;position:relative}.Eleditor-textEditor-colors ul li span.transparent:after,.Eleditor-textEditor-colors ul li span.transparent:before{position:absolute;background:#dedede;content:'';transform:rotate(45deg);-webkit-transform:rotate(45deg)}.Eleditor-textEditor-colors ul li span.transparent:after{width:1px;height:100%;left:50%;top:0}.Eleditor-textEditor-colors ul li span.transparent:before{width:100%;height:1px;left:0;top:50%}.Eleditor-textEditor-fontsizes ul li,.Eleditor-textEditor-lineheight ul li{text-align:center;color:#333;font-size:14px;line-height:30px}.Eleditor-textStyle{display:flex;display:-webkit-flex;position:relative;border-bottom:1px solid #eee;overflow-x:auto;overflow-y:hidden;box-shadow:0 0 10px rgba(0,0,0,.1);-webkit-box-shadow:0 0 10px rgba(0,0,0,.1)}.Eleditor-textStyle .Eleditor-textStyle-item{flex:1;-webkit-flex:1;padding:10px 0}.Eleditor-textStyle .Eleditor-textStyle-item div{width:24px;height:24px;position:relative;margin:auto}.Eleditor-textStyle .Eleditor-textStyle-item div:before{content:'';position:absolute;left:0;top:0;width:100%;height:100%;display:block;background-size:20px;background-position:center;background-repeat:no-repeat}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-active{background-color:#FFE69F!important;padding:0;border:1px solid #DCAC6C;border-radius:2px}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-bold:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAACgUlEQVRYR82Y0XEaQQyGpWWO19BB7AqCKwipIHYFcQeBh9MOT8FPzC4PmApyVBB3ENOBU0FIBbGf4U4ZkSVzM8GsbjycV08wo+O+ldC//y5C4oGJ80EU0Dk3McawZiHM/AgAD5JLRCvNM7GcKKD3XgX3zIsEtsiybDkajQS+cagAmfkJEXeV0QQz9xHxTS33ERFv8zy/0Txfz1EBAsCKiAZNfnw+n/c2m80lAEwA4G149j7Lsqsm1TwZYH0xzrkhIs73kET0QbvYVgAFxnt/DQBf5TMzj6y1txrI1gAD5B0AfGTmtbX2PDnA6XR61ul0fgawCyKKDl6rFRQw59wDIr5j5htrrQzQ0Wgd0Ht/DwDvkwVMuoJBG3+HSb6y1srQpNPiuh6WZXk+Ho/XyQB67/sA8B0Aesy8tNaKLkajlSERR4SInwPcU1VVfU31hP5kgEHzRJRlmzsL/zsxHQON/u1LqwX85/OiPfmbcMhYrMqyvNZWrimgkutwGiJOttvtsimcusVN/aAI8SFUZr4zxizyPBexVoW2xY39oLxd/ofGGJle8YWXNRM7JKKFhvCkgHWAINKFuJkwMCrL1RrgHtY5VyDiJ/muEevWAQXMey87iBwDFkQ0PNbqVwEMwv1FjqhEdJEc4Gw2GzCzbHtyfj5apFepYPKAzjmRnG/JVrA2yVF9bb3FQQ/l4CS2K6qFrQN673dHzyR1sC7SSR2agjeUW4WdDWPmH9Za2aOjcdIWh2mVdopZ6O3hut3uQHuBpAKUqwpjjGz0zwYz102qwPxXIW1b6y9RAUb7cDzhFzMXVVUVpzKsanMZWrjPlyuOdZPzx6F1Riv4wuq9+PHkAf8AXHXCODnTUHYAAAAASUVORK5CYII=)}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-color:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAC6klEQVRYR82YTW4TMRSA3xspWSGRLliTnIB2yYr0BMAJCNLYqsQCOAFwAsoGRX6JmJ6AcgLCCVpO0HACWokFmjDzkKNM5Px4xj+DindRPJ7Pb+zP7xmhxZam6QUi/iaih20Ni20NJKV8AgCf9XhJkgzG4/G8jbFbAxRCzBDx0QrqTCk1+m8AT05O+mVZXgHALwC4w8zXi8VikGXZdSxkKxGUUmYA8AwAzpi5v4rka6XU6a0DjkajXqfTuULEnl57RVEMEfETAMyVUoNbB5RSvgWAN8z8jYiGGkgIMUfE+8z8nIh0dINb9CeuYADgqVLqXJMY0DMiOg6mA4AoQCHESH9OZv5BRP0KRH/2brf7U/9m5iMiugyFjAWs1LKzIcyNE6OcYEAhxCEiXgDATZ7n/W2lGOqBPM8PQpUTDOgSIUPe75RSejN5tyBAc43VHWvG8ResnCBAY5d+ISJ9BltbrHKCAKuXlmV5PJlMZnWAUspXAPCemYOU4w1oU4sNcrUcdGZz12VC2+OEAC7V4nNKCCFOEfGlPqt9leMFmKbpMEmSrza12KJoKsc3V/QCrNTCzB+ISK8t5yaEOEfExwDgpRxnwJgo6FlU0de5IhEduM7MGdBHLbaXhyjHB1Bnx0E7sQI2DHBJREcuUXQCrAYGgO9KqUOXgff1CVGOE6CUUqdLD3zUYpuE71JpBDTVopTqhUaves53szUCGlmLlx4ajr9lkeWiq1pAc7axkbM8/yfP83t1uWItoHFE6fTd2V0+kymK4sV0Ov1oe8YKaJaTIYd8E6Rhhtpc0QrYlloa1mKjW+sAW6ttY5SzF7BttTTkisvy1Jbl7AUMzTya1t2+/5uKrx3AtspFV9iqfLXdiO0AxmS/rlDb/YzydOcCYAPQVEvslYUPbJ1yNgCNdGh9U+Xzopi++y6h9HjbgP9cLQ7K2ShP14BGSr5xUxUTFZ9nzVzRVM4acLX+MkTMqns+nxe00Xe1xIZmafoXDcwGR/w9qZwAAAAASUVORK5CYII=);background-size:16px}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-color:before{background-position:center 3px;background-size:15px}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-color span{display:block;width:18px;height:1px;background:#333;position:absolute;bottom:2px;left:4px}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-linedecoration:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAACd0lEQVRYR+2YS3LaQBCGuwVoa98g9glCThByA3wCkxMEFswUqzgrqoeFyAlCTmBuEPsEISewfQO85aFOtWpGRWE9kShvNCsYaVqf/n7NCCFhENE9IvYQ8WY8Hj8k3VPX3Gw26zHzPTM/aK1vju1i0oOMMSzzzPxDa31XF0yKGHeI+F2uKaXe8DSAeeoTUaNgnkiZ1xsFK8kHAI2CjYJNJ8mJgSZJmiRpkuScSQIAP5VSw6pxlrXeGDMHgG+lNqxEtELEjwDwqJTqnRlQjhSfmfmf1rpbdMvvFj1rra/PCUhET4h4lSZG2pY/lh0APimlVueANMaIYn+t7cRwSgPMXVgHMBEtEPHW2koUIhFQFhhjngHgg/ze7/fXk8lE/tc2ptPpVavVerIGX5RS4uY3IwtwAAC/ZAUzL5POrFVo7dm7b218VUotSgFaFaNksZAjrbXEZuVBRENEDKyhzEqRqqAF7MqJHxEv8t60KLUx5tAzr/IFIysJMwHlofbTxB8HwMxzrfWoKNDhfUQUIGJc+BHxS96nlVxAq+RAwJySzCwJIy5fFgElIslUOaBHicDMotwwLe4ObRYCdO4GAAGKMts+SECXiCjzr85Vtr5dMLMkQd+B2WUvMle0thYGFONBEFxuNhtxkQS5i8siIkaqAcDc9/35aDRaF1oEAKUAnVELOkBEUSjK8ozxKGXK9/1FGTBn7yTAQxiB3e123TAMLwHANfuV53nrdru9OgXqpBgs6pK676usYN1Ax/YawKoKxwpKsG+321tElGB/t8HM606n89slVwx41MDfDdA2gHhjEgNKzw3DULpCqQJc95tIQfc8r+969H9Yv8s4C539kQAAAABJRU5ErkJggg==);background-size:18px;background-position:center 3px}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-bgColor:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAC5ElEQVRYR82YTXLTQBCFuy3JW5ITYJ8AcgKSExBOAJyAeOGe8oqwcs14YTgB4QTACRJOgDlBkhNg1i5Xp1olqcZj/cxIqkKzk0oafeqZ9/pJCAMf2IVPa305Go1eyBzM/EhEN13mK7u3NeB6vT7Z7Xb3AHCST5wkyelsNtv2Cdka0BjzDgC+2jDMPFNKfR4K4G8AeAkAjwDwPFvmB6XU9L8DGmMETABl731CRDl+nYGdEdGmL8hWS6y1vkHEtwKx3++nURSd58vNzN+UUrL8vYxgQEccv4hI4EBrvUXEZwCwTZJk2pdYggEdcbzPrcWuKgAU57uWsQ1gKg5m/qeUKizG3pcAsCGis65wcn8QoAPxhYiubAit9QYRU+MGgF7EEgToimOxWDw4gFeIuM7OHb1Am4p6A9riYOY/SimxloORXfM3O7klotM2UPY93oBV4nABjDE/LE/sLJYQwEIc4/F4UmUjEiAQ8XsGfkdEF12q6AXodI5GI7Y8MTVyd6+GAHsBOh7XqE5jjASGD32IpRHQRxwl+7Do1dJZuoilEVBrXVhHSJyyPZGZ3yilRDzBwwfwHhEnMnNIILVfDAB+EtFlMF1TJ1mtVufMfJv7mrSwgIdIGyy8sq1YaivoiCOA7fhSyY1KqevQSSoB7a4gwQARQ6pnc7ySA2ZulbYrAZ091LqvGmOkX+efBMFiqQMsxNF2/0jlHBdoNHl3C5QC2uKoCga+e2m5XE6iKJLP03SEOIFcXwrYdzq2A0SIl5YCuuKoCwa+VbQDRKhYjirYdc9UQdtiQcSL+Xx+5/OCZYCFOEImanqY1voaET9mluMtlgNAp3PIz6C0xfUxfMUi0c7+8D8AtMURupl9XqIpbWe589ZOP0cVzB8Ux/Gmr4/vfE6pYhzH6aows8SwojvlcPK3jIgKrsY041OZrtfYcDLXoABduEEBlsENBrAKbhCAdXCDAJRuZf/bdkVmB9tBqLjOBZ4AEfu5OCh98OAAAAAASUVORK5CYII=);background-position:center 3px}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-fontSize:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADUAAAAoCAYAAABerrI1AAAD/0lEQVRoQ8VZ0VEbMRDVwvh+QyoIVJCkgpgKQipIqCD4w9LwBXwxkj+cVBBTQUgFIRUEKsBUEPxrA8rszelmvae7k+5k0A8zWNLuO63evl2B6DEmk8nQWntSbHEjpTzqsV2ypdBnJ631DAA+uz0eHx/3jo+P5332TLG2M6jpdLqzWq3+USestWdKqdMUjvXZozMorfURAEwL43dCiDfW2rlSaq+PQynW9gF1CwC71tobAPgmhPiBDllrPymlLlM413WPTqAKgvhdgBhlWTZbLpdzAHglhPglpTzo6lCKdZ1AUYIYDAavR6PRPf3fSxNGNChKENbaC6XUF/y67PRelDCiQVGC4PfHGIN0vjHCmEwmJ09PT/lH3Nramo3H4zNfuHYBlROEEOJOSol/y9EEuO9dMcYgmJyMyJhJKQ/53lGgaIgJIb5zBXF+fr67vb19WxhJRhgckLV2UZASmjqUUs4osChQIWRgjEE6/4hGUhCG54QOrbX3APCTAFkDFgyKKYg/UsqhL6SoE30VhjHmnRDir895H1h3YsGgmIKoHDm7W/glX/VRGAUgzIU7Lh8qpTDJl4MBuxdC7Espr2NAOQWxyLJsF3NT3eU3xqDxr4Uz0QrDA6hMHdym1voUAFylkAMLAsVyUK0BZ5CFTTRhGGPwhPLwprmw7iPSu47REQSKlRjv8YjbKFprfQ0Ab7sQhjHmSgjxIUZyER/vWkExgqjkpoYQLPNKLGGgzeVyOYwVxhhRDw8P7SfFEuqIX9Y6UExOPWtJ0npSWmunIKLzDov1aMJoC/G63xtBMQURfeG11gckSUav3wioFF/aidwuhJEcFLsTC6VUngRjB80jsYQRa8vNrw0/piAq4jXUIBW5fRRGqD2c1wSqJIiYDdvmPkcPwwuKEUSbn7G/b5wwvKAYQVwIIVI0KLGlho2Z6NQQ+9UqoHiT0jVWYjf2CM+ym7tpwqiAYgqiVbyGgqUit40wiMpvLHGobVeGWGsvfaBKggCA/fF4jOIyyaA5q4kw6Dxfuc6dYYXpYg0UI4hg8RqKmKWJWsJoqmo9gCrV8RooRhDJe3f8vjb1MOqqWhZyCKhSHZegYgyGnoxvHm3MtBGGr6p1tVxTdVyCYqFR21jpAwjXUpHbRhjFfPoGlpfrg8FgvlqtsBXn+hdrhEZBUQURzDpdQGqt88YMrg1RGKzydlU3hh6Oyt3MQbEeRGfxGgqQNmZCS3Yats4OPiNlWTbkTaAcFFcQrukf6mTsPNbJDVIYRYl/5foedYDQF/A8cwY1VmKBeBRG2ZhpIwwP44mm5g8wBXGjlHKx2tfvxvUsYSbtYSAoZBf3eoGvCGvN9k0hKyKEPqMehbTeQvz5D/g1DKSBanO4AAAAAElFTkSuQmCC);background-size:22px}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-lineHeight:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAABl0lEQVRYR+2Xy03EMBCG7Y1yhhLoANIBJSyVQC5j5cRyipxcoAM6ACpAVEBKWDpIA8kgr3Ylk9ckmdhaieTqeXz+57cVS3HmnzxzPrECcic0SkGt9bau6yJJkj234dR8EjBN06sgCL6FEHsAiKY24MaTgFrrQkp5fWz0AgAP3KZT8gcBsyx7FkLc2wUR8U4p9T6lCSe2F9D4Tkr51lG8rKoq8uXHTkDLd5c9uy98+bETsOG7vgm1/Ki13kkpH+eOFBGflFI7O78F2OW7voZNP3oBzPP8dqwCiFgCQDE2fk4cec3MKbpkzgrIVXNRBY1/EfGTAfUFAH/OwP8CZCjXm7qogiugCwW4NRcd8XqKueNwkb/oiFdAFwpwa7ZGPPJv+tAXEWOllHlYHT4vp9i8RzabjXlqXhC7/wCArR3jBdA0HHjRnXh+wjC8ieO45I6Qyu89xcTbJHL9q38CH7xmuvzY9B2lAHd9ELDDjy3fcQGofPKitvzozXc2NAlogo9+fPXlu8mA1Bhcro9S0CUAVXsFpBSi1n8Brg2tKfeVeOYAAAAASUVORK5CYII=)}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-alignLeft:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAABJElEQVRYR+2WQQ6CMBBFO4Gu9QZ6BLiBV/AG3kDZ0LBzR1IWxBOoJ9EjeASOgFsCHUOCiQvbRIYmkkzX/X9+XmcmBfHnB/48n+CA1BdigkyQSoCqn28P5nm+DoLgTCUgpdwmSVKP9bESHAJexhoPulpKufMSkBhsMvl8e3AyBESjeRPUWu8AYEWEYJUbYyql1NXlbyVYFMUGEW++wn34xmmaPmx1nE+stY4AYOkrJCLWrnB93Xn3oC9yv/gywV9ofbtrJdgPiBCin2LKkNRd18VZllVjg1oDlmW5bJrmMNb4rVNKHSke3IMUerwHqfScBPshadt2P0URl0cYhifXj9u5ZhDxDgALXyER8WmMiVxriKeYSp8JMkEqAaqee5AJUglQ9S80f0opswUQfwAAAABJRU5ErkJggg==);background-size:25px}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-alignCenter:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAABGUlEQVRYR+2Xuw2DMBCGbU+QTZINwgbJBskIaThEl9amQNnAbJARYJPsgWQi2ijgx48liqO+x8d3Piyk2Pkjd84nGBCdEBtkg6gBNJ/PYHaDxpi3EOKCNvLkv4jo8S/GO2Kt9VUIccoJqJTqy7LskwBzgoXU9hoMKZIzhgFRu9EG56VRSh3BxsPSUvzWTQG0UsobCLj4WYEBQbDo9GiD0R3ABAYEBfr/Sdq2PYzjiG7tKicRDUsB3hEbY+Y78oyaWMufpqmrquqedBc3TVM454qcgM45W9f1JwkwJ1hIbe+IQ4rkjGFA1G60Qa31U0qJbnVHRDYEPhUQ3WqbDTDkrbeMiTa4ZfOQWgwYYmkthg2yQdQAmr/7M/gFx6c4KVrJFfgAAAAASUVORK5CYII=);background-size:25px}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-alignRight:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAQAAAAm93DmAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAAmJLR0QA/4ePzL8AAAAHdElNRQfhCQ8REBuZ/AJaAAAAoklEQVRIx2NgGAWjYBgCRvzS/QK/1xMy4m9i5QMEj4mglR8ZGAnAUUBlgBGknfFMCqQY8P9h2QI8BnYZMJwn2U2OpQfwuLDLgFGAJBd+KLtAcTiNAhRAICe2KzCfZxDAq+QDgyNytLDgN7DyQedEQm5iezDQoTLcAFos9wv8ySfVCJaJhR+QeKiSPwSYChn5STHu/8ffGxkuDHS4jIJRMNQAAJ5SImJVnuoKAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE3LTA5LTE1VDE3OjE2OjI3KzA4OjAwUsazsgAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNy0wOS0xNVQxNzoxNjoyNyswODowMCObCw4AAAAASUVORK5CYII=);background-size:25px}.Eleditor-textStyle .Eleditor-textStyle-item .Eleditor-textStyle-upImg:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAARVBMVEUAAACKioqJiYmLi4uKioqLi4uIiIiKioqKioqJiYmJiYmJiYmKioqKioqPj4+KioqKioqLi4uKioqJiYmKioqJiYmKiopHpOm/AAAAFnRSTlMAwIB/XkAf79Dyn1DgMBBvkHA/r8SPuxOfgwAAANRJREFUOMvl0MtygzAMheEjI98wGELa8/6PWsxAsik2M22yyb/VN2NL+NRsV8muU92hoZxGoxLlAXEaDSDvhbbTS1BJzlegcO1foY3kdAXCpfHv5xkHSr4A1ZMMbajcMi04c8/WYc8jn2tQ+ExQct/39Avce35z9CT7BqTdXJEayKH7OoM+ee7NN50Ghgc8KTqUAl0dlrnTFQxSh3cAthilq8Ib3DKFZQFoG1AlRJEmNMfTjmMV+gP2sbF1j61ERTVll4E8+R6N0sAgjAbtrDEp40X9AEsWInSQgk2QAAAAAElFTkSuQmCC);background-size:22px}.Eleditor-textStyle .Eleditor-textStyle-item-upImg{position:relative}.Eleditor-textStyle .Eleditor-textStyle-item-upImg-disabled{display:none}.Eleditor-textStyle .Eleditor-webUploader-btn>:not(.webuploader-pick){transform:translate(-50%,-50%);-webkit-transform:translate(-50%,-50%);top:50%!important;left:50%!important;opacity:0}.Eleditor-textStyle .Eleditor-webUploader-btn>:not(.webuploader-pick) label{position:absolute;top:0;left:0;width:100%;height:100%}.Eleditor-textEditor-formats{position:absolute;right:-60px;bottom:20%;border-radius:50%;-webkit-border-radius:50%;width:100px;height:100px;box-shadow:0 0 5px rgba(0,0,0,.1);background:#fff;z-index:1}.Eleditor-textEditor-formats div{background-repeat:no-repeat;width:100%;height:32px;background-position-x:12px;background-position-y:center;position:absolute}.Eleditor-textEditor-formats .Eleditor-textEditor-format{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAMAAAC7IEhfAAAAPFBMVEUAAACPj4+Li4uKioqKioqKioqKioqKioqHh4eJiYmJiYmJiYmKioqKioqJiYmKioqJiYmJiYmJiYmKiooOOgKOAAAAE3RSTlMAEEBggO/AoCDQ8N8w4LCQUHCP4ZsY5wAAAUlJREFUOMvFk92WgyAMhAUJ4U9E5/3fdStCaYtlvdmzuVGPH5kkE6Z/iD3d4xTmW5wgey8hI4zk2JQ3CTXgEkBKZGG/jMuS+kRXyFFZx9+MSqwDToLP5wLADIQtdNGbF/j5O2eVgza/ouzCJFaAxQsq+nwH9wjDINVQMp2uC7Ul3URnbB/9+sLVrm3p6t0esUO3YopoPETlW0Zpe1uFctjFA2z+GA0drqZ1dLXhuSOM5dtkTQRcOaVhK8bUozN0feFWAF+BW3M35NLJpSuzniWKFbTJnRBFyWy6W9N8gOM6hETcKbdPByXq4O3rpLwrOk3fp+OEf1/r1PsgLSL7trb+THi15Qog+bTEZrxLWAfpMznTCQh6rfCzKal8dT7i+6VhoNWJOLqveQ2PCJ1w1xSlXCDSNI5gEY2wZaLjpA4EPd0Is+q8I38XPwbTDcl2Nko+AAAAAElFTkSuQmCC);background-size:20px;border-bottom:1px solid #F5F5F5;top:15px}.Eleditor-textEditor-formats .Eleditor-textEditor-clean{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAABkUlEQVRYR+3XvU3DQBQA4PdsUUBSMAIjpKLOCIwQK9QEb8AGRrgE5EyAYIKkoWcERqAIpME+ZISlyPL53p+lCMX13b3P7/z87hD2/ME998EBqN0hbwa3RXZ2nKTv2gCU+X2xOoHb+3xaonuGuJyOk/SNEkQ6ZlNkE6iiFQCm4/nVsr2ON4Obx7sZOLgdEtng0MHL6HIx63rJ3iIZEknB1eBgFQ+BpOJIwHqQJZKDIwOtkFwcC6hFSnBsoBQpxYmAXKQGJwZSkVqcChhCWuDUQB/SCmcCbCN/21UVrfraF6dvBzsJdbH6Z+6cyxGcQ8AnX2+lrteMswMW2QTL6BUAjlxcnVudgkyAu9+cQ1xbnoLUwK6CsOzdKmBftVohxUDKr8QCKQJScE0VapFsIAdngWQBJTgtkgzU4DRIEtACJ0UGgZY4CbL/2vl3qbZq/Lt9mFrd/ov7gDhOJjuBQ2yr7xQTymQn0BXZ6VcVXY/mixvu8Ugy/vMhvziJv9eYpB/t+cEikQS0nHMAarN5yOC/z+APDA6MODgVGhsAAAAASUVORK5CYII=);background-size:20px;bottom:15px}.Eleditor-inputarea{position:absolute;top:45px;bottom:60px;width:100%}.Eleditor-textEditor[type=link] .Eleditor-inputarea{bottom:95px}.Eleditor-inputarea .textarea{-webkit-user-select:auto;overflow-y:auto;overflow-x:hidden;height:100%;width:100%;padding:10px;box-sizing:border-box;font-size:14px;color:#555;border:none;word-wrap:break-word;word-break:normal}.Eleditor-inputarea .textarea:empty::before{color:lightgrey;content:attr(placeholder)}.Eleditor-inputarea input{display:none}.Eleditor-inputarea .textarea img{width:100%;height:auto;box-sizing:border-box}.Eleditor-textEditor[type=link] .Eleditor-inputarea input{height:33px;display:block;border:none;border-bottom:1px solid #ddd;width:100%;margin:10px;color:#333;outline:none}.Eleditor-method{border-top:1px solid #eee;position:absolute;bottom:0;width:100%;box-shadow:0 0 10px rgba(0,0,0,.1);-webkit-box-shadow:0 0 10px rgba(0,0,0,.1)}.Eleditor-method:after{content:'';clear:both;display:block;height:0}.Eleditor-method button{width:50%;border:none;padding:0;margin:0;box-sizing:border-box;float:left;background:#fff;height:40px;color:#333}.Eleditor-method .Eleditor-commit{border-right:1px solid #ddd}.Eleditor-placeholder{color:#999}.Eleditor-deleteMode *{border:1px dashed red;text-decoration:none!important}.Eleditor-deleteMode *:empty{padding:0 10px;box-sizing:border-box}.Eleditor-delete-layer{display:none;position:fixed;bottom:0;left:0;width:100%;background:#fff;border-top:1px solid #ddd}.Eleditor-delete-tip{position:fixed;top:0;width:100%;text-align:center;line-height:28px;font-size:12px;background:rgba(255,235,59,.95);color:#F44336;border-bottom:1px solid #ffd350}.Eleditor-delete-back{padding:15px;box-sizing:border-box;width:100%;text-align:center;font-size:14px}.Eleditor-delete-back:before{content:'';background-size:100%;background-repeat:no-repeat;background-position:20% center;display:inline-block;vertical-align:bottom;width:16px;height:16px;margin-right:5px}.Eleditor-delete-revoke,.Eleditor-delete-clear{position:fixed;width:50px;height:50px;right:20px;font-size:12px;border-radius:50%;box-shadow:0 0 15px rgba(0,0,0,.2);-webkit-box-shadow:0 0 15px rgba(0,0,0,.2);background:#FF5722}.Eleditor-delete-revoke{bottom:70px;background-image:linear-gradient(to bottom,#ff5165,#ff8f8f);background-image:-webkit-linear-gradient(to bottom,#ff5165,#ff8f8f)}.Eleditor-delete-revoke-disabled{display:none}.Eleditor-delete-clear{bottom:130px;background-image:linear-gradient(to bottom,#9E9E9E,#d6d6d6);background-image:-webkit-linear-gradient(to bottom,#9E9E9E,#d6d6d6)}.Eleditor-delete-revoke:before,.Eleditor-delete-clear:before{position:absolute;left:50%;top:50%;content:'';background-size:100%;display:block;background-repeat:no-repeat}.Eleditor-delete-revoke:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAWCAMAAADpVnyHAAAANlBMVEUAAAD////////////////////////////////////////////////////////////////////xY8b8AAAAEXRSTlMAQBAw0KDwYJBQv4DAcJ9/IDt3TZ8AAAB7SURBVCjPddHdDsMgCIZhEMW/dtt3/ze7NGsHxvCemUeMUfonQkFVORIgoBMRFTjaBXm0d08LpAHXS5xkrLVnUh6x8m0H9jTZeftcbM3uvsWLncx9Fv3RoLvpNkpZxqj6xefCErx8V8CeTPQiW6FHv8xoFDWPkFKmsPoFjOgMtneR5goAAAAASUVORK5CYII=);margin-left:-15px;margin-top:-13px;width:28px;height:28px}.Eleditor-delete-clear:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAUCAYAAACNiR0NAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAB3SURBVDiNtZRLDoAwCESJJ+Fo3P8S48KaWC2/SZ0tvEegSUVGAKiQ+bAADFeMkM0sAMWcsvQhu6NeIZWmTEda7q00treJAOY0LkjLAikvS6Sh7KAmMdm68tZHicC2tAKUpZ3paS9zH5fBz99XWbaQ2rugXdmKPQEoqkqrB7vx6gAAAABJRU5ErkJggg==);margin-left:-12px;margin-top:-12px;width:24px;height:24px}.Eleditor-delete-back:before{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABcAAAAXCAYAAADgKtSgAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAABx0RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNui8sowAAAHwSURBVEiJndW9a1RREMbh52yyyW5KEcTGIiIqiAgWgqIWliIIajBqINhYWNgIYjpBgpogprRUCz9IEBRBEESColb+ARKw0ZRWSTR+jMW9G67J7k1uBrYY7szvvPsy50yKCCmlBi7iAHqQdI6E0Yh4u+JDSsMYwiTuphw+go24h++ol8C78CUiFpeBh3AED3AUMyICXmFbRFjPD2fxFFvzfA+mu/ODF/GzRG3HSCkNYACXI2Imt3gIL2uFuu623eXgMxjElYj4nFLqww3MYaz1t16gv6IVg5jCjjxvYgKjqEeEdcFxSubx9jzvLYBrS3VV4TiOZwXFdYzjFrr+q60Cxwk8x64878mh4+hdUb9WOE7mVuwuWDGOMTTa9qwFLrsUkwXFRSvqbeobqK0KxyFMFxTXcBO3O4DrGMHm4py3m+MNOI9Z7E8pNXEtVzYSEb/atNWxF81SOE7jW37ATjzJlV+NiB8dekJ2iaIjPKW0BfvwCIexCe9xPSLmVxGF8is/IHsBz8lezDsR8WEt0FJ4Sqkfx7CA13gYEQtVwB3hMjs+YiIivlaFrgafwuOI+Lte8HL4Emj5lqkYv+VrsjUtZWutavS1Dmkpf4MLKaX7mJdNSdX4I3tvhvEJs60F3cAlHMwLy7Z/pwiZE+9kYzv3D53cyfc4mlqcAAAAAElFTkSuQmCC)}
diff --git a/ruoyi-content/src/main/resources/static/css/createArticleStyle.css b/ruoyi-content/src/main/resources/static/css/createArticleStyle.css
new file mode 100644
index 000000000..d46edb893
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/css/createArticleStyle.css
@@ -0,0 +1,343 @@
+/* 公共 */
+
+* {
+    padding: 0;
+    margin: 0;
+    font-family: "微软雅黑";
+    transition: all .2s cubic-bezier(.6, .1, .1, .7);
+}
+
+html,
+body {
+    height: 100%;
+}
+
+li {
+    list-style-type: none;
+}
+
+hr {
+    height: 1px;
+    background: #e4e4e4;
+}
+
+body {
+    display: flex;
+    flex-direction: column;
+    background: #f6f7f8;
+}
+
+button {
+    border: none;
+    filter: contrast(1);
+}
+
+button:active {
+    filter: contrast(.9);
+}
+
+textarea {
+    resize: none;
+}
+
+/* edit页面 */
+
+/* 部分css效果在公共组件部分 */
+
+/* 包含Eleditor的样式修正*/
+
+#edit_head>.b {
+    padding: 0 0 0 calc(2.36rem - 1.68rem);
+}
+
+#edit_head>.c {
+    margin: 0 0.4rem 0 0;
+    width: 2.36rem;
+    height: 100%;
+    background: #fff;
+}
+
+#edit_head>.c>img {
+    width: 2.36rem;
+}
+
+#edit_cue {
+    font-size: 0.52rem;
+    line-height: 1.2rem;
+    text-align: center;
+    color: #37c7aa;
+    background: #d8efe9;
+}
+
+#edit_body {
+    flex-grow: 1;
+    padding: 0 0.6rem;
+    width: 13.8rem;
+}
+
+#edit_body .a {
+    word-break: break-all;
+    margin: .6rem 0 1.4rem;
+    padding: 0.6rem 0.5rem;
+    border: #37c7aa dashed 1px;
+}
+
+#edit_body .b {
+    font-size: 0.52rem;
+    color: #37c7aa;
+    text-align: right;
+    margin-top: -1rem;
+    padding: 0 0.1rem;
+    margin-left: 8.4rem;
+    padding-bottom: 1rem;
+    background: #f3f3f3;
+    width: 4rem;
+}
+
+.Eleditor-controller {
+    z-index: 10000;
+    max-width: fit-content;
+}
+.Eleditor-wrap {
+    width: 100px;
+}
+.Eleditor-controller ul li {
+    font-size: .52rem !important;
+    width: 90px !important;
+    margin: 5px 5px 0;
+    padding-left: 30px;
+}
+.Eleditor-controller ul {
+    margin: 0;
+    margin-bottom: 5px;
+}
+  
+/* 
+ *  当前页面的样式
+ */
+    #div1 {
+      margin:10px auto;
+      border:1px solid #ccc;
+    }
+    #div1 .title {
+      width: 100%;
+      margin: 0 auto;
+      position: relative;
+      z-index: 0;
+      padding: 5px 24px;
+      border-top:1px solid #ccc;
+      box-sizing: border-box;
+      background: #fff;
+    }
+    .text{
+      min-height: 27.43px;
+    }
+    .w-e-text p {
+      display: none;
+    }
+    .head,.author{
+      display: block;
+      width: 100%;
+      font-size: 20px;
+      color: #000;
+      min-height: 30px;
+      margin-bottom: 5px;
+      outline: none;
+      resize: none;
+      border:none;
+    }
+    .head {
+      font-size: 24px;
+    }
+    .head[contenteditable]:empty:before, .author[contenteditable]:empty:before{
+      content: attr(placeholder);
+      color: #D4D4D4;
+    }
+    .head[contenteditable]:focus,.author[contenteditable]:focus{
+      content:none;
+    }
+    .editorcontent{
+      width:800px;
+      font-size: 18px;
+      line-height: 20px;
+      height: 370px;
+      overflow: auto;
+      padding-top: 10px;
+      border-top: 1px solid #ccc;
+    }
+    .editorcontent div{
+      min-height: 27.43px;
+      line-height: 24px;
+      font-size: 15px;
+    }
+   /* 上传图片*/
+    .abstract {
+      font-size: .26rem;
+      margin:10px 0;
+      color: #333;
+    }
+    .cover_abstract {
+      width:100%;
+      display: flex;
+    }
+    .imgload {
+      position: relative;
+      width:25%;
+      text-align: center;
+      overflow: hidden;
+      height: 90px;
+      line-height: 90px;
+      background-color: #fbfdff;
+      border: 1px dashed #c0ccda;
+      border-radius: 6px;
+      margin: 0 10px;
+      box-sizing: border-box;
+    }
+    .fileImg {
+      position: absolute;
+      top: 0;
+      left: 0;
+      display: inline-block;
+      width: 100%;
+      height: 100%;
+      background: none;
+      margin: 0px;
+      padding: 0px;
+      opacity: 0;
+      filter: alpha(opacity=0);
+      cursor: pointer;
+      z-index: 2;
+    }
+    .avatar {
+      position: absolute;
+      top: 0;
+      left: 0;
+      display: inline-block;
+      width: 100%;
+      height: 100%;
+      z-index: 1;
+    }
+    .addIcon {
+      position: relative;
+      top: 0;
+      left: 0;
+      display: inline-block;
+      width: 100%;
+      height: 100%;
+    }
+    .addIcon::before{
+      content: '';
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      width: 30px;
+      margin-left: -15px;
+      margin-top: -2px;
+      border-top: 2px solid #cccccc;
+    }
+    .addIcon::after {
+      content: '';
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      height: 30px;
+      margin-left: -2px;
+      margin-top: -15px;
+      border-left: 2px solid #ccc;
+    }
+    :focus {
+        outline: none;
+    }
+    .lables{
+      height: 200px;
+      width: 200px;
+      border: 1px solid #ccc;
+      position: fixed;
+      top: 50%;
+      left: 50%;
+      margin-top: -100px;
+      margin-left: -100px;
+      background: white;
+      z-index: 555;
+    }
+    .lables p{
+        font-size: 14px;
+        color: #fff;
+        text-align: center;
+        background: #409eff;
+        padding: 0;
+        height: 30px;
+        line-height: 30px;
+    }
+    .lables label {
+      display: block;
+      font-size: 15px;
+      margin: 5px 0 5px 20px;
+    }
+    .lables label input{
+      margin: 0 10px 0 0;
+    }
+    .lables_box {
+        height: 135px;
+        overflow-y: scroll;
+    }
+    #sures{
+        display: block;
+        position: absolute;
+        bottom: 4px;
+        left: 0;
+        right: 0;
+        color: #fff;
+        width: 90px;
+        font-size: 14px;
+        text-align: center;
+        line-height: 30px;
+        background: #409eff;
+        border-radius: 5px;
+        margin: 0 auto;
+    }
+    /*样式修改*/
+    .textarea {
+        width:1000px;
+        margin: 0 auto;
+    }
+    .seldiv {
+      position: relative;
+    }
+    /*.w-e-text-container .label{
+      position: absolute;
+      top: 50%;
+      right: 5px;
+      float: right;
+      background: rgba(0,205,50, 0.4);
+      display: flex;
+      font-size: 12px;
+      line-height: 14px;
+      color: #fff;
+      align-items: center;
+      justify-content: center;
+      padding: 0 3px;
+      transform: translateY(-50%);
+      box-shadow: -1px 1px 1px rgba(0,0,0,0.3);
+      margin: 10px 3px 0 12px;
+    }*/
+    .w-e-text-container .label{
+      display: inline-block;
+      min-width: 50px;
+      background: rgba(0,205,50, 0.4);
+      font-size: 12px;
+      line-height: 24px;
+      color: #fff;
+      padding: 0 6px;
+      box-shadow: -1px 1px 1px rgba(0,0,0,0.3);
+      margin: 0 10px 0 0;
+    }
+    /*.w-e-text-container .label::after{
+      content: "";
+      position: absolute;
+      left: 100%; 
+      top: 2px;
+      border-style: solid;     
+      border-color: transparent transparent transparent rgba(0,205,50, 0.4);
+      border-width: 13px;    
+    }*/
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/static/js/Eleditor.min.js b/ruoyi-content/src/main/resources/static/js/Eleditor.min.js
new file mode 100644
index 000000000..7e3bdb038
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/js/Eleditor.min.js
@@ -0,0 +1,936 @@
+/**
+* Version: 1.8.9
+* Title: Eleditor 移动端富文本编辑器
+* Site: https://eleditor.fixel.cn
+* Doc: http://doc.eleditor.fixel.cn
+* Author: Try
+*/
+(function(w){
+
+	/*polyfill*/
+	if (typeof Object.assign != 'function') {
+	    // Must be writable: true, enumerable: false, configurable: true
+	    Object.defineProperty(Object, "assign", {
+	            value: function assign(target, varArgs) { // .length of function is 2
+	                'use strict';
+	                if (target == null) { // TypeError if undefined or null
+	                    throw new TypeError('Cannot convert undefined or null to object');
+	                }
+
+	                var to = Object(target);
+
+	            for (var index = 1; index < arguments.length; index++) {
+	                
+	                var nextSource = arguments[index];
+
+	                if (nextSource != null) { // Skip over if undefined or null
+	                    for (var nextKey in nextSource) {
+	                        // Avoid bugs when hasOwnProperty is shadowed
+	                        if (Object.prototype.hasOwnProperty.call(nextSource, nextKey)) {
+	                            to[nextKey] = nextSource[nextKey];
+	                        }
+	                    }
+	                }
+	            }
+	            return to;
+	        },
+	        writable: true,
+	        configurable: true
+	    });
+	}
+
+	var _debug = false;
+	var _version = '1.8.9'
+	var _namespace = 'Eleditor';
+	var _notctname = ['INPUT', 'IMG', 'TEXTAREA'];
+	var _toolnames = { 
+		insertText: '插文字',
+		insertImage: '插图片',
+		insertLink: '插链接',
+		insertHr: '水平线',
+		editText: '改文字',
+		"delete": '删除',
+		undo: '撤销',
+		cancel: '取消',
+	};
+	var _editorTpl = '';
+	
+	w[_namespace] = function(){};
+
+	if( typeof jQuery === 'undefined' && typeof Zepto === 'undefined' ){
+		return console.warn('|--Eleditor 请引入jQuery或者Zepto！模块化环境请把依赖全局安装');
+	}else if( typeof $ === 'undefined' ){
+		var $ = typeof jQuery != 'undefined' ? jQuery : Zepto;
+	}
+
+	var _scriptPath = function(func){
+		var _js = document.scripts;
+		_js = _js[ _js.length - 1 ].src.substring(0, _js[ _js.length-1 ].src.lastIndexOf("/") + 1 );
+		func(_js);
+		return _js;
+	}(function(s){
+		var _buildLib = '<link rel="stylesheet" href="'+s+'layout/base.css?v='+(_debug ? (+new Date()) : _version)+'">';
+		$('head').append(_buildLib);
+	});
+
+	var _inArray = function(s,a){
+	    for(var i in a){
+	        if(a[i]==s){
+	            return true;
+	        }
+	    }
+	    return false;
+	};
+	var _formatInnerText = function (t) {
+		var s = t.replace(/\ +/g, "");
+		s = s.replace(/[ ]/g, "");
+		s = s.replace(/[\r\n]/g, "");
+		return s.replace(/(^\s*)|(\s*$)/g, "");
+	};
+	var _getLayerMaxZIndex = function(){
+	    var _max = Math.max.apply(null, 
+	    　　$.map($('body *'), function(e) {
+	    		var _$e = $(e);
+				if (_$e.css('position') != 'static')
+					return parseInt(_$e.css('z-index')) || 1;
+	    }));
+	    return (_max + '').indexOf('Infinity') >= 0 ? 1 : _max + 1;
+	};
+
+	var _genEditorUid = function(){
+		return _namespace + '' + +new Date;
+	};
+
+
+	var _correctHtmlStructure = function(){
+
+		var _$wrap = arguments[0],
+			_empty = arguments[1];
+
+
+		$.each(_$wrap.find('iframe,audio,video'), function() {
+			var _$this = $(this),
+				_tagName = this.tagName.toLocaleLowerCase();
+
+			if( !_$this.parent().hasClass('Eleditor-'+_tagName+'-area') ){
+				$(this).wrap('<div class="Eleditor-'+_tagName+'-area"></div>');
+			}
+		});
+
+
+
+		if( _formatInnerText(_$wrap.text()) == '' && _$wrap.find('img,iframe,video').length === 0 ){
+			_$wrap.append(_empty);
+		}
+
+		if( _$wrap.find('*').length === 0 ){
+			_$wrap.html('<p class="Eleditor-placeholder">'+_$wrap.html()+'</p>');
+		}
+	};
+
+	var _buildEditorModule = function(_toolbars, _uid){
+		
+		var _layerZIndex = _getLayerMaxZIndex();
+		var _html = '<div class="Eleditor-wrap" style="z-index:'+_layerZIndex+'" id="'+_uid+'">\
+						<div class="Eleditor-controller">\
+						<ul>';
+
+		for (var i = 0; i < _toolbars.length; i++) {
+			var _it = _toolbars[i],
+				_id = typeof _it === 'object' ? _it.id : _it,
+				_tag = (typeof _it === 'object' && _it.tag) ? _it.tag.toLocaleLowerCase() : null,
+				_name = typeof _it === 'object' ? _it.name : _toolnames[_it];
+			_html += '<li event="'+_id+'" '+(_tag ? 'bind-tags="'+_tag+'"' : '')+' class="Eleditor-'+_id+'">'+_name+'</li>';
+		}
+		_html += '		</ul>\
+					</div>\
+					<div class="Eleditor-loading"><p></p></div>\
+					<div class="Eleditor-textEditor">\
+						<div class="Eleditor-textStyle">\
+							<div class="Eleditor-textStyle-item"><div class="Eleditor-textStyle-bold"></div></div>\
+							<div class="Eleditor-textStyle-item"><div class="Eleditor-textStyle-color"><span></span></div></div>\
+							<div class="Eleditor-textStyle-item"><div class="Eleditor-textStyle-linedecoration"></div></div>\
+							<div class="Eleditor-textStyle-item"><div class="Eleditor-textStyle-bgColor"></div></div>\
+							<div class="Eleditor-textStyle-item"><div class="Eleditor-textStyle-fontSize"></div></div>\
+							<div class="Eleditor-textStyle-item"><div class="Eleditor-textStyle-lineHeight"></div></div>\
+							<div class="Eleditor-textStyle-item">\
+								<div class="Eleditor-textStyle-align Eleditor-textStyle-alignLeft" align="left"></div>\
+							</div>\
+							<div class="Eleditor-textStyle-item">\
+								<div class="Eleditor-textStyle-align Eleditor-textStyle-alignCenter" align="center">\
+								</div>\
+							</div>\
+							<div class="Eleditor-textStyle-item">\
+								<div class="Eleditor-textStyle-align Eleditor-textStyle-alignRight" align="right">\
+								</div>\
+							</div>\
+							<div class="Eleditor-textStyle-item Eleditor-textStyle-item-upImg">\
+								<div class="Eleditor-textStyle-upImg"></div>\
+							</div>\
+						</div>\
+						<div class="Eleditor-textEditor-colors">\
+							<div class="Eleditor-textEditor-modulePane"><span></span></div>\
+							<ul>\
+								<li><span style="background-color:#232323;"></span></li>\
+								<li><span style="background-color:#2196F3;"></span></li>\
+								<li><span style="background-color:#795548;"></span></li>\
+								<li><span style="background-color:#00BCD4;"></span></li>\
+								<li><span style="background-color:#4CAF50;"></span></li>\
+								<li><span style="background-color:#E666E5;"></span></li>\
+								<li><span style="background-color:#FF9800;"></span></li>\
+								<li><span style="background-color:#FF5722;"></span></li>\
+								<li><span style="background-color:#ff2a1a;"></span></li>\
+								<li><span style="background-color:#FFEB3B;"></span></li>\
+								<li><span style="background-color:#ffffff;border: 1px solid #ccc;"></span></li>\
+								<li>\
+									<span class="Eleditor-inheritValue" style="background-color:transparent; border: 1px solid #dedede;">\
+									</span>\
+								</li>\
+							</ul>\
+						</div>\
+						<div class="Eleditor-textEditor-fontsizes">\
+							<div class="Eleditor-textEditor-modulePane"><span>字体大小</span></div>\
+							<ul>\
+								<li class="Eleditor-inheritValue">默认</li>\
+								<li>14px</li>\
+								<li>16px</li>\
+								<li>20px</li>\
+								<li>28px</li>\
+								<li>35px</li>\
+							</ul>\
+						</div>\
+						<div class="Eleditor-textEditor-lineheight">\
+							<div class="Eleditor-textEditor-modulePane"><span>行高</span></div>\
+							<ul>\
+								<li class="Eleditor-inheritValue">默认</li>\
+								<li>20px</li>\
+								<li>25px</li>\
+								<li>30px</li>\
+								<li>35px</li>\
+								<li>40px</li>\
+							</ul>\
+						</div>\
+						<div class="Eleditor-textEditor-linedecorations">\
+							<div class="Eleditor-textEditor-modulePane"><span>文本修饰</span></div>\
+							<ul>\
+								<li class="Eleditor-inheritValue">无</li>\
+								<li style="text-decoration: overline">上划线修饰</li>\
+								<li style="text-decoration: line-through">删除线修饰</li>\
+								<li style="text-decoration: underline">下划线修饰</li>\
+							</ul>\
+						</div>\
+						<div class="Eleditor-textEditor-formats">\
+							<div class="Eleditor-textEditor-format"></div>\
+							<div class="Eleditor-textEditor-clean"></div>\
+						</div>\
+						<div class="Eleditor-inputarea">\
+							<input placeholder="请输入超链接" type="text" />\
+							<div placeholder="点击输入内容" class="textarea" contenteditable="true"></div>\
+						</div>\
+						<div class="Eleditor-method">\
+							<button class="Eleditor-commit">提交</button>\
+							<button class="Eleditor-cancel">取消</button>\
+						</div>\
+					</div>\
+					<div class="Eleditor-delete-layer" style="z-index:'+_layerZIndex+'">\
+						<div class="Eleditor-delete-tip">进入批量删除模式，点击段落进行删除</div>\
+						<div class="Eleditor-delete-revoke"></div>\
+						<div class="Eleditor-delete-clear"></div>\
+						<div class="Eleditor-delete-back">返回继续编辑</div>\
+					</div>\
+				</div>';
+		return _html;
+	};
+
+	w[_namespace] = function(){
+
+		console.log('|--Eleditor Initing');
+
+		var _args = arguments[0];
+			_args.upload = _args.upload || {};
+			_args.mounted = _args.mounted || function(){};
+			_args.changer = _args.changer || function(){};
+			_args.toolbars = _args.toolbars || [],
+			// _undolen = isNaN(_args._undolen) ? 10 : _args._undolen;
+			_editorUid = _genEditorUid(),
+			_historys = [],
+			_placeHolder = _args.placeHolder || '<p class="Eleditor-placeholder">点击此处编辑内容</p>',
+			_uploadRole = null;
+
+		if( _args.toolbars.length === 0 ){
+			_args.toolbars = [
+				'insertText',
+				'editText',
+				'insertImage',
+				'insertLink',
+				'insertHr',
+				'delete',
+				'undo',
+				'cancel',
+			];
+		}
+
+		if( _args.el instanceof jQuery ){
+			var _$wrap = _args.el;
+		}else{
+			var _$wrap = $(_args.el);
+			
+			if( _$wrap.length === 0 ){
+				return console.warn('|--Eleditor '+_args.el+'元素不存在，请在DOMContentLoaded后初始化Eleditor');
+			}else if( _$wrap.length != 1 ){
+				var _$wrap = $(_$wrap[0]);
+			}
+
+		}
+
+		if( _$wrap.attr('Eleditor-Inited') === 'true' ){
+			return console.warn('|--Eleditor '+_args.el+'已经绑定了Eleditor');
+		}
+
+		_$wrap.attr({'Eleditor-Inited': 'true', 'Eleditor-Uid': _editorUid});
+
+		_correctHtmlStructure(_$wrap, _placeHolder);
+
+		/*insert editor*/
+		var _lastScrollH = null;
+		var _$window = $(w);
+		var _$scrollWrap = $('html,body');
+		var _$editorWrap = $(_buildEditorModule(_args.toolbars, _editorUid));
+		var _$editorController = _$editorWrap.find('.Eleditor-controller');
+		var _$editorLoadingMask = _$editorWrap.find('.Eleditor-loading');
+		var _$editorTextModule = _$editorWrap.find('.Eleditor-textEditor');
+		var _$editorTextArea = _$editorTextModule.find(".Eleditor-inputarea .textarea");
+		var _$editorUploadImageBtn = _$editorController.find(".Eleditor-insertImage");
+		var _$editorBarUploadImageBtn = _$editorTextModule.find('.Eleditor-textStyle-item-upImg');
+		var _$editorTextLinkArea = _$editorTextModule.find(".Eleditor-inputarea input");
+		var _$editorColorModule = _$editorTextModule.find(".Eleditor-textEditor-colors");
+		var _$editorFontsizeModule = _$editorTextModule.find(".Eleditor-textEditor-fontsizes");
+		var _$editorUndoBtn = _$editorWrap.find(".Eleditor-undo");
+		var _$editorLineheightModule = _$editorTextModule.find(".Eleditor-textEditor-lineheight");
+		var _$editorLinedecorationsModule = _$editorTextModule.find(".Eleditor-textEditor-linedecorations");
+		var _$editorDeleteLayer = _$editorWrap.find(".Eleditor-delete-layer");
+
+		_$wrap.addClass('Eleditor-area');
+		_$wrap.after(_$editorWrap);
+
+		console.log('|--Eleditor Mounted To', _$wrap);
+
+		/*bindEvent*/
+		var _$selected = null,
+			_imageUploader = null;
+
+		var _showEditorControllerLayer = function(_$e){
+			_$selected = _$e;
+			_$e.addClass('Eleditor-active');
+
+			var _calTop = _$e.offset().top + _$e.outerHeight();
+
+			$.each(_$editorController.find('li'), function(i, e){
+				var _$e = $(e),
+					_tgs = _$e.attr('bind-tags');
+				if( _tgs ){
+					_tgs = _tgs.toLocaleLowerCase().split(',');
+					if( _inArray(_$selected[0].tagName.toLocaleLowerCase(), _tgs) ){
+						_$e.show();
+					}else{
+						_$e.hide();
+					}
+				}
+			});
+
+			_$editorController.show();
+			_flushEditorControllerLayerPosi();
+
+			if( typeof _$scrollWrap.animate === 'function' ){
+				_$scrollWrap.stop().animate({scrollTop: (_calTop - 150) + 'px'}, 500);
+			}else{
+				_$scrollWrap.scrollTop((_calTop - 150) + 'px');
+			}
+			
+			_imageUploader && _imageUploader.refresh();
+		};
+
+		var _flushEditorControllerLayerPosi = function(){
+				if( _$selected ){
+					_$editorController.css({ 
+						top: _$selected.offset().top + _$selected.outerHeight(),
+						width: _$wrap.width() - 5
+					});				
+				}
+			},
+			_hideEditorControllerLayer = function(){
+
+				_$wrap.find('.Eleditor-active').removeClass('Eleditor-active');
+				_$editorController.hide();
+				_$selected = null;
+			};
+
+		var _showEditorDeleteLayer = function(){
+
+				_flushEditorDeleteLayerHistoryBtn();
+
+				_$wrap.addClass('Eleditor-deleteMode');
+				_$editorDeleteLayer.show();
+			},
+			_flushEditorDeleteLayerHistoryBtn = function(){
+
+				if( _historys.length > 0 ){
+					_$editorWrap.find('.Eleditor-delete-revoke').removeClass('Eleditor-delete-revoke-disabled')
+				}else{
+					_$editorWrap.find('.Eleditor-delete-revoke').addClass('Eleditor-delete-revoke-disabled')
+				}
+			},
+			_hideEditorDeleteLayer = function(){
+				_$wrap.removeClass('Eleditor-deleteMode');
+				_$editorDeleteLayer.hide();
+			};
+
+		var _showEditorWrapMask = function(){
+				_$editorController.hide();
+				_$editorWrap.addClass('Eleditor-mask');
+				_lastScrollH = _$window.scrollTop();
+				_$scrollWrap.addClass('Eleditor-scrollLocked');
+			},
+			_hideEditorWrapMask = function(){
+				_$editorWrap.removeClass('Eleditor-mask');
+				_$scrollWrap.removeClass('Eleditor-scrollLocked');
+				_$window.scrollTop(_lastScrollH);
+			};
+
+		var _showLoadingMask = function(){
+				_showEditorWrapMask();
+				_$editorLoadingMask.show();
+				_$editorLoadingMask.html('<p>'+arguments[0]+'</p>')
+			},
+			_hideLoadingMask = function(){
+				_hideEditorWrapMask();
+				_$editorLoadingMask.hide();
+			};
+
+		var _appendHistory = function(){
+
+				_historys.push( _$wrap.html() );
+
+				// if( _historys.length > _undolen ){
+				// 	_historys.splice(0, 1)
+				// }
+
+				_flushHistoryBtn();
+				_flushEditorDeleteLayerHistoryBtn();
+				return true;
+			},
+			_revokeEdit = function(){
+
+				if( _historys.length === 0 ){
+					return;
+				}
+
+				_$wrap.html(_historys.pop());
+				_args.changer();
+
+				_flushHistoryBtn();
+				_flushEditorDeleteLayerHistoryBtn();
+				_hideEditorControllerLayer();
+			},
+			_flushHistoryBtn = function(){
+
+				if( _historys.length == 0 ){
+					_$editorUndoBtn.hide();
+				}else{
+					_$editorUndoBtn.show();
+				}
+
+			};
+
+		var _syncRenderTextEditorView = function(){
+			_$editorTextModule.attr('role', 'edit').show();
+			_$editorTextArea.html( _$selected.hasClass('Eleditor-placeholder') ? '' : _$selected.html() );
+			_$editorTextArea.attr('style', _$selected.attr('style'));
+			if( _$selected.css('font-weight') == 'bold' ){
+				_$editorTextModule.find('.Eleditor-textStyle-bold').addClass('Eleditor-active');
+			}
+
+			if( _inArray(_$selected.css('text-decoration'), ['overline', 'line-through', 'underline']) ){
+				_$editorTextModule.find('.Eleditor-textStyle-linedecoration').addClass('Eleditor-active');
+			}			
+			if( _$selected[0].tagName == 'A' ){
+				_$editorTextModule.attr('type', 'link');
+				_$editorTextLinkArea.val(_$selected.attr('href'));
+			}else{
+				_$editorTextModule.attr('type', 'word');
+			}
+
+			var _selectAlign = _$selected.css('text-align');
+			if( _inArray(_selectAlign, ['left', 'center', 'right']) ){
+				_$editorTextModule.find('.Eleditor-textStyle-align[align='+_selectAlign+']').addClass('Eleditor-active');
+			}else{
+				_$editorTextModule.find('.Eleditor-textStyle-align').removeClass('Eleditor-active');
+			}
+			_$editorTextModule.find('.Eleditor-textStyle-color span').css('background-color', _$selected.css('color'));
+		};
+
+		if( typeof WebUploader != 'undefined' && typeof _args.uploader != 'function' ){
+
+			//controller
+			_imageUploader = WebUploader.create({
+							auto: true, 
+							server: _args.upload.server || '/upload',
+						    pick: _$editorUploadImageBtn, 
+						    resize: false,
+						    headers: _args.upload.headers || {},
+						    formData: _args.upload.formData || {},
+						    duplicate: true,
+						    fileSingleSizeLimit: _args.upload.fileSizeLimit ? _args.upload.fileSizeLimit*1024*1024 : undefined,
+						    accept: Object.assign({
+						    				title: 'Images', 
+						    				extensions: 'gif,jpg,jpeg,bmp,png,webp',
+											mimeTypes: 'image/gif,image/jpg,image/jpeg,image/bmp,image/png,image/webp'
+										}, _args.upload.accept || {}),
+						    fileVal: _args.upload.formName,
+						});
+			_imageUploader.on( 'uploadStart', function( _file, _percentage ) {
+			    _showLoadingMask('上传图片中<span id="uploadProgress">1</span>%');
+			});		
+			_imageUploader.on( 'uploadProgress', function( _file, _percentage ) {
+			    $('#uploadProgress').html( parseFloat((_percentage * 100).toFixed(2)) );
+			});
+			// _uploadRole
+			_imageUploader.on( 'error', function() {
+			    if( arguments[0]=="Q_TYPE_DENIED" ) w.alert("请上传图片格式文件");
+		        if( arguments[0]=="F_EXCEED_SIZE" ) w.alert("文件大小不能超过"+(arguments[1] / 1048576)+"M");
+			});
+			_imageUploader.on( 'uploadComplete', function() { _hideLoadingMask(); });			
+			_imageUploader.on( 'uploadSuccess', function( _file, _call ) {
+
+				var _hasStyleBarBtn = $('#rt_'+_file.source.ruid).parents('.Eleditor-textStyle-item-upImg').length > 0;
+
+			    if( _call.status == 1 ){
+
+					if( _hasStyleBarBtn ){
+						_$editorTextArea.append('<img src="'+_call.url+'">');
+					}else{
+				    	_appendHistory();
+
+						_$selected.after( $('<img src="'+_call.url+'">') );
+
+						if( _$selected.hasClass('Eleditor-placeholder') ){
+							_$selected.remove();
+						}
+					}
+					_args.changer();
+			    }else{
+			    	w.alert('上传失败：['+_call.msg+']');
+			    }
+			    if( !_hasStyleBarBtn ){
+			    	_hideEditorControllerLayer();
+			    }
+			});
+
+			_imageUploader.addButton({ id: _$editorBarUploadImageBtn });	
+			_$editorBarUploadImageBtn.addClass('Eleditor-webUploader-btn');
+
+		}else if( typeof _args.uploader == 'function' ){
+
+			var _uploaderHanlder = function(){
+
+				var _hasStyleBarBtn = $(this).hasClass('Eleditor-textStyle-item-upImg');
+
+				try{
+					_args.uploader.call(this).then(function(_url){
+
+						var _urls = typeof _url === 'object' && _url.length ? _url : [_url]
+
+						if( _hasStyleBarBtn ){
+
+							for (var _uindex = 0; _uindex < _urls.length; _uindex++) {
+								_$editorTextArea.append('<img src="'+_urls[_uindex]+'">');
+							}
+						}else{
+					    	_appendHistory();
+
+							for (var _uindex = 0; _uindex < _urls.length; _uindex++) {
+								_$selected.after( $('<img src="'+_urls[_uindex]+'">') );
+							}
+
+							if( _$selected.hasClass('Eleditor-placeholder') ){
+								_$selected.remove();
+							}
+							_hideEditorControllerLayer();
+						}
+						_args.changer();
+					}, function(_err){
+						w.alert('上传失败：['+_err+']');
+					});
+				}catch(_e){
+					console.warn(_e);
+					console.warn('|--Eleditor 请检查uploader函数返回是否是标准Promise对象！');
+				}
+
+			}
+
+			_$editorUploadImageBtn.click(_uploaderHanlder);
+			_$editorBarUploadImageBtn.click(_uploaderHanlder);
+
+		}else{
+			_$editorBarUploadImageBtn.addClass('Eleditor-textStyle-item-upImg-disabled')
+		}
+
+		var _editorModuleEvents = {
+			insertText: function(){
+				_showEditorWrapMask();
+				_$editorTextModule.attr({'role': 'insert', 'type': 'word'}).show();
+			},
+			insertLink: function(){
+				alert(444)
+				_showEditorWrapMask();
+				_$editorTextModule.attr({'role': 'insert', 'type': 'link'}).show();
+			},
+			insertImage: function(){
+				if( typeof WebUploader === 'undefined' && typeof _args.uploader != 'function' ){
+					window.alert('上传参数未定义.');
+				}
+			},
+			insertHr: function(){
+
+				_appendHistory();
+
+				var _$hr = $('<div class="horizontal-line" style="padding: 10px 0;border-bottom: 1px solid #aaa;margin-bottom: 20px;"></div>');
+					_$selected.after(_$hr);
+					_args.changer();
+				_hideEditorControllerLayer();
+			},
+			editText: function(){
+				if( _inArray(_$selected[0].tagName, _notctname) ){
+					return this.insertText();
+				}
+				_showEditorWrapMask();
+				_syncRenderTextEditorView();
+			},
+			"delete": function(){
+
+				if( _$wrap.find('*').length == 1 ){
+					_appendHistory();
+					_args.changer();
+					_$selected.remove();
+				}else{
+					_showEditorDeleteLayer();
+				}
+				_hideEditorControllerLayer();
+				_correctHtmlStructure(_$wrap, _placeHolder);
+			},
+			undo: function(){
+				_revokeEdit();
+			},
+			cancel: function(){
+				_hideEditorControllerLayer();
+			}
+		};
+
+		for (var i = 0; i < _args.toolbars.length; i++) {
+			if( typeof _args.toolbars[i] === 'object' ){
+				_editorModuleEvents[_args.toolbars[i].id] = _args.toolbars[i].handle;
+			}
+		};
+
+		/*text area click*/
+		_$window.on('resize', function(){
+			_flushEditorControllerLayerPosi();
+		});
+
+		_$editorController.on('click', 'ul li', function() {
+			var _$this = $(this),
+				_event = _$this.attr('event');
+			if( typeof _editorModuleEvents[_event] === 'function' ){
+				if( typeof _toolnames[_event] != 'undefined' ){
+					_editorModuleEvents[_event]();
+				}else{
+					_editorModuleEvents[_event](_$selected, _$this) !== false && _editorModuleEvents.cancel();
+				}
+			}
+		});
+
+		_$editorWrap.on('click', '.Eleditor-delete-revoke', function() {
+			_revokeEdit();
+		});
+		_$editorDeleteLayer.on('click', '.Eleditor-delete-clear', function() {
+
+			if( !confirm('确定清空内容吗？') ){
+				return;
+			}
+
+			var _$cloneNode = _$wrap.clone();
+				_$cloneNode.find('.Eleditor-placeholder').remove();
+
+			if( _formatInnerText(_$cloneNode.text()) != '' ){
+				_appendHistory();
+				_$wrap.html('');
+				_args.changer();
+				_correctHtmlStructure(_$wrap, _placeHolder);
+			}
+		});
+		_$editorDeleteLayer.on('click', '.Eleditor-delete-back', function() {
+			_hideEditorDeleteLayer();
+		});		
+
+		/*textEditor*/
+		_$editorTextModule.on('click', '.Eleditor-textStyle-bold', function() {
+			_$editorTextArea.css("font-weight", $(this).hasClass("Eleditor-active") ? "normal" : "bold");
+            $(this).toggleClass("Eleditor-active");
+		});
+		_$editorTextModule.on('click', '.Eleditor-textStyle-linedecoration', function() {
+			_$editorLinedecorationsModule.show();
+			$(this).addClass('Eleditor-active');
+		});		
+		_$editorTextModule.on('click', '.Eleditor-textStyle-color,.Eleditor-textStyle-bgColor', function() {
+			var _$this = $(this);
+			var _role = _$this.hasClass('Eleditor-textStyle-bgColor') ? 'bgcolor' : 'color';
+			_$editorColorModule.find('.Eleditor-textEditor-modulePane span').html(_role == 'bgcolor' ? '文字背景颜色' : '文字颜色');
+			_$editorColorModule.attr('role', _role).show();
+			$(this).addClass('Eleditor-active');
+		});
+		_$editorTextModule.on('click', '.Eleditor-textStyle-fontSize', function() {
+			_$editorFontsizeModule.show();
+			$(this).addClass('Eleditor-active');
+		});	
+		_$editorTextModule.on('click', '.Eleditor-textStyle-lineHeight', function() {
+			_$editorLineheightModule.show();
+			$(this).addClass('Eleditor-active');
+		});		
+		_$editorLinedecorationsModule.on('click', 'ul li', function() {
+			if( !$(this).hasClass('Eleditor-inheritValue') ){
+				_$editorTextArea.css("text-decoration", $(this).css('text-decoration'));
+			}else{
+				_$editorTextArea.css("text-decoration", 'inherit');
+				_$editorTextModule.find('.Eleditor-textStyle-linedecoration').removeClass('Eleditor-active');
+			}
+			_$editorLinedecorationsModule.hide();
+		});	
+		_$editorLineheightModule.on('click', 'ul li', function() {
+			if( !$(this).hasClass('Eleditor-inheritValue') ){
+				_$editorTextArea.css("line-height", $(this).html());
+			}else{
+				_$editorTextArea.css("line-height", 'inherit');
+				_$editorTextModule.find('.Eleditor-textStyle-lineHeight').removeClass('Eleditor-active');
+			}
+			_$editorLineheightModule.hide();
+		});						
+		_$editorFontsizeModule.on('click', 'ul li', function() {
+			if( !$(this).hasClass('Eleditor-inheritValue') ){
+				_$editorTextArea.css("font-size", $(this).html());
+			}else{
+				_$editorTextArea.css("font-size", 'inherit');
+				_$editorTextModule.find('.Eleditor-textStyle-fontSize').removeClass('Eleditor-active');
+			}
+			_$editorFontsizeModule.hide();
+		});
+
+		_$editorTextModule.on('click', ".Eleditor-textStyle-align", function() {
+			var _align = $(this).attr('align');
+			_$editorTextArea.css({"text-align": _align, "display": 'block'});
+			_$editorTextModule.find(".Eleditor-textStyle-align.Eleditor-active").removeClass('Eleditor-active');
+			$(this).addClass('Eleditor-active');
+		});	
+
+		_$editorTextModule.on('click', ".Eleditor-textEditor-format", function() {
+			var _$cloneTextArea = _$editorTextArea,
+				_removeAttrs = 'style width height border bgcolor align color';
+
+			_$cloneTextArea.removeAttr(_removeAttrs);
+			$.each(_$cloneTextArea.find('*'), function(_i, _e) {
+				var _$eachElm = _$cloneTextArea.find(_e);
+				if( _inArray(_e.tagName.toLocaleLowerCase(), ['script', 'style']) ){
+					_$eachElm.remove();
+				}else{
+					_$eachElm.removeAttr(_removeAttrs);
+				}
+			});
+
+			_$editorTextArea.html(_$cloneTextArea.html());
+			_$editorTextModule.find('.Eleditor-active').removeClass('Eleditor-active');
+		});
+
+		_$editorTextModule.on('click', ".Eleditor-textEditor-clean", function() {
+			confirm('确定清空内容（不可恢复）？') && _$editorTextArea.html("");
+		});
+
+		_$editorTextModule.on('click', ".Eleditor-cancel,.Eleditor-commit", function() {
+
+			arguments[0].preventDefault();
+
+			if( $(this).hasClass('Eleditor-commit') ){
+				var _style = _$editorTextArea.attr('style') || '';
+				var _content = _$editorTextArea.html();
+				var _editAct = _$editorTextModule.attr('role') == 'edit';
+				var _hasPlaceHolder = _$selected.hasClass('Eleditor-placeholder');
+
+				if( !_content ){
+					return alert('请输入内容文字');
+				}
+
+				_appendHistory();
+
+				if( _editAct || (_hasPlaceHolder && _$editorTextModule.attr('type') != 'link') ){
+					if( _$editorTextModule.attr('type') == 'link' ){
+						_$selected.attr('href', _$editorTextLinkArea.val());
+					}
+					_$selected.attr('style', _style).removeClass('Eleditor-placeholder').html( _content );
+				}else{
+
+					var _buildWordHtml = '';
+					if( _$editorTextModule.attr('type') == 'link' ){
+						var _link = _$editorTextLinkArea.val();
+						_buildWordHtml = '<a style="'+_style+'" href="'+_link+'">'+_content+'</a>';
+					}else{
+						_buildWordHtml = '<p style="'+_style+'">'+_content+"</p>";
+					}
+					_$selected.after( $(_buildWordHtml) );
+
+					if( _hasPlaceHolder ){
+						_$selected.remove();
+					}
+				}
+				_args.changer();
+				_flushEditorControllerLayerPosi();
+			}
+
+			_$editorTextModule.find('.Eleditor-active').removeClass('Eleditor-active');
+			_$editorTextModule.find('.Eleditor-textStyle-color span').removeAttr('style');
+			_$editorTextArea.removeAttr('style').html('');
+			_$editorTextLinkArea.val('');
+			_hideEditorWrapMask();
+			_$editorTextModule.hide();
+			_hideEditorControllerLayer();
+
+		});	
+			
+		_$editorColorModule.on('click', 'ul li span', function() {
+			var _color = $(this).css('background-color');
+			if( _$editorColorModule.attr('role') == 'color' ){
+				if( !$(this).hasClass('Eleditor-inheritValue') ){
+					_$editorTextArea.css("color", _color);
+					_$editorTextModule.find('.Eleditor-textStyle-color span').css("background-color", _color);
+				}else{
+					_$editorTextArea.css("color", 'inherit');
+					_$editorTextModule.find('.Eleditor-textStyle-color').removeClass('Eleditor-active').find('span').removeAttr('style');
+				}
+			}else{
+				if( !$(this).hasClass('Eleditor-inheritValue') ){
+					_$editorTextArea.css("background-color", _color);
+				}else{
+					_$editorTextArea.css("background-color", 'inherit');
+					_$editorTextModule.find('.Eleditor-textStyle-bgColor').removeClass('Eleditor-active');
+				}
+			}
+			_$editorColorModule.hide();
+		});
+
+		/*controller*/
+        _$wrap.on('dblclick', '*', function(_e) {
+
+			var _$this = $(this);
+
+			if( _$wrap.hasClass('Eleditor-deleteMode') ){
+
+				if( !_$this.hasClass('Eleditor-placeholder') ){
+
+					_appendHistory();
+
+					if( typeof _$this.fadeOut === 'function' ){
+						_$this.fadeOut('fast', function(){
+							_$this.remove();
+							_correctHtmlStructure(_$wrap, _placeHolder);
+						});
+					}else{
+						_$this.remove();
+						_correctHtmlStructure(_$wrap, _placeHolder);
+					}
+					_args.changer();
+				}
+
+			}else if( !_$this.hasClass('Eleditor-active') ){
+            	_hideEditorControllerLayer();
+            	_hideEditorDeleteLayer();
+            	_showEditorControllerLayer(_$this);
+			}
+
+            return _e.preventDefault() == 0;
+        });
+
+        /*call*/
+        _args.mounted();
+
+		return {
+			clear: function(){
+				_args.changer();
+				_$wrap.html('');
+				_correctHtmlStructure(_$wrap, _placeHolder);
+			},
+			revoke: function(){
+				_revokeEdit();
+			},
+			append: function(){
+
+				_hideEditorControllerLayer();
+
+				var _object = arguments[0];
+				
+				if( !_object ){
+					return;
+				}
+
+				var _$content = $(_object);
+
+				if( typeof _object == 'string' && _$content.length == 0 ){
+					_$content = $('<p>'+_object+'</p>');
+				}
+
+				_$wrap.find('.Eleditor-placeholder').remove();
+				_appendHistory();
+
+				return _$wrap.append(_$content);
+			},
+			trigger: function(){
+
+				var _event = arguments[0];
+
+				if( _event == 'insertText' ){
+					_$selected = _$wrap.find('>:last');
+					_editorModuleEvents.insertText();
+				}else if( _event == 'insertLink' ){
+					_$selected = _$wrap.find('>:last');
+					_editorModuleEvents.insertLink();
+				}
+			},
+			saveState: function(){
+				return _appendHistory();
+			},
+			getEditNode: function(){
+				return _$selected;
+			},
+			getContent: function(){
+				var _$cloneNode = _$wrap.clone();
+					_$cloneNode.find('.Eleditor-placeholder').remove();
+					_$cloneNode.find('.Eleditor-active').removeClass('Eleditor-active');
+				return _$cloneNode.html();
+			},
+			getContentText: function(){
+				var _$cloneNode = _$wrap.clone();
+					_$cloneNode.find('.Eleditor-placeholder').remove();
+
+				return _formatInnerText(_$cloneNode.text());
+			},
+			hideEditorControllerLayer: _hideEditorControllerLayer,
+			destory: function(){
+				_$wrap.removeAttr('Eleditor-Inited Eleditor-Uid');
+				_$wrap.removeClass('Eleditor-area');
+				_$wrap.find('.Eleditor-placeholder').remove()
+				_$wrap.off().find('.Eleditor-active').removeClass('Eleditor-active');
+				_$editorWrap.find('*').off();
+				_$editorWrap.remove();
+				console.log('|--Eleditor '+_editorUid+' destoryed');
+			}
+
+		}
+	}
+
+})(window);
diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
index 3993d4d92..55f4482a8 100644
--- a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
+++ b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
@@ -402,56 +402,56 @@
         </div>
     </div>
 </div>
-<div class="modal inmodal" id="myModal5" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog" style="width: 800px;">
-        <div class="modal-content animated fadeIn">
-            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5; padding: 15px 15px;">
-                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
-                        class="sr-only">Close</span>
-                </button>
-                <h5 class="modal-title" style="text-align: left; font-size: 23px;">创建文章</h5>
-            </div>
-            <div class="modal-body" style="background: #ffffff;">
-                <form class="form-horizontal" id="form-picAdverts-add5">
-                    <div class="col-md-12" style="margin-top: -15px;">
-                        <div class="form-group">
-                            <div id="div1">
-                                <div class="toolbar"></div>
-                                <div class="title">
-                                    <div contenteditable="true" class="head" placeholder="请在这里输入标题"></div>
-                                    <div contenteditable="true" class="author" placeholder="请输入作者"></div>
-                                    <div class="editorcontent" contenteditable="true">
-                                        <div></div>
-                                    </div>
-                                </div>
-                            </div>
+<!--<div class="modal inmodal" id="myModal5" tabindex="-1" role="dialog" aria-hidden="true">-->
+<!--    <div class="modal-dialog" style="width: 800px;">-->
+<!--        <div class="modal-content animated fadeIn">-->
+<!--            <div class="modal-header" style="border-bottom: 0px solid #e5e5e5; padding: 15px 15px;">-->
+<!--                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span-->
+<!--                        class="sr-only">Close</span>-->
+<!--                </button>-->
+<!--                <h5 class="modal-title" style="text-align: left; font-size: 23px;">创建文章</h5>-->
+<!--            </div>-->
+<!--            <div class="modal-body" style="background: #ffffff;">-->
+<!--                <form class="form-horizontal" id="form-picAdverts-add5">-->
+<!--                    <div class="col-md-12" style="margin-top: -15px;">-->
+<!--                        <div class="form-group">-->
+<!--                            <div id="div1">-->
+<!--                                <div class="toolbar"></div>-->
+<!--                                <div class="title">-->
+<!--                                    <div contenteditable="true" class="head" placeholder="请在这里输入标题"></div>-->
+<!--                                    <div contenteditable="true" class="author" placeholder="请输入作者"></div>-->
+<!--                                    <div class="editorcontent" contenteditable="true">-->
+<!--                                        <div></div>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
 
-                            <p class="abstract" style="margin-left: 15px;">封面摘要：</p>
-                            <p class="abstract" style="margin-left: 135px;">分享描述：</p>
-                            <div>
-                                <div class="cover_abstract">
-                                    <div class="imgload">
-                                        <input type="file" class="fileImg"
-                                               accept="image/png,image/gif，image/jpg, image/jpeg"
-                                               onchange="uploadOss(this)">
-                                        <img src="" class="avatar" style="display:none"/>
-                                        <i class="addIcon"></i>
-                                    </div>
-                                    <textarea autocomplete="off" placeholder="请输入内容" class="el-textarea__inner"
-                                              style="min-height: 33px;height: 90px; width: 70%"></textarea>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">
-                <button type="button" class="btn btn-white" data-dismiss="modal" th:id="modalColse">关闭</button>
-                <button type="button" class="btn btn-primary" th:onclick="createArticleL()">创建文章</button>
-            </div>
-        </div>
-    </div>
-</div>
+<!--                            <p class="abstract" style="margin-left: 15px;">封面摘要：</p>-->
+<!--                            <p class="abstract" style="margin-left: 135px;">分享描述：</p>-->
+<!--                            <div>-->
+<!--                                <div class="cover_abstract">-->
+<!--                                    <div class="imgload">-->
+<!--                                        <input type="file" class="fileImg"-->
+<!--                                               accept="image/png,image/gif，image/jpg, image/jpeg"-->
+<!--                                               onchange="uploadOss(this)">-->
+<!--                                        <img src="" class="avatar" style="display:none"/>-->
+<!--                                        <i class="addIcon"></i>-->
+<!--                                    </div>-->
+<!--                                    <textarea autocomplete="off" placeholder="请输入内容" class="el-textarea__inner"-->
+<!--                                              style="min-height: 33px;height: 90px; width: 70%"></textarea>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                </form>-->
+<!--            </div>-->
+<!--            <div class="modal-footer" style="border-top: 0px solid #e5e5e5;">-->
+<!--                <button type="button" class="btn btn-white" data-dismiss="modal" th:id="modalColse">关闭</button>-->
+<!--                <button type="button" class="btn btn-primary" th:onclick="createArticleL()">创建文章</button>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</div>-->
 <th:block th:include="include :: footer"/>
 <th:block th:include="include :: layout-latest-js"/>
 <th:block th:include="include :: ztree-js"/>
@@ -739,17 +739,18 @@
     }
 
     function createArticle() {
-        $('.head').html('');
-        $('.author').html('');
-        $('.el-textarea__inner').val('');
-        $('.editorcontent').html('<div></div>');
-
-
-        filePath = '';
-        $(".avatar").attr('src', '')
-        $(".avatar").css('display', 'none');
-        $(".addIcon").css('display', 'block');
-        $('#myModal5').modal('show');
+        // $('.head').html('');
+        // $('.author').html('');
+        // $('.el-textarea__inner').val('');
+        // $('.editorcontent').html('<div></div>');
+        //
+        //
+        // filePath = '';
+        // $(".avatar").attr('src', '')
+        // $(".avatar").css('display', 'none');
+        // $(".addIcon").css('display', 'block');
+        // $('#myModal5').modal('show');
+        $.modal.parentTab('文章创建', prefix + "/createPage");
     }
 
     function createArticleL() {
@@ -778,21 +779,6 @@
             '<div id="img-content" class="rich_media_wrp"><div id="activity-name">' + title + '</div>'
             + '<div id="meta_content">' + author + '</div><div id="bodycontent">' + body + '</div></div></div></div></div>';
 
-        body = body + '<style>table{border-top: 1px solid #ccc;border-left: 1px solid #ccc;}' +
-            'table td, table th{border-bottom: 1px solid #ccc; border-right: 1px solid #ccc; padding: 3px 5px;}' +
-            'table th {border-bottom: 2px solid #ccc; text-align: center;}' +
-            'blockquote{display: block;border-left: 8px solid #d0e5f2;padding: 5px 10px;margin: 10px 0;' +
-            'line-height: 1.4;font-size: 100%;background-color: #f1f1f1;}' +
-            'code {display: inline-block;*display: inline;*zoom: 1;background-color: #f1f1f1;' +
-            'border-radius: 3px;padding: 3px 5px;margin: 0 3px;}' +
-            'pre code {display: block;}' +
-            'ul, ol {margin: 10px 0 10px 20px;}' +
-            '#activity-name,#meta_content{display: block;width: 100%;font-size: 20px;color: #000;' +
-            'min-height: 30px;margin-bottom: 5px;outline: none;resize: none;border: none;}' +
-            '#activity-name{font-size: 24px;}' +
-            '#bodycontent{font-size: 18px;line-height: 20px;padding-top: 10px;}' +
-            '#bodycontent div{min-height: 27.43px;}</style>';
-
         $('#myModal5').modal('hide');
         $.modal.loading("创建文章中请等待。。。");
         $.ajax({
diff --git a/ruoyi-content/src/main/resources/templates/content/article/createArticle.html b/ruoyi-content/src/main/resources/templates/content/article/createArticle.html
new file mode 100644
index 000000000..2cd6688d8
--- /dev/null
+++ b/ruoyi-content/src/main/resources/templates/content/article/createArticle.html
@@ -0,0 +1,258 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('文章创建')"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no"/>
+    <meta name="format-detection" content="telephone=no,email=no">
+    <link th:href="@{/css/fileinput.min.css}" rel="stylesheet"/>
+    <link th:href="@{/css/createArticleBase.css}" rel="stylesheet"/>
+    <link th:href="@{/css/Eleditor.css}" rel="stylesheet"/>
+    <link th:href="@{/css/createArticleStyle.css}" rel="stylesheet"/>
+</head>
+<style>
+
+    .abstract {
+        float: left;
+    }
+
+</style>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="textarea">
+            <div id="div1">
+                <div class="toolbar"></div>
+                <div class="title">
+                    <div contenteditable="true" class="head" placeholder="请在这里输入标题"></div>
+                    <div contenteditable="true" class="author" placeholder="请输入作者"></div>
+                    <div class="editorcontent" contenteditable="true" id="editorcontent">
+                        <div></div>
+                    </div>
+                </div>
+            </div>
+            <p class="abstract" style="margin-left: 15px;">封面摘要：</p>
+            <p class="abstract" style="margin-left: 200px;">分享描述：</p>
+            <div class="cover_abstract">
+                <div class="imgload">
+                    <input type="file" class="fileImg" accept="image/png,image/gif，image/jpg, image/jpeg"
+                           onchange="uploadOss(this)">
+                    <img src="" class="avatar" style="display:none"/>
+                    <i class="addIcon"></i>
+                </div>
+                <textarea autocomplete="off" placeholder="请输入内容" class="el-textarea__inner"
+                          style="min-height: 33px;height: 90px; width: 72%"></textarea>
+            </div>
+        </div>
+        <div style="border-top: 0px solid #e5e5e5; text-align: center; margin-top: 15px;">
+            <button type="button" class="btn btn-primary" th:onclick="createArticleL()">创建文章</button>
+        </div>
+        <form style="display: none;" class="lables">
+            <p>标签：</p>
+            <div class="lables_box">
+                <label><input type="radio" name="1" value="旅游1" checked="checked">旅游1</label>
+                <label><input type="radio" name="1" value="美食1" checked="checked">美食1</label>
+                <label><input type="radio" name="1" value="旅游2" checked="checked">旅游2</label>
+                <label><input type="radio" name="1" value="美食2" checked="checked">美食2</label>
+
+            </div>
+            <button id="sures" type="button">确定</button>
+        </form>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:src="@{/js/fileinput.min.js}"></script>
+<script th:src="@{/js/fileinput_locale_zh.js}"></script>
+<script th:src="@{/js/wangEditor.js}"></script>
+<script th:src="@{/js/Eleditor.min.js}"></script>
+<script th:inline="javascript">
+
+    let path = ctx;
+    let prefix = ctx + "article";
+
+    let filePath;
+
+    // 富文本的创建
+    const E = window.wangEditor;
+    const editor = new E(".toolbar", ".editorcontent")
+
+    editor.config.height = 550
+
+    editor.config.onchange = function (newHtml) {
+        console.log('change 之后最新的 html', newHtml)
+        console.log($('.editorcontent').html())
+    }
+
+    editor.create();
+
+    /*实例化一个编辑器*/
+    var artEditor = new Eleditor({
+        el: '#editorcontent',
+        toolbars: [
+            {
+                id: 'insertLable',
+                name: '插入标签',
+                handle: function (select, controll) { //回调返回选择的dom对象和控制按钮对象
+                    artEditor.saveState();
+                    $(".lables").show();
+                    $("#sures").click(function () {
+                        artEditor.getEditNode().attr('data_sss', $("input[name='1']:checked").val()).attr('class', 'seldiv');
+                        let arr = [];
+                        if (artEditor.getEditNode().find('.label').length > 0) {
+                            for (var i = 0; i < artEditor.getEditNode().find('.label').length; i++) {
+                                arr.push(artEditor.getEditNode().find('.label')[i].innerText.replace(/\s/g, ''))
+                            }
+                            if (arr.indexOf($("input[name='1']:checked").val()) === -1) {
+                                artEditor.getEditNode().prepend(`<div class="label" contenteditable="false">
+                  ${$("input[name='1']:checked").val()}&nbsp;</div>`);
+                            }
+                        } else {
+                            artEditor.getEditNode().prepend(`<div class="label" contenteditable="false">${$("input[name='1']:checked").val()}&nbsp;</div>`);
+                        }
+                        artEditor.hideEditorControllerLayer();
+                        artEditor.saveState();
+                        $(".lables").hide();
+                    })
+                    return false;
+                }
+            },
+            {
+                id: 'cancel',
+                name: '取消',
+                handle: function (select, controll) { //回调返回选择的dom对象和控制按钮对象
+                    artEditor.saveState();
+                    $(".lables").hide();
+                    artEditor.hideEditorControllerLayer();
+                    return false;
+                }
+            },
+            {
+                id: 'undo',
+                name: '撤销',
+                handle: function (select, controll) { //回调返回选择的dom对象和控制按钮对象
+                    artEditor.saveState();
+                    artEditor.getEditNode().find('.label').remove();
+                    $(".lables").hide();
+                    artEditor.hideEditorControllerLayer();
+                    return false;
+                }
+            },
+        ]
+    });
+
+    $('.w-e-toolbar').css('z-index', '900');
+    $('.w-e-text-container').css('z-index', '901');
+
+    $.ajax({
+        type: "post",
+        url: path + 'label/queryLabel',
+        data: {},
+        async: false,
+        success: function (data) {
+            if (data.result) {
+                let obj = data.object.labelList;
+                $(".lables_box").html('');
+                for (let i = 0; i < obj.length; i++) {
+                    $(".lables_box").append(
+                        '<label><input type="radio" name="1" label-id="' + obj[i].labelId + '" value="' + obj[i].labelName + '" >' + obj[i].labelName + '</label>');
+
+                }
+            } else {
+                $.modal.alertError("网络异常，请稍后再试！");
+            }
+        }
+    });
+
+    function uploadOss(obj) {
+        $.modal.loading("上传中。。。");
+        let formData = new FormData();
+        formData.append('file', obj.files[0]);
+        $.ajax({
+            type: "post",
+            url: '/oss',
+            data: formData,
+            processData: false,//不需要对数据进行处理
+            contentType: false,
+            cache: false,
+            dataType: "json",
+            success: function (data) {
+                $(".avatar").attr("src", data.object);
+                filePath = data.object;
+                $(".avatar").css('display', 'block');
+                $(".addIcon").css('display', 'none');
+                $.modal.closeLoading();
+            },
+            error: function () {
+                $.modal.closeLoading();
+            }
+        });
+    }
+
+    function createArticleL() {
+        let title = $('.head').text();
+        let author = $('.author').text();
+        let body = $('.editorcontent').html();
+        if (title == '') {
+            $.modal.alertWarning("请输入标题");
+            return;
+        }
+        if (author == '') {
+            $.modal.alertWarning("请输入作者");
+            return;
+        }
+        if (body == '') {
+            $.modal.alertWarning("请输入文章内容");
+            return;
+        }
+        if (filePath == '') {
+            $.modal.alertWarning("请上传分享图片");
+            return;
+        }
+
+        body = '<div id="js_article" class="rich_media"><div class="rich_media_inner">' +
+            '<div id="page-content" class="rich_media_area_primary">' +
+            '<div id="img-content" class="rich_media_wrp"><div id="activity-name">' + title + '</div>'
+            + '<div id="meta_content">' + author + '</div><div id="bodycontent">' + body + '</div></div></div></div></div>';
+
+        body = body.replace('contenteditable="true"', '');
+
+        $('#myModal5').modal('hide');
+        $.modal.loading("创建文章中请等待。。。");
+        $.ajax({
+            url: path + "article/create",
+            data: {
+                'author': "",
+                'createUser': "",
+                'ids': "",
+                'isAuthorization': "0",
+                'isReserve': "0",
+                'automaticName': "",
+                'introduction': "",
+                'labelIds': "",
+                'isJoinActive': "0",
+                'articleName': title,
+                'shareImgUrl': filePath,
+                'shareDes': $('.el-textarea__inner').text(),
+                'articleContent': body
+            },
+            type: "post",
+            success: function (data) {
+                $.modal.closeLoading();
+                if (data.result) {
+                    $.modal.confirm("创建成功！是否去文库管理页面查看新增文章？", function () {
+                        $.modal.parentTab('文库管理', prefix + "/manage?v=" + new Date().getTime());
+                    });
+                } else {
+                    $.modal.alertError(data.info)
+                }
+            },
+            error: function () {
+                $.modal.closeLoading();
+            }
+        });
+
+    }
+
+</script>
+</body>
+</html>
\ No newline at end of file

From e8a9bfbe858cab510620ec61de972252097044f0 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Wed, 21 Apr 2021 17:18:09 +0800
Subject: [PATCH 27/30] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/framework/config/ShiroConfig.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
index 061fd4aaa..7dfa624fa 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java
@@ -270,6 +270,7 @@ public class ShiroConfig
         LinkedHashMap<String, String> filterChainDefinitionMap = new LinkedHashMap<>();
         // 对静态资源设置匿名访问
         filterChainDefinitionMap.put("/article/updateArticle", "anon");
+        filterChainDefinitionMap.put("/label/queryLabel", "anon");
         filterChainDefinitionMap.put("/favicon.ico**", "anon");
         filterChainDefinitionMap.put("/ruoyi.png**", "anon");
         filterChainDefinitionMap.put("/css/**", "anon");

From 84e09d006ab0670f7325f55f8b2eabb370235498 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Thu, 22 Apr 2021 10:37:44 +0800
Subject: [PATCH 28/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/freemarker/create.flt    | 152 +++++++++++++++
 .../main/resources/static/freemarker/edit.flt | 182 ++++++++++++++++++
 .../main/resources/static/freemarker/view.flt |  41 ++++
 3 files changed, 375 insertions(+)
 create mode 100644 ruoyi-content/src/main/resources/static/freemarker/create.flt
 create mode 100644 ruoyi-content/src/main/resources/static/freemarker/edit.flt
 create mode 100644 ruoyi-content/src/main/resources/static/freemarker/view.flt

diff --git a/ruoyi-content/src/main/resources/static/freemarker/create.flt b/ruoyi-content/src/main/resources/static/freemarker/create.flt
new file mode 100644
index 000000000..783a27bd2
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/freemarker/create.flt
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>文章编辑</title>
+    <base href="../../../../ms/" />
+    <link rel="stylesheet" href="css/style.css">
+   
+	 <script src="js/common.js"></script>
+     <script src="js/common.1.js"></script>
+      <link rel="stylesheet" href="css/base.css">
+     <style type="text/css">
+			.lables {
+			    height: 200px;width: 200px;border: 1px solid #ccc;position: fixed;top: 50%;left: 50%;margin-top: -100px;margin-left: -100px;background: white;z-index: 555;
+			}
+			table {
+			    border-top: 1px solid #ccc;border-left: 1px solid #ccc;
+			}
+            table td, table th {
+                border-bottom: 1px solid #ccc; border-right: 1px solid #ccc; padding: 3px 5px;
+            }
+            table th {
+                border-bottom: 2px solid #ccc; text-align: center;
+            }
+            blockquote {
+                display: block;border-left: 8px solid #d0e5f2;padding: 5px 10px;margin: 10px 0;
+                line-height: 1.4;font-size: 100%;background-color: #f1f1f1;
+            }
+            code {
+                display: inline-block;*display: inline;*zoom: 1;background-color: #f1f1f1;
+                border-radius: 3px;padding: 3px 5px;margin: 0 3px;
+            }
+            pre code {
+                display: block;
+            }
+            ul, ol {
+                margin: 10px 0 10px 20px;
+            }
+            #activity-name, #meta_content {
+                display: block;width: 100%;font-size: 20px;color: #000;
+                min-height: 30px;margin-bottom: 5px;outline: none;resize: none;border: none;
+            }
+            #activity-name {
+                font-size: 24px;
+            }
+            #bodycontent {
+                font-size: 18px;line-height: 20px;padding-top: 10px;
+            }
+            #bodycontent div {
+                min-height: 27.43px;
+            }
+	</style>
+</head>
+
+<body id="edit">
+<input type="hidden" name="shareTitle" value="${articleInfo.shareTitle}" class="shareTitle"/>	<#--分享标题-->	
+<input type="hidden" name="shareImgUrl" value="${articleInfo.shareImgUrl}" class="shareImgUrl"/>	<#--分享图片-->	
+<input type="hidden" name="shareDes" value="${articleInfo.shareDes}" class="shareDes"/>	<#--分享描述-->
+<input type="hidden" name="articleId" value="${articleInfo.articleId}" class="articleId"/>	<#--文章id-->	
+<input type="hidden" name="adId" value="${articleInfo.adId}" class="adId"/>	<#--广告id-->	
+<input type="hidden" name="companyId" value="${articleInfo.companyId}" class="companyId"/>	<#--公司id-->	
+<input type="hidden" name="publishId" value="${articleInfo.publishId}" class="publishId"/>	<#--发布id-->
+<input type="hidden" name="isAuthorization" value="${articleInfo.isAuthorization}" class="isAuthorization"/>	<#--是否授权 0未授权 1授权-->	
+<input type="hidden" name="isReserve" value="${articleInfo.isReserve}" class="isReserve"/>	<#--是否预约 0不预约 1预约-->	
+<input type="hidden" name="automaticName" value="${articleInfo.automaticName}" class="automaticName"/>	<#--自定义名称-->	
+<input type="hidden" name="introduction" value="${articleInfo.introduction}" class="introduction"/>	<#--介绍-->	
+    <div id="edit_head">
+        <button class="a">
+            <img src="img/share_icon4.png">
+        </button>
+        <p class="b">文章编辑</p>
+        <button class="c">
+            <img src="img/edit_icon_temp.png">
+        </button>
+    </div>
+    <p id="edit_cue">点击文章段落，可删除不需要的内容</p>
+    <div id="edit_body">
+        
+
+        <div class="a">
+            
+            <div class="b">&emsp;可编辑区域&emsp;</div>
+            <div id="articleEditor">
+              ${articleInfo.articleContent}
+            </div>
+        </div>
+        <button id="addAd">
+        <span>+</span>新增</button>
+    </div>
+    <div id="adSelect" class="form-group" style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">广告添加<i class="red"></i></label>
+		<div class="col-sm-5">
+			<select name="advertisementTypeInit" id="advertisementTypeInit" multiple="multiple">
+			</select><br>
+		</div>
+	</div>
+
+	<div  id="whetherOrNotAuthorization" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 145px;">必须授权才能观看<i class="red"></i></label>
+		 <div class="col-sm-4"> 
+			<input type="checkbox" id="isAuthorization"><br>
+		</div> 
+	</div>
+	
+	<div  id="whetherOrNotReserve" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 145px;">是否添加预约按钮<i class="red"></i></label>
+		 <div class="col-sm-4"> 
+			<input type="checkbox" id="isReserve"><br>
+		</div> 
+	</div>
+	
+	<div  id="button_name" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">按钮名称<i class="red">*</i></label>
+		 <div class="col-sm-4"> 
+			<input type="text" style="width: 200px;border:1px solid #ccc"
+					value="${articleInfo.automaticName}"></input>
+		</div> 
+	</div>
+	
+	<div  id="reserve_introduction" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">预约介绍<i class="red">*</i></label>
+		 <div class="col-sm-4"> 
+			<textarea type="text" style="width: 250px;border:1px solid #ccc"
+					 >${articleInfo.introduction}</textarea>
+		</div> 
+	</div>
+
+<form style="display: none;" class="lables">
+	       标签：<label><input type="radio" name="1" value="旅游" checked="checked">旅游</label> 
+		        <label><input type="radio" name="1" value="美食" checked="checked" >美食</label>
+				<button id="sures" type="button">确定</button>
+	            
+	</form>
+
+	<link rel="stylesheet" href="css/fSelect.css">
+    <link rel="stylesheet" href="css/bootstrap.min.css">
+
+    <!-- 文章编辑组件 -->
+    <script src="js/jquery.min.js"></script>
+    <script src="js/Eleditor.min.js"></script>
+    <script src="js/webuploader.min.js"></script>
+    <!-- 页面组件 -->
+    <script src="js/common.2.js"></script>
+    <script src="js/fSelect.js"></script>
+    <script src="js/new/edit_ms.js?v=0.5"></script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/static/freemarker/edit.flt b/ruoyi-content/src/main/resources/static/freemarker/edit.flt
new file mode 100644
index 000000000..a3735b5f5
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/freemarker/edit.flt
@@ -0,0 +1,182 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>文章编辑</title>
+    <base href="../../../../ms/" />
+    <link rel="stylesheet" href="css/style.css">
+   
+	 <script src="js/common.js"></script>
+     <script src="js/common.1.js"></script>
+      <link rel="stylesheet" href="css/base.css">
+     <style type="text/css">
+     		/* 标签菜单修改*/
+             .lables{
+               height: 200px;
+               width: 200px;
+               border: 1px solid #ccc;
+               position: fixed;
+               top: 50%;
+               left: 50%;
+               margin-top: -100px;
+               margin-left: -100px;
+               background: white;
+               z-index: 555;
+             }
+             .lables p{
+                 font-size: 14px;
+                 color: #fff;
+                 text-align: center;
+                 background: #409eff;
+                 padding: 0;
+                 height: 30px;
+                 line-height: 30px;
+             }
+             .lables label {
+               display: block;
+               font-size: 15px;
+               margin: 5px 0 5px 20px;
+             }
+             .lables label input{
+               margin: 0 10px 0 0;
+             }
+             .lables_box {
+                 height: 135px;
+                 overflow-y: scroll;
+             }
+             #sures{
+                 display: block;
+                 position: absolute;
+                 bottom: 4px;
+                 left: 0;
+                 right: 0;
+                 color: #fff;
+                 width: 90px;
+                 font-size: 14px;
+                 text-align: center;
+                 line-height: 30px;
+                 background: #409eff;
+                 border-radius: 5px;
+                 margin: 0 auto;
+             }
+             /*标签样式*/
+             .seldiv {
+               position: relative;
+             }
+             .seldiv .label{
+               display: inline-block;
+               width: 50px;
+               background: rgba(0,205,50, 0.4);
+               font-size: 12px;
+               line-height: 24px;
+               color: #fff;
+               padding: 0 6px;
+               box-shadow: -1px 1px 1px rgba(0,0,0,0.3);
+               margin: 0 10px 0 0;
+             }
+     	</style>
+</head>
+
+<body id="edit">
+<input type="hidden" name="shareTitle" value="${articleInfo.shareTitle}" class="shareTitle"/>	<#--分享标题-->	
+<input type="hidden" name="shareImgUrl" value="${articleInfo.shareImgUrl}" class="shareImgUrl"/>	<#--分享图片-->	
+<input type="hidden" name="shareDes" value="${articleInfo.shareDes}" class="shareDes"/>	<#--分享描述-->
+<input type="hidden" name="articleId" value="${articleInfo.articleId}" class="articleId"/>	<#--文章id-->	
+<input type="hidden" name="adId" value="${articleInfo.adId}" class="adId"/>	<#--广告id-->	
+<input type="hidden" name="companyId" value="${articleInfo.companyId}" class="companyId"/>	<#--公司id-->	
+<input type="hidden" name="publishId" value="${articleInfo.publishId}" class="publishId"/>	<#--发布id-->
+<input type="hidden" name="isAuthorization" value="${articleInfo.isAuthorization}" class="isAuthorization"/>	<#--是否授权 0未授权 1授权-->	
+<input type="hidden" name="isReserve" value="${articleInfo.isReserve}" class="isReserve"/>	<#--是否预约 0不预约 1预约-->	
+<input type="hidden" name="automaticName" value="${articleInfo.automaticName}" class="automaticName"/>	<#--自定义名称-->	
+<input type="hidden" name="introduction" value="${articleInfo.introduction}" class="introduction"/>	<#--介绍-->	
+    <div id="edit_head">
+        <button class="a">
+            <img src="img/share_icon4.png">
+        </button>
+        <p class="b">文章编辑</p>
+        <button class="c">
+            <img src="img/edit_icon_temp.png">
+        </button>
+    </div>
+    <p id="edit_cue">点击文章段落，可删除不需要的内容</p>
+    <div id="edit_body">
+        
+
+        <div class="a">
+            
+            <div class="b">&emsp;可编辑区域&emsp;</div>
+            <div id="articleEditor">
+              ${articleInfo.articleContent}
+            </div>
+        </div>
+        <button id="addAd">
+        <span>+</span>新增</button>
+    </div>
+    <div id="adSelect" class="form-group" style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">广告添加<i class="red"></i></label>
+		<div class="col-sm-5">
+			<select name="advertisementTypeInit" id="advertisementTypeInit" multiple="multiple">
+			</select><br>
+		</div>
+	</div>
+
+	<div  id="whetherOrNotAuthorization" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 145px;">必须授权才能观看<i class="red"></i></label>
+		 <div class="col-sm-4"> 
+			<input type="checkbox" id="isAuthorization"><br>
+		</div> 
+	</div>
+	
+	<div  id="whetherOrNotReserve" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 145px;">是否添加预约按钮<i class="red"></i></label>
+		 <div class="col-sm-4"> 
+			<input type="checkbox" id="isReserve"><br>
+		</div> 
+	</div>
+	
+	<div  id="button_name" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">按钮名称<i class="red">*</i></label>
+		 <div class="col-sm-4"> 
+			<input type="text" style="width: 200px;border:1px solid #ccc"
+					value="${articleInfo.automaticName}"></input>
+		</div> 
+	</div>
+	
+	<div  id="reserve_introduction" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">预约介绍<i class="red">*</i></label>
+		 <div class="col-sm-4"> 
+			<textarea type="text" style="width: 250px;border:1px solid #ccc"
+					 >${articleInfo.introduction}</textarea>
+		</div> 
+	</div>
+
+ <form style="display: none;" class="lables">
+	   <p>标签：</p>
+    <div class="lables_box">
+      <label><input type="radio" name="1" value="旅游1" checked="checked">旅游1</label>
+      <label><input type="radio" name="1" value="美食1" checked="checked" >美食1</label>
+      <label><input type="radio" name="1" value="旅游2" checked="checked">旅游2</label>
+      <label><input type="radio" name="1" value="美食2" checked="checked" >美食2</label>
+
+    </div>
+    <button id="sures" type="button">确定</button>
+	            
+	</form>
+
+    <link rel="stylesheet" href="css/fSelect.css">
+    <link rel="stylesheet" href="css/bootstrap.min.css">
+    <!-- 文章编辑组件 -->
+    <script src="js/jquery.min.js"></script>
+    <script src="js/Eleditor.min.js"></script>
+    <script src="js/webuploader.min.js"></script>
+    <!-- 页面组件 -->
+    <script src="js/common.2.js"></script>
+    <script src="js/fSelect.js"></script>
+    <script src="js/new/edit_ms.js?v=0.5"></script>
+
+</body>
+
+</html>
\ No newline at end of file
diff --git a/ruoyi-content/src/main/resources/static/freemarker/view.flt b/ruoyi-content/src/main/resources/static/freemarker/view.flt
new file mode 100644
index 000000000..a85e64acd
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/freemarker/view.flt
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
+<html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>文章详情</title>
+    <base href="../../../../gv/" />
+    <link rel="stylesheet" href="css/style.css">
+    <style>
+        .label {
+            display: none;
+        }
+        #meta_content {
+            height: auto;
+            overflow: hidden;
+            display: display;
+        }
+    </style>
+</head>
+<body id="essay">
+<input type="hidden" name="shareTitle" value="${articleInfo.shareTitle}" class="shareTitle"/>	<#--分享标题-->	
+<input type="hidden" name="shareImgUrl" value="${articleInfo.shareImgUrl}" class="shareImgUrl"/>	<#--分享图片-->	
+<input type="hidden" name="shareDes" value="${articleInfo.shareDes}" class="shareDes"/>	<#--分享描述-->	
+<input type="hidden" name="articleId" value="${articleInfo.articleId}" class="articleId"/>	<#--文章id-->	
+<input type="hidden" name="versionNumber" value="${articleInfo.versionNumber}" class="versionNumber"/>	
+<input type="hidden" name="adId" value="${articleInfo.adId}" class="adId"/>	<#--广告id-->	
+<input type="hidden" name="isAuthorization" value="${articleInfo.isAuthorization}" class="isAuthorization"/>	<#--是否授权 0未授权 1授权-->	
+<input type="hidden" name="isReserve" value="${articleInfo.isReserve}" class="isReserve"/>	<#--是否预约 0不预约 1预约-->	
+<input type="hidden" name="automaticName" value="${articleInfo.automaticName}" class="automaticName"/>	<#--自定义名称-->	
+<input type="hidden" name="introduction" value="${articleInfo.introduction}" class="introduction"/>	<#--介绍-->	
+${articleInfo.articleContent}
+
+</body>
+<script src="js/common.1.js"></script>
+<script src="js/jquery-1.9.1.min.js"></script>
+<script src='js/jquery.cookie.js'></script>
+<script src="js/weChat_share2.js"></script>
+<script src="js/new/view.js"></script>
+</html>
\ No newline at end of file

From aa43cb582c743964831beb2289153407a1a79803 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Thu, 22 Apr 2021 15:15:51 +0800
Subject: [PATCH 29/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-content/src/main/resources/static/freemarker/view.flt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-content/src/main/resources/static/freemarker/view.flt b/ruoyi-content/src/main/resources/static/freemarker/view.flt
index a85e64acd..dddfee602 100644
--- a/ruoyi-content/src/main/resources/static/freemarker/view.flt
+++ b/ruoyi-content/src/main/resources/static/freemarker/view.flt
@@ -15,7 +15,7 @@
         #meta_content {
             height: auto;
             overflow: hidden;
-            display: display;
+            display: block;
         }
     </style>
 </head>

From a98077a206242fa3bd013ffeadb5c03caf2132a0 Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Sun, 25 Apr 2021 09:44:47 +0800
Subject: [PATCH 30/30] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../constants/PropertiesConstants.java        |  14 +-
 .../service/impl/ArticleServiceImpl.java      |   4 +-
 .../freemarker/{create.flt => createedit.flt} |   0
 .../static/freemarker/createview.flt          | 152 ++++++++++++++++++
 4 files changed, 164 insertions(+), 6 deletions(-)
 rename ruoyi-content/src/main/resources/static/freemarker/{create.flt => createedit.flt} (100%)
 create mode 100644 ruoyi-content/src/main/resources/static/freemarker/createview.flt

diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java b/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java
index 9abf1ddaa..b4155a0df 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/constants/PropertiesConstants.java
@@ -12,11 +12,17 @@ public class PropertiesConstants {
 //
 //    public static final String FILE_PATH = "/app/contentMKTCms/webapp/WEB-INF/static/";
 //    public static final String PROJECT_LOCALPATH = "/app/contentMKTCms/webapp";
-    public static final String TEMPLATE_VIEW_PATH = "view.flt";
-    public static final String TEMPLATE_EDIT_PATH = "edit.flt";
 
-    public static final String FILE_PATH = "/Users/liushenlu/Desktop/";
-    public static final String PROJECT_LOCALPATH = "/Users/liushenlu/Desktop";
+    //public static final String FILE_PATH = "/Users/liushenlu/Desktop/";
+    //public static final String PROJECT_LOCALPATH = "/Users/liushenlu/Desktop";
+    public static final String FILE_PATH = "/app/contentMKTCms/";
+    public static final String PROJECT_LOCALPATH = "/app/contentMKTCms";
+
+    public static final String TEMPLATE_VIEW_PATH = "template/view.flt";
+    public static final String TEMPLATE_EDIT_PATH = "template/edit.flt";
+    public static final String TEMPLATE_CREATE_EDIT_PATH = "template/createedit.flt";
+    public static final String TEMPLATE_CREATE_VIEW_PATH = "template/createview.flt";
+
     public static final String ONLINE_IMG_PATH = "network/article/";
     public static final String OSS_URL = "http://cdn.sinosoftec.com/";
     public static final String OSS_URL_HTTPS = "https://cdn.sinosoftec.com/";
diff --git a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
index 08a62cef7..7b1fbef6f 100644
--- a/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
+++ b/ruoyi-content/src/main/java/com/ruoyi/content/service/impl/ArticleServiceImpl.java
@@ -1256,9 +1256,9 @@ public class ArticleServiceImpl implements ArticleService {
             // 静态页生成路径
             String viewPath = PathUtil.getArticleViewUrl(versionNumber, String.valueOf(articleId));
             String createPath = PathUtil.getArticleCreateUrl(versionNumber, articleId + versionNumber.substring(8, 14));
-            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_VIEW_PATH,
+            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_CREATE_VIEW_PATH,
                     PropertiesConstants.FILE_PATH + viewPath, pageData);
-            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_CREATE_PATH,
+            FreemakerUtil.generateStaticPage(conf, PropertiesConstants.TEMPLATE_CREATE_EDIT_PATH,
                     PropertiesConstants.FILE_PATH + createPath, pageData);
             // 把静态页上传到oss
             OSSUtil.uploadFileHtml(PropertiesConstants.OSSENDPOINT, PropertiesConstants.OSSID,
diff --git a/ruoyi-content/src/main/resources/static/freemarker/create.flt b/ruoyi-content/src/main/resources/static/freemarker/createedit.flt
similarity index 100%
rename from ruoyi-content/src/main/resources/static/freemarker/create.flt
rename to ruoyi-content/src/main/resources/static/freemarker/createedit.flt
diff --git a/ruoyi-content/src/main/resources/static/freemarker/createview.flt b/ruoyi-content/src/main/resources/static/freemarker/createview.flt
new file mode 100644
index 000000000..783a27bd2
--- /dev/null
+++ b/ruoyi-content/src/main/resources/static/freemarker/createview.flt
@@ -0,0 +1,152 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>文章编辑</title>
+    <base href="../../../../ms/" />
+    <link rel="stylesheet" href="css/style.css">
+   
+	 <script src="js/common.js"></script>
+     <script src="js/common.1.js"></script>
+      <link rel="stylesheet" href="css/base.css">
+     <style type="text/css">
+			.lables {
+			    height: 200px;width: 200px;border: 1px solid #ccc;position: fixed;top: 50%;left: 50%;margin-top: -100px;margin-left: -100px;background: white;z-index: 555;
+			}
+			table {
+			    border-top: 1px solid #ccc;border-left: 1px solid #ccc;
+			}
+            table td, table th {
+                border-bottom: 1px solid #ccc; border-right: 1px solid #ccc; padding: 3px 5px;
+            }
+            table th {
+                border-bottom: 2px solid #ccc; text-align: center;
+            }
+            blockquote {
+                display: block;border-left: 8px solid #d0e5f2;padding: 5px 10px;margin: 10px 0;
+                line-height: 1.4;font-size: 100%;background-color: #f1f1f1;
+            }
+            code {
+                display: inline-block;*display: inline;*zoom: 1;background-color: #f1f1f1;
+                border-radius: 3px;padding: 3px 5px;margin: 0 3px;
+            }
+            pre code {
+                display: block;
+            }
+            ul, ol {
+                margin: 10px 0 10px 20px;
+            }
+            #activity-name, #meta_content {
+                display: block;width: 100%;font-size: 20px;color: #000;
+                min-height: 30px;margin-bottom: 5px;outline: none;resize: none;border: none;
+            }
+            #activity-name {
+                font-size: 24px;
+            }
+            #bodycontent {
+                font-size: 18px;line-height: 20px;padding-top: 10px;
+            }
+            #bodycontent div {
+                min-height: 27.43px;
+            }
+	</style>
+</head>
+
+<body id="edit">
+<input type="hidden" name="shareTitle" value="${articleInfo.shareTitle}" class="shareTitle"/>	<#--分享标题-->	
+<input type="hidden" name="shareImgUrl" value="${articleInfo.shareImgUrl}" class="shareImgUrl"/>	<#--分享图片-->	
+<input type="hidden" name="shareDes" value="${articleInfo.shareDes}" class="shareDes"/>	<#--分享描述-->
+<input type="hidden" name="articleId" value="${articleInfo.articleId}" class="articleId"/>	<#--文章id-->	
+<input type="hidden" name="adId" value="${articleInfo.adId}" class="adId"/>	<#--广告id-->	
+<input type="hidden" name="companyId" value="${articleInfo.companyId}" class="companyId"/>	<#--公司id-->	
+<input type="hidden" name="publishId" value="${articleInfo.publishId}" class="publishId"/>	<#--发布id-->
+<input type="hidden" name="isAuthorization" value="${articleInfo.isAuthorization}" class="isAuthorization"/>	<#--是否授权 0未授权 1授权-->	
+<input type="hidden" name="isReserve" value="${articleInfo.isReserve}" class="isReserve"/>	<#--是否预约 0不预约 1预约-->	
+<input type="hidden" name="automaticName" value="${articleInfo.automaticName}" class="automaticName"/>	<#--自定义名称-->	
+<input type="hidden" name="introduction" value="${articleInfo.introduction}" class="introduction"/>	<#--介绍-->	
+    <div id="edit_head">
+        <button class="a">
+            <img src="img/share_icon4.png">
+        </button>
+        <p class="b">文章编辑</p>
+        <button class="c">
+            <img src="img/edit_icon_temp.png">
+        </button>
+    </div>
+    <p id="edit_cue">点击文章段落，可删除不需要的内容</p>
+    <div id="edit_body">
+        
+
+        <div class="a">
+            
+            <div class="b">&emsp;可编辑区域&emsp;</div>
+            <div id="articleEditor">
+              ${articleInfo.articleContent}
+            </div>
+        </div>
+        <button id="addAd">
+        <span>+</span>新增</button>
+    </div>
+    <div id="adSelect" class="form-group" style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">广告添加<i class="red"></i></label>
+		<div class="col-sm-5">
+			<select name="advertisementTypeInit" id="advertisementTypeInit" multiple="multiple">
+			</select><br>
+		</div>
+	</div>
+
+	<div  id="whetherOrNotAuthorization" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 145px;">必须授权才能观看<i class="red"></i></label>
+		 <div class="col-sm-4"> 
+			<input type="checkbox" id="isAuthorization"><br>
+		</div> 
+	</div>
+	
+	<div  id="whetherOrNotReserve" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 145px;">是否添加预约按钮<i class="red"></i></label>
+		 <div class="col-sm-4"> 
+			<input type="checkbox" id="isReserve"><br>
+		</div> 
+	</div>
+	
+	<div  id="button_name" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">按钮名称<i class="red">*</i></label>
+		 <div class="col-sm-4"> 
+			<input type="text" style="width: 200px;border:1px solid #ccc"
+					value="${articleInfo.automaticName}"></input>
+		</div> 
+	</div>
+	
+	<div  id="reserve_introduction" class="form-group"  style="display:none">
+		<label class="col-sm-4 control-label" style="float: left;position: relative;min-height: 1px;padding-left: 200px;">预约介绍<i class="red">*</i></label>
+		 <div class="col-sm-4"> 
+			<textarea type="text" style="width: 250px;border:1px solid #ccc"
+					 >${articleInfo.introduction}</textarea>
+		</div> 
+	</div>
+
+<form style="display: none;" class="lables">
+	       标签：<label><input type="radio" name="1" value="旅游" checked="checked">旅游</label> 
+		        <label><input type="radio" name="1" value="美食" checked="checked" >美食</label>
+				<button id="sures" type="button">确定</button>
+	            
+	</form>
+
+	<link rel="stylesheet" href="css/fSelect.css">
+    <link rel="stylesheet" href="css/bootstrap.min.css">
+
+    <!-- 文章编辑组件 -->
+    <script src="js/jquery.min.js"></script>
+    <script src="js/Eleditor.min.js"></script>
+    <script src="js/webuploader.min.js"></script>
+    <!-- 页面组件 -->
+    <script src="js/common.2.js"></script>
+    <script src="js/fSelect.js"></script>
+    <script src="js/new/edit_ms.js?v=0.5"></script>
+
+</body>
+
+</html>
\ No newline at end of file