Merge remote-tracking branch 'origin/developerH' into developerH

# Conflicts:
#	src/main/java/com/caimei/modules/user/dao/MessageCenterDao.java
#	src/main/java/com/caimei/modules/user/entity/MessageCenter.java
#	src/main/java/com/caimei/modules/user/web/NewCmShopController.java
#	src/main/resources/mappings/modules/user/MessageCenter.xml

src/main/java/com/caimei/modules/user/dao/MessageCenterDao.java

@@ -7,6 +7,9 @@ import com.caimei.modules.user.entity.MessageCenter;
 import com.thinkgem.jeesite.common.persistence.CrudDao;
 import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 import com.thinkgem.jeesite.modules.sys.entity.User;
+import com.caimei.modules.user.entity.MessageCenter;
+import com.thinkgem.jeesite.common.persistence.CrudDao;
+import com.thinkgem.jeesite.common.persistence.annotation.MyBatisDao;
 
 /**
  * Description

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -2,11 +2,9 @@ package com.caimei.modules.user.web;
 
 import com.caimei.constants.ShopStatus;
 import com.caimei.modules.opensearch.CoreServiceUitls;
-import com.caimei.modules.order.entity.CmDiscernReceipt;
 import com.caimei.modules.sys.utils.CmMsgUtils;
 import com.caimei.modules.sys.utils.SMSUtils;
 import com.caimei.modules.user.dao.CmUserDao;
-import com.caimei.modules.user.dao.MessageCenterDao;
 import com.caimei.modules.user.dao.NewCmShopDao;
 import com.caimei.modules.user.entity.*;
 import com.caimei.modules.user.service.*;
@@ -35,7 +33,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -369,17 +366,7 @@ public class NewCmShopController extends BaseController {
             map.put("success", true);
             map.put("msg", "审核成功");
 
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            String current = dateFormat.format(new Date());
-            MessageCenter messageCenter = new MessageCenter();
-                messageCenter.setShopID(shopId);
-                messageCenter.setClubID(null);
-                messageCenter.setUserType(2);
-                messageCenter.setMessageType(2);
-                messageCenter.setShopMessType(1);
-                messageCenter.setContent(null);
-                messageCenter.setTime(current);
-                messageCenterDao.addMessageCenter(messageCenter);
+
 
             if (StringUtils.isNotEmpty(mobile)) {
                 SMSUtils.sendSms(mobile, smsMessage);