diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.java
index 4624f9d..2648208 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/content/ContentMessageTemplateMapper.java
@@ -1,55 +1,28 @@
-<<<<<<< HEAD
-package com.lyms.base.common.dao.content;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.lyms.base.common.entity.content.ContentMessageTemplate;
-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
-import com.lyms.base.common.vo.content.MsgTempSerachDTO;
-import org.springframework.stereotype.Repository;
-
-import java.io.Serializable;
-import java.util.List;
-/**
- * <p>
- * Mapper接口
- * </p>
- *
- * @author yangfei
- * @since 2017-04-14
- */
-@Repository
-public interface ContentMessageTemplateMapper extends BaseMapper<ContentMessageTemplate> {
-
-  public Integer deleteLogicById(Serializable id);
-
-  public List<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page , MsgTempSerachDTO msgTemp);
-  
-=======
-package com.lyms.base.common.dao.content;
-
-import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.lyms.base.common.entity.content.ContentMessageTemplate;
-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
-import org.springframework.stereotype.Repository;
-
-import java.io.Serializable;
-import java.util.List;
-/**
- * <p>
- * Mapper接口
- * </p>
- *
- * @author yangfei
- * @since 2017-04-14
- */
-@Repository
-public interface ContentMessageTemplateMapper extends BaseMapper<ContentMessageTemplate> {
-
-  public Integer deleteLogicById(Serializable id);
-
-  public List<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page , String verId);
-  
->>>>>>> 181fc2da2ec63e24914c7529c6e7705f02985d0e
+package com.lyms.base.common.dao.content;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.lyms.base.common.entity.content.ContentMessageTemplate;
+import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
+import com.lyms.base.common.vo.content.MsgTempSerachDTO;
+/**
+ * <p>
+ * Mapper接口
+ * </p>
+ *
+ * @author yangfei
+ * @since 2017-04-14
+ */
+@Repository
+public interface ContentMessageTemplateMapper extends BaseMapper<ContentMessageTemplate> {
+
+  public Integer deleteLogicById(Serializable id);
+
+  public List<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page , MsgTempSerachDTO msgTemp);
+  
 }
\ No newline at end of file
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentArticlesService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentArticlesService.java
index 752c027..7c7b3b1 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentArticlesService.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentArticlesService.java
@@ -1,14 +1,14 @@
 package com.lyms.base.common.service.content;
 
+import java.io.Serializable;
+import java.util.List;
+
 import com.baomidou.mybatisplus.plugins.Page;
 import com.lyms.base.common.entity.content.ContentArticles;
 import com.lyms.base.common.entity.content.ContentArticlesTags;
 import com.lyms.base.common.vo.content.AricleSearchDTO;
 import com.lyms.web.service.BaseService;
 
-import java.io.Serializable;
-import java.util.List;
-
 /**
  * <p>
  * 服务类
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java
index c075810..224fe92 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentMessageTemplateService.java
@@ -1,62 +1,31 @@
-<<<<<<< HEAD
-package com.lyms.base.common.service.content;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.lyms.base.common.entity.content.ContentMessageTemplate;
-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
-import com.lyms.base.common.vo.content.MsgTempSerachDTO;
-import com.lyms.web.service.BaseService;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author yangfei
- * @since 2017-04-14
- */
-public interface ContentMessageTemplateService extends BaseService<ContentMessageTemplate> {
-
-  /** 
-    * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
-    * <li>@param id 删除主键id
-    * <li>@return 大于0修改成功，否则为失败
-    */
-  public Integer deleteLogicById(Serializable id);
-
-  public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, MsgTempSerachDTO msgTemp);
-	
-}
-=======
-package com.lyms.base.common.service.content;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.lyms.base.common.entity.content.ContentMessageTemplate;
-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
-import com.lyms.web.service.BaseService;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 服务类
- * </p>
- *
- * @author yangfei
- * @since 2017-04-14
- */
-public interface ContentMessageTemplateService extends BaseService<ContentMessageTemplate> {
-
-  /** 
-    * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
-    * <li>@param id 删除主键id
-    * <li>@return 大于0修改成功，否则为失败
-    */
-  public Integer deleteLogicById(Serializable id);
-
-  public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, String verId);
-	
-}
->>>>>>> 181fc2da2ec63e24914c7529c6e7705f02985d0e
+package com.lyms.base.common.service.content;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.lyms.base.common.entity.content.ContentMessageTemplate;
+import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
+import com.lyms.base.common.vo.content.MsgTempSerachDTO;
+import com.lyms.web.service.BaseService;
+
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author yangfei
+ * @since 2017-04-14
+ */
+public interface ContentMessageTemplateService extends BaseService<ContentMessageTemplate> {
+
+  /** 
+    * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
+    * <li>@param id 删除主键id
+    * <li>@return 大于0修改成功，否则为失败
+    */
+  public Integer deleteLogicById(Serializable id);
+
+  public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, MsgTempSerachDTO msgTemp);
+	
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentTemplateMessageTagsService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentTemplateMessageTagsService.java
index dca772f..9d3669a 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentTemplateMessageTagsService.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/ContentTemplateMessageTagsService.java
@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.List;
 
 import com.lyms.base.common.entity.content.ContentTemplateMessageTags;
-import com.lyms.base.common.vo.content.ContentMessageTemplateVo;
 import com.lyms.web.service.BaseService;
 
 /**
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java
index 8b29f4b..b9a1104 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentMessageTemplateServiceImpl.java
@@ -1,74 +1,37 @@
-<<<<<<< HEAD
-package com.lyms.base.common.service.content.impl;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.lyms.base.common.dao.content.ContentMessageTemplateMapper;
-import com.lyms.base.common.entity.content.ContentMessageTemplate;
-import com.lyms.base.common.service.content.ContentMessageTemplateService;
-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
-import com.lyms.base.common.vo.content.MsgTempSerachDTO;
-import org.springframework.stereotype.Service;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 消息模板内容  服务实现类
- * </p>
- *
- * @author yangfei
- * @since 2017-04-14
- */
-@Service
-public class ContentMessageTemplateServiceImpl extends ServiceImpl<ContentMessageTemplateMapper, ContentMessageTemplate> implements ContentMessageTemplateService {
-	
-	public Integer deleteLogicById(Serializable id){
-	    return baseMapper.deleteLogicById(id);
-	}
-
-	@Override
-	public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, MsgTempSerachDTO msgTemp) {
-		List<ContentMessageTemplateDTO> lists = baseMapper.getContentMessageTemplate(page, msgTemp);
-		page.setRecords(lists);
-		return page;
-	}
-}
-=======
-package com.lyms.base.common.service.content.impl;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.lyms.base.common.dao.content.ContentMessageTemplateMapper;
-import com.lyms.base.common.entity.content.ContentMessageTemplate;
-import com.lyms.base.common.service.content.ContentMessageTemplateService;
-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
-import org.springframework.stereotype.Service;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 消息模板内容  服务实现类
- * </p>
- *
- * @author yangfei
- * @since 2017-04-14
- */
-@Service
-public class ContentMessageTemplateServiceImpl extends ServiceImpl<ContentMessageTemplateMapper, ContentMessageTemplate> implements ContentMessageTemplateService {
-	
-	public Integer deleteLogicById(Serializable id){
-	    return baseMapper.deleteLogicById(id);
-	}
-
-	@Override
-	public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, String verId) {
-		List<ContentMessageTemplateDTO> lists = baseMapper.getContentMessageTemplate(page, verId);
-		page.setRecords(lists);
-		return page;
-	}
-}
->>>>>>> 181fc2da2ec63e24914c7529c6e7705f02985d0e
+package com.lyms.base.common.service.content.impl;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.lyms.base.common.dao.content.ContentMessageTemplateMapper;
+import com.lyms.base.common.entity.content.ContentMessageTemplate;
+import com.lyms.base.common.service.content.ContentMessageTemplateService;
+import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
+import com.lyms.base.common.vo.content.MsgTempSerachDTO;
+
+/**
+ * <p>
+ * 消息模板内容  服务实现类
+ * </p>
+ *
+ * @author yangfei
+ * @since 2017-04-14
+ */
+@Service
+public class ContentMessageTemplateServiceImpl extends ServiceImpl<ContentMessageTemplateMapper, ContentMessageTemplate> implements ContentMessageTemplateService {
+	
+	public Integer deleteLogicById(Serializable id){
+	    return baseMapper.deleteLogicById(id);
+	}
+
+	@Override
+	public Page<ContentMessageTemplateDTO> getContentMessageTemplate(Page<ContentMessageTemplateDTO> page, MsgTempSerachDTO msgTemp) {
+		List<ContentMessageTemplateDTO> lists = baseMapper.getContentMessageTemplate(page, msgTemp);
+		page.setRecords(lists);
+		return page;
+	}
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTemplateMessageTagsServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTemplateMessageTagsServiceImpl.java
index 9cdf371..fb66270 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTemplateMessageTagsServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/content/impl/ContentTemplateMessageTagsServiceImpl.java
@@ -1,28 +1,26 @@
-package com.lyms.base.common.service.content.impl;
-
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.lyms.base.common.dao.content.ContentTemplateMessageTagsMapper;
-import com.lyms.base.common.entity.content.ContentTemplateMessageTags;
-import com.lyms.base.common.service.content.ContentTemplateMessageTagsService;
-import com.lyms.base.common.vo.content.ContentMessageTemplateVo;
-
-import org.springframework.stereotype.Service;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * <p>
- * 模板信息标签  服务实现类
- * </p>
- *
- * @author yangfei
- * @since 2017-04-14
- */
-@Service
-public class ContentTemplateMessageTagsServiceImpl extends ServiceImpl<ContentTemplateMessageTagsMapper, ContentTemplateMessageTags> implements ContentTemplateMessageTagsService {
-	
-	public Integer deleteLogicById(Serializable id){
-	    return baseMapper.deleteLogicById(id);
-	}
-}
+package com.lyms.base.common.service.content.impl;
+
+import java.io.Serializable;
+
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.lyms.base.common.dao.content.ContentTemplateMessageTagsMapper;
+import com.lyms.base.common.entity.content.ContentTemplateMessageTags;
+import com.lyms.base.common.service.content.ContentTemplateMessageTagsService;
+
+/**
+ * <p>
+ * 模板信息标签  服务实现类
+ * </p>
+ *
+ * @author yangfei
+ * @since 2017-04-14
+ */
+@Service
+public class ContentTemplateMessageTagsServiceImpl extends ServiceImpl<ContentTemplateMessageTagsMapper, ContentTemplateMessageTags> implements ContentTemplateMessageTagsService {
+	
+	public Integer deleteLogicById(Serializable id){
+	    return baseMapper.deleteLogicById(id);
+	}
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/vo/content/ContentMessageTemplateDTO.java b/parent/base.common/src/main/java/com/lyms/base/common/vo/content/ContentMessageTemplateDTO.java
index 9b64487..c54388e 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/vo/content/ContentMessageTemplateDTO.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/vo/content/ContentMessageTemplateDTO.java
@@ -1,78 +1,78 @@
-package com.lyms.base.common.vo.content;
-
-public class ContentMessageTemplateDTO {
-	/**
-	 * 主键ID
-	 */
-	private String id;
-	/**
-	 * 消息模板版本ID
-	 */
-	private String templateVersionId;
-	/**
-	 * 信息内容
-	 */
-	private String content;
-	/**
-	 * 图文信息ID
-	 */
-	private String articlesId;
-	/**
-	 * 标志键
-	 */
-	private String keyCode;
-	/**
-	 * 标签集合
-	 */
-	private String contentTagIds;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getTemplateVersionId() {
-		return templateVersionId;
-	}
-
-	public void setTemplateVersionId(String templateVersionId) {
-		this.templateVersionId = templateVersionId;
-	}
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	public String getArticlesId() {
-		return articlesId;
-	}
-
-	public void setArticlesId(String articlesId) {
-		this.articlesId = articlesId;
-	}
-
-	public String getKeyCode() {
-		return keyCode;
-	}
-
-	public void setKeyCode(String keyCode) {
-		this.keyCode = keyCode;
-	}
-
-	public String getContentTagIds() {
-		return contentTagIds;
-	}
-
-	public void setContentTagIds(String contentTagIds) {
-		this.contentTagIds = contentTagIds;
-	}
-
-
-}
+package com.lyms.base.common.vo.content;
+
+public class ContentMessageTemplateDTO {
+	/**
+	 * 主键ID
+	 */
+	private String id;
+	/**
+	 * 消息模板版本ID
+	 */
+	private String templateVersionId;
+	/**
+	 * 信息内容
+	 */
+	private String content;
+	/**
+	 * 图文信息ID
+	 */
+	private String articlesId;
+	/**
+	 * 标志键
+	 */
+	private String keyCode;
+	/**
+	 * 标签集合
+	 */
+	private String contentTagIds;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getTemplateVersionId() {
+		return templateVersionId;
+	}
+
+	public void setTemplateVersionId(String templateVersionId) {
+		this.templateVersionId = templateVersionId;
+	}
+
+	public String getContent() {
+		return content;
+	}
+
+	public void setContent(String content) {
+		this.content = content;
+	}
+
+	public String getArticlesId() {
+		return articlesId;
+	}
+
+	public void setArticlesId(String articlesId) {
+		this.articlesId = articlesId;
+	}
+
+	public String getKeyCode() {
+		return keyCode;
+	}
+
+	public void setKeyCode(String keyCode) {
+		this.keyCode = keyCode;
+	}
+
+	public String getContentTagIds() {
+		return contentTagIds;
+	}
+
+	public void setContentTagIds(String contentTagIds) {
+		this.contentTagIds = contentTagIds;
+	}
+
+
+}
diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentCategoriesController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentCategoriesController.java
index 71c67fa..bec73ae 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentCategoriesController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentCategoriesController.java
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 package com.lyms.cm.controller.content;
 
 import com.baomidou.mybatisplus.plugins.Page;
@@ -98,91 +97,3 @@ public class ContentCategoriesController extends BaseController {
 		return handleAjaxResult(ajaxResult, tag, OperationName.CREATE);
 	}
 }
-=======
-package com.lyms.cm.controller.content;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.lyms.base.common.entity.content.ContentCategories;
-import com.lyms.base.common.service.content.ContentCategoriesService;
-import com.lyms.util.StrUtils;
-import com.lyms.web.bean.AjaxResult;
-import com.lyms.web.controller.BaseController;
-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.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 栏目  前端控制器
- * </p>
- *
- * @author yangfei
- * @since 2017-04-14
- */
-@Controller
-@RequestMapping("/contentCategories")
-public class ContentCategoriesController extends BaseController {
-	@Autowired
-	public ContentCategoriesService categorService;
-	/**
-	 * 图文获取栏目列表
-	 * @return
-	 */
-    @ResponseBody
-    @RequestMapping(value = "/selelist", method = { RequestMethod.GET, RequestMethod.POST })
-    public AjaxResult selelist() {
-        List<ContentCategories> lists  = categorService.selectList(null);
-        return AjaxResult.returnSuccess(lists);
-    }
-
-	/**
-	 * 获取栏目列表
-	 * @param name 栏目名称
-	 * @return
-	 */
-	@ResponseBody
-	@RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST })
-	public Map<String, Object> list(@RequestParam(defaultValue= "",value="name",required = false) String name) {
-		Page<ContentCategories> page = getPage();
-		if(StrUtils.isNotEmpty(name)){
-			page = categorService.getCategories(page,name);
-		}else{
-			page = categorService.getCategories(page,null);
-		}
-		return toGridData(page);
-	}
-
-	/**
-	 * 跳转到新增页面
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/toEdit", method = { RequestMethod.GET })
-	public String toEdit() {
-		return "/categories/categonies_edit";
-	}
-
-	/**
-	 * 跳转到列表页面
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/toList", method = { RequestMethod.GET })
-	public String toList() {
-		return "/categories/categonies_list";
-	}
-
-
-	@ResponseBody
-	@RequestMapping(value = "/create", method = { RequestMethod.POST })
-	public AjaxResult create(ContentCategories cca, AjaxResult ajaxResult) {
-		return null;
-	}
-}
->>>>>>> 181fc2da2ec63e24914c7529c6e7705f02985d0e
diff --git a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java
index b0b3f92..3e70ba9 100644
--- a/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java
+++ b/parent/center.manager/src/main/java/com/lyms/cm/controller/content/ContentMessageTemplateController.java
@@ -1,195 +1,96 @@
-<<<<<<< HEAD
-package com.lyms.cm.controller.content;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.lyms.base.common.entity.content.ContentMessageTemplate;
-import com.lyms.base.common.service.content.ContentMessageTemplateService;
-import com.lyms.base.common.service.content.ContentTemplateMessageTagsService;
-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
-import com.lyms.base.common.vo.content.InContentMessageTemplateDTO;
-import com.lyms.base.common.vo.content.MsgTempSerachDTO;
-import com.lyms.constants.OperationName;
-import com.lyms.util.StrUtils;
-import com.lyms.web.bean.AjaxResult;
-import com.lyms.web.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * <p>
- * 消息模板内容  前端控制器
- * </p>
- *
- * @author yangfei
- * @since 2017-04-14
- */
-@Controller
-@RequestMapping("/contentMessageTemplate")
-public class ContentMessageTemplateController extends BaseController {
-    //模板信息
-    @Autowired
-    private ContentMessageTemplateService messageTemplateService;
-    //模板信息标签
-    @Autowired
-    private ContentTemplateMessageTagsService messageTagsService;
-    /**
-     * 跳转到列表页面
-     *
-     * @return
-     */
-    @RequestMapping(value = "/toList", method = { RequestMethod.GET })
-    public String toList() {
-         return "/content/template_list";
-    }
-    
-    /**
-	 * 跳转到编辑页面
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = { "/{verId}/toEdit" }, method = RequestMethod.GET)
-	public String toEdit(@PathVariable String verId, Model model) {
-		model.addAttribute("verId", verId);
-		return "/content/template_edit";
-	}
-
-	/**
-	 * 获取消息内容列表
-	 * @param msgTemp
-	 * @return
-	 */
-    @ResponseBody
-    @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST })
-    public Map<String, Object> list(MsgTempSerachDTO msgTemp) {
-        Page<ContentMessageTemplateDTO> page = getPage();
-       page = messageTemplateService.getContentMessageTemplate(page,msgTemp);
-        return toGridData(page);
-    }
-    
-	/**
-     * 新增消息模板信息
-     * <p>
-     * TODO
-     * 
-     * @return
-     */
-    @RequestMapping(value = "/create", method = RequestMethod.POST)
-    @ResponseBody
-    public AjaxResult create(@ModelAttribute InContentMessageTemplateDTO contentMessage, AjaxResult ajaxResult) {
-    	ContentMessageTemplate messTemp = new ContentMessageTemplate();
-    	messTemp.setId(StrUtils.uuid());
-    	messTemp.setCreateTime(new Date());
-    	messTemp.setKeyCode(messTemp.getId());
-    	messTemp.setContent(contentMessage.getContent());
-    	messTemp.setRichTitle(contentMessage.getRichTitle());
-    	messTemp.setRichText(contentMessage.getRichText());
-    	messTemp.setTemplateVersionId(contentMessage.getTemplateVersionId());
-        boolean tag = messageTemplateService.insert(messTemp);
-        return handleAjaxResult(ajaxResult, tag, OperationName.CREATE);
-    }
-    
-}
-=======
-package com.lyms.cm.controller.content;
-
-import com.baomidou.mybatisplus.plugins.Page;
-import com.lyms.base.common.entity.content.ContentMessageTemplate;
-import com.lyms.base.common.service.content.ContentMessageTemplateService;
-import com.lyms.base.common.service.content.ContentTemplateMessageTagsService;
-import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
-import com.lyms.base.common.vo.content.InContentMessageTemplateDTO;
-import com.lyms.constants.OperationName;
-import com.lyms.util.StrUtils;
-import com.lyms.web.bean.AjaxResult;
-import com.lyms.web.controller.BaseController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Date;
-import java.util.Map;
-
-/**
- * <p>
- * 消息模板内容  前端控制器
- * </p>
- *
- * @author yangfei
- * @since 2017-04-14
- */
-@Controller
-@RequestMapping("/contentMessageTemplate")
-public class ContentMessageTemplateController extends BaseController {
-    //模板信息
-    @Autowired
-    private ContentMessageTemplateService messageTemplateService;
-    //模板信息标签
-    @Autowired
-    private ContentTemplateMessageTagsService messageTagsService;
-    /**
-     * 跳转到列表页面
-     *
-     * @return
-     */
-    @RequestMapping(value = "/toList", method = { RequestMethod.GET })
-    public String toList() {
-         return "/content/template_list";
-    }
-    
-    /**
-	 * 跳转到编辑页面
-	 * 
-	 * @return
-	 */
-	@RequestMapping(value = { "/{verId}/toEdit" }, method = RequestMethod.GET)
-	public String toEdit(@PathVariable String verId, Model model) {
-		model.addAttribute("verId", verId);
-		return "/content/template_edit";
-	}
-
-	/**
-	 * 获取消息内容列表
-	 * @param verId
-	 * @return
-	 */
-    @ResponseBody
-    @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST })
-    public Map<String, Object> list(@RequestParam String verId) {
-        Page<ContentMessageTemplateDTO> page = getPage();
-        System.out.println("verId值:"+verId);
-        if(StrUtils.isNotEmpty(verId)){
-            page = messageTemplateService.getContentMessageTemplate(page,verId);
-        }
-        return toGridData(page);
-    }
-    
-	/**
-     * 新增消息模板信息
-     * <p>
-     * TODO
-     * 
-     * @return
-     */
-    @RequestMapping(value = "/create", method = RequestMethod.POST)
-    @ResponseBody
-    public AjaxResult create(@ModelAttribute InContentMessageTemplateDTO contentMessage, AjaxResult ajaxResult) {
-    	ContentMessageTemplate messTemp = new ContentMessageTemplate();
-    	messTemp.setId(StrUtils.uuid());
-    	messTemp.setCreateTime(new Date());
-    	messTemp.setKeyCode(messTemp.getId());
-    	messTemp.setContent(contentMessage.getContent());
-    	messTemp.setRichTitle(contentMessage.getRichTitle());
-    	messTemp.setRichText(contentMessage.getRichText());
-    	messTemp.setTemplateVersionId(contentMessage.getTemplateVersionId());
-        boolean tag = messageTemplateService.insert(messTemp);
-        return handleAjaxResult(ajaxResult, tag, OperationName.CREATE);
-    }
-    
-}
->>>>>>> 181fc2da2ec63e24914c7529c6e7705f02985d0e
+package com.lyms.cm.controller.content;
+
+import com.baomidou.mybatisplus.plugins.Page;
+import com.lyms.base.common.entity.content.ContentMessageTemplate;
+import com.lyms.base.common.service.content.ContentMessageTemplateService;
+import com.lyms.base.common.service.content.ContentTemplateMessageTagsService;
+import com.lyms.base.common.vo.content.ContentMessageTemplateDTO;
+import com.lyms.base.common.vo.content.InContentMessageTemplateDTO;
+import com.lyms.base.common.vo.content.MsgTempSerachDTO;
+import com.lyms.constants.OperationName;
+import com.lyms.util.StrUtils;
+import com.lyms.web.bean.AjaxResult;
+import com.lyms.web.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * <p>
+ * 消息模板内容  前端控制器
+ * </p>
+ *
+ * @author yangfei
+ * @since 2017-04-14
+ */
+@Controller
+@RequestMapping("/contentMessageTemplate")
+public class ContentMessageTemplateController extends BaseController {
+    //模板信息
+    @Autowired
+    private ContentMessageTemplateService messageTemplateService;
+    //模板信息标签
+    @Autowired
+    private ContentTemplateMessageTagsService messageTagsService;
+    /**
+     * 跳转到列表页面
+     *
+     * @return
+     */
+    @RequestMapping(value = "/toList", method = { RequestMethod.GET })
+    public String toList() {
+         return "/content/template_list";
+    }
+    
+    /**
+	 * 跳转到编辑页面
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value = { "/{verId}/toEdit" }, method = RequestMethod.GET)
+	public String toEdit(@PathVariable String verId, Model model) {
+		model.addAttribute("verId", verId);
+		return "/content/template_edit";
+	}
+
+	/**
+	 * 获取消息内容列表
+	 * @param msgTemp
+	 * @return
+	 */
+    @ResponseBody
+    @RequestMapping(value = "/list", method = { RequestMethod.GET, RequestMethod.POST })
+    public Map<String, Object> list(MsgTempSerachDTO msgTemp) {
+        Page<ContentMessageTemplateDTO> page = getPage();
+       page = messageTemplateService.getContentMessageTemplate(page,msgTemp);
+        return toGridData(page);
+    }
+    
+	/**
+     * 新增消息模板信息
+     * <p>
+     * TODO
+     * 
+     * @return
+     */
+    @RequestMapping(value = "/create", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxResult create(@ModelAttribute InContentMessageTemplateDTO contentMessage, AjaxResult ajaxResult) {
+    	ContentMessageTemplate messTemp = new ContentMessageTemplate();
+    	messTemp.setId(StrUtils.uuid());
+    	messTemp.setCreateTime(new Date());
+    	messTemp.setKeyCode(messTemp.getId());
+    	messTemp.setContent(contentMessage.getContent());
+    	messTemp.setRichTitle(contentMessage.getRichTitle());
+    	messTemp.setRichText(contentMessage.getRichText());
+    	messTemp.setTemplateVersionId(contentMessage.getTemplateVersionId());
+        boolean tag = messageTemplateService.insert(messTemp);
+        return handleAjaxResult(ajaxResult, tag, OperationName.CREATE);
+    }
+    
+}
+